diff options
| -rw-r--r-- | flake.lock | 88 | ||||
| -rw-r--r-- | flake.nix | 30 | ||||
| -rw-r--r-- | system/linde.nix | 6 |
3 files changed, 41 insertions, 83 deletions
diff --git a/flake.lock b/flake.lock index 4a9c0535..0172b702 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1735478292, + "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1734944495, - "narHash": "sha256-pAW9SbQSJmL2ntnCfeSVT+S9078ErqVztKS1lrKLOhk=", + "lastModified": 1735550039, + "narHash": "sha256-hIyQM5hqBpOfvb6lMHl+707pg7iwBJKfbsANEZFhV+0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "49bd3fd75db9c063076c4b572778be5c96899570", + "rev": "bc19dc80cd2987406a19b5c644e0400c4cf67e33", "type": "github" }, "original": { @@ -241,7 +241,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs-small" + "nixpkgs" ] }, "locked": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1734944412, - "narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -351,11 +351,11 @@ ] }, "locked": { - "lastModified": 1734838217, - "narHash": "sha256-zvMLS8BGn+kMG7tLLT3PJ67/S9yqZ9B7V8hKBa9cRRY=", + "lastModified": 1735443188, + "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "d583b2d142f0428313df099f4a2dcf2a0496aa78", + "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "type": "github" }, "original": { @@ -366,11 +366,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1735268880, - "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", + "lastModified": 1735530358, + "narHash": "sha256-4ZbiXBWFK0gHsl5VT9dih7RVaEV3rRh0XUV0jW0ibOM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", + "rev": "5000219208d860bafd1ee26eadb403449f3d9ab9", "type": "github" }, "original": { @@ -413,11 +413,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1734737257, - "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", + "lastModified": 1735412871, + "narHash": "sha256-Qoz0ow6jDGUIBHxduc7Y1cjYFS71tvEGJV5Src/mj98=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", + "rev": "9f94733f93e4fe6e82f516efae007096e4ab5a21", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -477,11 +477,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -523,23 +523,6 @@ "type": "github" } }, - "personal": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734037976, - "narHash": "sha256-gOd0dQcweFFQW2QA7LPxzKAQw+p4yOiNc/WiTNu9jwo=", - "path": "/home/alan/projects/alanpearce.eu/nixfiles/packages", - "type": "path" - }, - "original": { - "type": "git", - "url": "file:packages" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -574,9 +557,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", "nixpkgs-small": "nixpkgs-small", - "personal": "personal", "searchix": "searchix", - "secrets": "secrets", "utils": "utils_2" } }, @@ -602,19 +583,6 @@ "url": "https://git.alanpearce.eu/searchix" } }, - "secrets": { - "flake": false, - "locked": { - "lastModified": 1735315234, - "narHash": "sha256-YfHf6RCPBc9XhH7RHheSyXemjawm9aQ/zIgnNXtsK+U=", - "path": "/home/alan/projects/alanpearce.eu/nixfiles/private", - "type": "path" - }, - "original": { - "type": "git", - "url": "file:private" - } - }, "simple-css": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 5333f1a2..c7050902 100644 --- a/flake.nix +++ b/flake.nix @@ -11,22 +11,14 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nh-darwin.url = "github:ToyVo/nh_darwin"; - secrets = { - flake = false; - url = "git+file:private"; - }; utils.url = "github:numtide/flake-utils"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; deploy-rs.url = "github:serokell/deploy-rs"; - personal = { - url = "git+file:packages"; - inputs.nixpkgs.follows = "nixpkgs"; - }; searchix.url = "git+https://git.alanpearce.eu/searchix"; golink = { url = "github:tailscale/golink"; - inputs.nixpkgs.follows = "nixpkgs-small"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -42,9 +34,7 @@ , darwin , nh-darwin , nix-index-database - , secrets , agenix - , personal , deploy-rs , searchix , golink @@ -69,7 +59,7 @@ agenix.overlays.default emacs-overlay.overlays.default (self: super: { - personal = personal.packages.${system}; + personal = ./packages/overlay.nix; enchant = super.enchant.override { withHspell = false; withAspell = false; @@ -114,7 +104,7 @@ agenix.nixosModules.default searchix.nixosModules.web golink.nixosModules.default - personal.nixosModules.laminar + ./packages/modules/nixos/laminar.nix ./system/linde.nix ]; }; @@ -123,42 +113,42 @@ specialArgs = { inherit inputs; }; modules = [ ./system/marvin.nix + ./packages/modules/darwin/caddy nh-darwin.nixDarwinModules.prebuiltin - personal.darwinModules.caddy ]; }; homeConfigurations."alan@marvin" = mkHomeConfiguration { system = utils.lib.system.aarch64-darwin; modules = [ ./user/marvin.nix + ./private/default.nix + ./private/ssh.nix nix-index-database.hmModules.nix-index - (secrets + "/default.nix") - (secrets + "/ssh.nix") ]; }; homeConfigurations."alan@prefect" = mkHomeConfiguration { system = utils.lib.system.x86_64-linux; modules = [ ./user/prefect.nix + ./private/default.nix + ./private/ssh.nix nix-index-database.hmModules.nix-index - (secrets + "/default.nix") - (secrets + "/ssh.nix") ]; }; homeConfigurations."alan@nanopi" = mkHomeConfiguration { system = utils.lib.system.aarch64-linux; modules = [ ./user/nanopi.nix + ./private/default.nix nix-index-database.hmModules.nix-index - (secrets + "/default.nix") ]; }; homeConfigurations."alan@linde" = mkHomeConfiguration { system = utils.lib.system.aarch64-linux; modules = [ ./user/server.nix + ./private/default.nix nix-index-database.hmModules.nix-index - (secrets + "/default.nix") ]; }; diff --git a/system/linde.nix b/system/linde.nix index fe9497e7..5fd16e11 100644 --- a/system/linde.nix +++ b/system/linde.nix @@ -102,14 +102,14 @@ in dates = "02:10"; randomizedDelaySec = "59 min"; allowReboot = true; - flake = "git+file://${config.services.gitolite.dataDir}/repositories/nixfiles.git"; + flake = "git+file://${config.services.gitolite.dataDir}/repositories/nixfiles.git?submodules=1"; flags = [ "--no-write-lock-file" "--impure" "--update-input" - "nixpkgs-small" + "--nixpkgs" "--update-input" - "searchix" + "nixpkgs-small" ]; }; |