base.nix

@@ -29,6 +29,12 @@
       trusted-users = [ "felixalb" ];
       builders-use-substitutes = true;
     };
+
+    registry= {
+      nixpkgs.flake = inputs.nixpkgs;
+    };
+
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
   };
 
   programs.zsh.enable = true;

flake.nix

@@ -51,7 +51,7 @@
     in
     {
       nixosConfigurations = let
-        normalSys = name: hostConfig: nixpkgs.lib.nixosSystem {
+        normalSys = name: config: nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = {
             inherit inputs;
@@ -59,7 +59,7 @@
           modules = [
             ({ config, pkgs, ... }: {
               # Make "pkgs.unstable" etc. available
-              nixpkgs.overlays = [ pkgs-overlay ] ++ hostConfig.overlays or [ ];
+              nixpkgs.overlays = [ pkgs-overlay ] ++ config.overlays or [ ];
             })
 
             ./hosts/${name}/configuration.nix
@@ -69,9 +69,9 @@
               home-manager.useUserPackages = true;
               home-manager.users = {
                 "felixalb" = import ./hosts/${name}/home.nix;
-              } // hostConfig.home-manager-users or { };
+              } // config.home-manager-users or { };
             }
-          ] ++ hostConfig.modules or [ ];
+          ] ++ config.modules or [ ];
         };
       in {
 
@@ -107,7 +107,8 @@
         morn = normalSys "morn" { };
 
         # Home desktop
-        sisko = normalSys "sisko" { };
+        sisko = normalSys "sisko" {
+        };
       };
 
       # Daily driver macbook

hosts/sisko/configuration.nix

@@ -57,10 +57,6 @@
     spiceUSBRedirection.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
-    virtiofsd
-  ];
-
   nixpkgs.config = {
     allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
       "copilot.vim"
@@ -72,7 +68,6 @@
     permittedInsecurePackages = [
       "openssl-1.1.1w"
     ];
-    rocmSupport = true;
   };
 
   services.fwupd.enable = true;

hosts/sisko/home.nix

@@ -31,7 +31,7 @@
     swayimg
     thunderbird
     tor-browser
-    # unstable.bambu-studio
+    unstable.bambu-studio
     unstable.bolt-launcher
 
     exiftool