all repos — nixfiles @ 7f7e6a8e812a52f6ebc1a0c0c8cd99dad82c4441

System and user configuration, managed by nix and home-manager

linde: enable deployment via flake

Alan Pearce
commit

7f7e6a8e812a52f6ebc1a0c0c8cd99dad82c4441

parent

4c9c256390251b3b921869cd4bf888569fdbcc82

1 file changed, 35 insertions(+), 20 deletions(-)

changed files
M flake.nix → flake.nix
@@ -5,6 +5,10 @@ nixpkgs.follows = "srvos/nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nix-index-database.url = "github:Mic92/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+    nur = {
+      url = "github:nix-community/nur";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     darwin.url = "github:lnl7/nix-darwin/master";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
     emacs-overlay.url = "github:nix-community/emacs-overlay";

@@ -36,6 +40,7 @@ , utils
     , srvos
     , nixpkgs
     , nixos-hardware
+    , nur
     , emacs-overlay
     , home-manager
     , darwin

@@ -71,10 +76,6 @@ angrr.overlays.default
             emacs-overlay.overlays.default
             (self: super: {
               personal = import ./packages/overlay.nix self super;
-              enchant = super.enchant.override {
-                withHspell = false;
-                withAspell = false;
-              };
             })
           ];
         };

@@ -110,21 +111,35 @@ ./system/nano.nix
           ./system/nano-hardware.nix
         ];
       };
-      nixosConfigurations.linde = nixpkgs.lib.nixosSystem {
-        system = utils.lib.system.aarch64-linux;
-        specialArgs = { inherit inputs; };
-        modules = [
-          srvos.nixosModules.server
-          srvos.nixosModules.hardware-hetzner-cloud-arm
-          agenix.nixosModules.default
-          elgit.nixosModules.default
-          mycal.nixosModules.default
-          searchix.nixosModules.web
-          golink.nixosModules.default
-          ./packages/modules/nixos/laminar.nix
-          ./system/linde.nix
-        ];
-      };
+      nixosConfigurations.linde =
+        let
+          system = utils.lib.system.aarch64-linux;
+        in
+        nixpkgs.lib.nixosSystem {
+          inherit system;
+          specialArgs = { inherit inputs; };
+          modules = [
+            {
+              nixpkgs.overlays = (readOverlays ./overlays) ++ [
+                nur.overlays.default
+                elgit.overlays.default
+                (final: prev: {
+                  searchix = searchix.packages.${system}.default;
+                })
+              ];
+            }
+            srvos.nixosModules.server
+            srvos.nixosModules.hardware-hetzner-cloud-arm
+            agenix.nixosModules.default
+            elgit.nixosModules.elgit
+            mycal.nixosModules.mycal
+            searchix.nixosModules.web
+            golink.nixosModules.default
+            ./packages/modules/nixos/laminar.nix
+            ./system/linde.nix
+            ./private/calendar.nix
+          ];
+        };
       darwinConfigurations.marvin = darwin.lib.darwinSystem {
         system = utils.lib.system.aarch64-darwin;
         specialArgs = { inherit inputs; };

@@ -165,6 +180,7 @@ system = utils.lib.system.aarch64-linux;
         modules = [
           ./user/server.nix
           nix-index-database.hmModules.nix-index
+          nixvim.homeModules.nixvim
         ];
       };
 

@@ -208,7 +224,6 @@ devShells = {
         default = pkgs.mkShell {
           packages = with pkgs; [
             home-manager
-            colmena
             deploy-rs.packages.${system}.default
             agenix.packages.${system}.default
           ];