nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: nyancat:4464525b0362ecb7d3e9e9f0a33f1132b267f8f0
Branches Tags
nyancat:master
..
compare: nyancat:602995c20578335f526fc79253b749f2337280f6
Branches Tags
nyancat:master

No commits in common. "4464525b0362ecb7d3e9e9f0a33f1132b267f8f0" and "602995c20578335f526fc79253b749f2337280f6" have entirely different histories.
4464525b03 ... 602995c205

7 changed files with 155 additions and 185 deletions
Show stats Expand all files Collapse all files

103
flake.lock
View file

@ -1,41 +1,17 @@
{ {
"nodes": { "nodes": {
"colmena": { "crane": {
"inputs": { "inputs": {
"flake-compat": [
"flake-compat"
],
"flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"stable": [
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1711386353, "lastModified": 1724537630,
"narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=", "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=",
"owner": "zhaofengli",
"repo": "colmena",
"rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"repo": "colmena",
"type": "github"
}
},
"crane": {
"locked": {
"lastModified": 1725409566,
"narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -51,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725377834, "lastModified": 1724895876,
"narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,11 +62,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725234343, "lastModified": 1722555600,
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +122,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725180166, "lastModified": 1724435763,
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +172,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725379389, "lastModified": 1722329086,
"narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -225,11 +201,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725050929, "lastModified": 1724599287,
"narHash": "sha256-1z8i5qQwb28YM4cg1ji6b8f/5XDO30FIr/vObDRZbes=", "narHash": "sha256-M4OllWFNDcvgY2rgx/9uWn9jpunSb2CzmqPDcuS27SQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d3b42cf643d03d675d19ec6259bb33538eaa706e", "rev": "a2f4145923cbbabb63e7749a49c86052a17389f7",
"revCount": 73, "revCount": 72,
"type": "git", "type": "git",
"url": "https://git.ny4.dev/nyancat/nvim" "url": "https://git.ny4.dev/nyancat/nvim"
}, },
@ -240,11 +216,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1725477728, "lastModified": 1724878143,
"narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,17 +231,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725534445, "lastModified": 1725013374,
"narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", "narHash": "sha256-fbz8MUVDWHchQSA4uguP9YYDXnX4bEdlP7YvsMcXZu4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", "rev": "c169763c3087b02a8308e2f8a9bba77c428dcca1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c169763c3087b02a8308e2f8a9bba77c428dcca1",
"type": "github" "type": "github"
} }
}, },
@ -285,11 +261,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725513492, "lastModified": 1724857454,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,7 +276,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"colmena": "colmena",
"crane": "crane", "crane": "crane",
"disko": "disko", "disko": "disko",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -327,11 +302,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725589472, "lastModified": 1724898214,
"narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=", "narHash": "sha256-4yMO9+Lsr3zqTf4clAGGag/bfNTmc/ITOXbJQcOEok4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e", "rev": "0bc2c784e3a6ce30a2ab1b9f47325ccbed13039f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +325,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725540166, "lastModified": 1723501126,
"narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d9d781523a1463965cd1e1333a306e70d9feff07", "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +360,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725271838, "lastModified": 1724833132,
"narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
"type": "github" "type": "github"
}, },
"original": { "original": {

36
flake.nix
View file

@ -7,15 +7,9 @@
# `nixpkgs-unstable` contains less(?) jobs, and usually updates faster. # `nixpkgs-unstable` contains less(?) jobs, and usually updates faster.
# #
# REFERENCE: https://discourse.nixos.org/t/differences-between-nix-channels/13998/5 # REFERENCE: https://discourse.nixos.org/t/differences-between-nix-channels/13998/5
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/c169763c3087b02a8308e2f8a9bba77c428dcca1"; # userborn
# nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
colmena = {
url = "github:zhaofengli/colmena";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
inputs.flake-utils.follows = "flake-utils";
inputs.stable.follows = "nixpkgs";
};
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -55,9 +49,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs";
}; };
systems = { systems.url = "github:nix-systems/default";
url = "github:nix-systems/default";
};
treefmt-nix = { treefmt-nix = {
url = "github:numtide/treefmt-nix"; url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -66,6 +58,7 @@
### De-dupe flake dependencies ### De-dupe flake dependencies
crane = { crane = {
url = "github:ipetkov/crane"; url = "github:ipetkov/crane";
inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-compat = { flake-compat = {
url = "github:edolstra/flake-compat"; url = "github:edolstra/flake-compat";
@ -100,16 +93,16 @@
treefmtEval = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix; treefmtEval = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
in in
{ {
# nix fmt ### nix fmt
formatter = treefmtEval.config.build.wrapper; formatter = treefmtEval.config.build.wrapper;
# nix flake check ### nix flake check
checks.formatting = treefmtEval.config.build.check inputs.self; checks.formatting = treefmtEval.config.build.check inputs.self;
# nix {run,shell,build} ### nix {run,shell,build}
legacyPackages = import ./pkgs pkgs; legacyPackages = import ./pkgs pkgs;
# nix develop ### nix develop
devShells.default = pkgs.mkShellNoCC { devShells.default = pkgs.mkShellNoCC {
packages = with pkgs; [ packages = with pkgs; [
colmena colmena
@ -119,11 +112,15 @@
} }
) )
// { // {
### imports = [];
nixosModules.default = ./nixos/modules; nixosModules.default = ./nixos/modules;
overlays.default = import ./overlays; homeManagerModules.default = ./home/modules;
nixosConfigurations = { ### nixpkgs.overlays = [];
"dust" = inputs.nixpkgs.lib.nixosSystem { overlays = import ./overlays;
### NixOS
nixosConfigurations."dust" = inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./nixos/profiles/core ./nixos/profiles/core
@ -133,9 +130,8 @@
inherit inputs; inherit inputs;
}; };
}; };
} // inputs.self.colmenaHive.nodes;
colmenaHive = inputs.colmena.lib.makeHive { colmena = {
meta = { meta = {
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;

1
hosts/dust/anti-feature.nix
View file

@ -10,7 +10,6 @@
"cargo-bootstrap" "cargo-bootstrap"
"cef-binary" "cef-binary"
"dart" "dart"
"go"
"rustc-bootstrap" "rustc-bootstrap"
"rustc-bootstrap-wrapper" "rustc-bootstrap-wrapper"
"sof-firmware" "sof-firmware"

1
hosts/pek0/anti-feature.nix
View file

@ -7,7 +7,6 @@
lib.elem (lib.getName pkg) [ lib.elem (lib.getName pkg) [
"adoptopenjdk-hotspot-bin" "adoptopenjdk-hotspot-bin"
"cargo-bootstrap" "cargo-bootstrap"
"go"
"minecraft-server" "minecraft-server"
"rustc-bootstrap" "rustc-bootstrap"
"rustc-bootstrap-wrapper" "rustc-bootstrap-wrapper"

3
hosts/tyo0/anti-feature.nix
View file

@ -7,10 +7,9 @@
lib.elem (lib.getName pkg) [ lib.elem (lib.getName pkg) [
"adoptopenjdk-hotspot-bin" "adoptopenjdk-hotspot-bin"
"cargo-bootstrap" "cargo-bootstrap"
"go"
"keycloak"
"rustc-bootstrap" "rustc-bootstrap"
"rustc-bootstrap-wrapper" "rustc-bootstrap-wrapper"
"keycloak"
"temurin-bin" "temurin-bin"
]; ];

2
nixos/profiles/core/default.nix
View file

@ -21,7 +21,7 @@
]); ]);
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.self.overlays.default inputs.self.overlays.patches
]; ];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;

4
overlays/default.nix
View file

@ -5,7 +5,8 @@ let
patches = (old.patches or [ ]) ++ patches; patches = (old.patches or [ ]) ++ patches;
}); });
in in
_final: prev: { {
patches = _final: prev: {
# https://aur.archlinux.org/pkgbase/nautilus-typeahead # https://aur.archlinux.org/pkgbase/nautilus-typeahead
nautilus = prev.nautilus.overrideAttrs { nautilus = prev.nautilus.overrideAttrs {
src = prev.fetchFromGitLab { src = prev.fetchFromGitLab {
@ -96,4 +97,5 @@ _final: prev: {
hash = "sha256-+JJoHNOmDzqT1TaFM83DR3/BdCab240tfs21VNMv6wE="; hash = "sha256-+JJoHNOmDzqT1TaFM83DR3/BdCab240tfs21VNMv6wE=";
}) })
]; ];
};
} }