woot. got a working build again

flake.nix

@@ -68,14 +68,6 @@
     inherit inputs;
     src = ./.;
 
-    channels-config = {
-      allowUnfree = true;
-      permittedInsecurePackages = [
-        "dotnet-sdk-6.0.428"
-        "aspnetcore-runtime-6.0.36"
-      ];
-    };
-
     snowfall = {
       namespace = "sneeuwvlok";
 
@@ -85,6 +77,14 @@
       };
     };
 
+    channels-config = {
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "dotnet-sdk-6.0.428"
+        "aspnetcore-runtime-6.0.36"
+      ];
+    };
+
     overlays = with inputs; [
       fenix.overlays.default
       nix-minecraft.overlay
@@ -92,6 +92,7 @@
     ];
 
     homes.modules = with inputs; [
+      stylix.homeModules.stylix
       plasma-manager.homeManagerModules.plasma-manager
     ];
   };

homes/user-configurations/chris.nix

@@ -1,19 +0,0 @@
-{
-  programs.git = {
-    userName = "Chris Kruining";
-    userEmail = "chris@kruining.eu";
-  };
-
-  sneeuwvlok = {
-    shell = {
-      default = "zsh";
-      corePkgs.enable = true;
-    };
-
-    themes = {
-      enable = true;
-      theme = "everforest";
-      polarity = "dark";
-    };
-  };
-}

homes/x86_64-linux/chris@manwe/default.nix

@@ -1,4 +1,22 @@
-{ ... }:
+{ osConfig, ... }:
 {
-  sneeuwvlok = {};
+  home.stateVersion = osConfig.system.stateVersion;
+
+  programs.git = {
+    userName = "Chris Kruining";
+    userEmail = "chris@kruining.eu";
+  };
+
+  sneeuwvlok = {
+    shell = {
+      default = "zsh";
+      corePkgs.enable = true;
+    };
+
+    themes = {
+      enable = true;
+      theme = "everforest";
+      polarity = "dark";
+    };
+  };
 }

modules/home/home-manager/default.nix

@@ -0,0 +1,10 @@
+{ lib, osConfig ? { }, ... }:
+let
+  inherit (lib) mkDefault;
+in
+{
+  systemd.user.startServices = "sd-switch";
+  programs.home-manager.enable = true;
+
+  home.stateVersion = mkDefault (osConfig.system.stateVersion or "25.05");
+}

modules/home/shell/default.nix

@@ -21,7 +21,6 @@ in
     #   shell = pkgs."${cfg.default}";
     # } else {})
 
-    
     (mkIf (cfg.corePkgs.enable) {
       ${namespace}.shell.toolset = mkDefault {
         bat.enable = true;

modules/home/shell/toolset/git/default.nix

@@ -76,8 +76,6 @@ in
           credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret";
 
           user = {
-            name = config.${namespace}.user.full_name;
-            email = config.${namespace}.user.email;
             signingKey = "~/.ssh/id_rsa.pub";
           };
 

modules/home/themes/default.nix

@@ -5,6 +5,7 @@ let
   inherit (lib.types) nullOr enum;
 
   cfg = config.${namespace}.themes;
+  osCfg = osConfig.${namespace}.theming;
 in {
   options.${namespace}.themes = {
     enable = mkEnableOption "Theming (Stylix)";
@@ -23,12 +24,36 @@ in {
     };
   };
 
-  config = mkIf (cfg.enable && osConfig.${namespace}.theming.enable) {
+  config = mkIf (cfg.enable) {
     stylix = {
+      enable = true; 
+
       base16Scheme = "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml";
       image = ./${cfg.theme}.jpg;
       polarity = cfg.polarity;
       targets.qt.platform = mkDefault "kde6";
+
+      fonts = {
+        serif = {
+          package = pkgs.dejavu_fonts;
+          name = "DejaVu Serif";
+        };
+
+        sansSerif = {
+          package = pkgs.dejavu_fonts;
+          name = "DejaVu Sans";
+        };
+
+        monospace = {
+          package = pkgs.nerd-fonts.jetbrains-mono;
+          name = "JetBrainsMono Nerd Font Mono";
+        };
+
+        emoji = {
+          package = pkgs.noto-fonts-emoji;
+          name = "Noto Color Emoji";
+        };
+      };
     };
   };
 }

modules/nixos/desktop/gamescope/default.nix

@@ -1,6 +1,6 @@
 { lib, config, namespace, inputs, ... }:
 let
-  inherit (lib) mkIf mkEnableOption;
+  inherit (lib) mkIf mkEnableOption mkForce;
 
   cfg = config.${namespace}.desktop.gamescope;
 in
@@ -16,6 +16,9 @@ in
   config = mkIf cfg.enable {
     ${namespace}.desktop.plasma.enable = true;
 
+    services.displayManager.sddm.enable = mkForce false;
+    services.displayManager.gdm.enable = mkForce false;
+
     jovian = {
       steam = {
         enable = true;

modules/nixos/theming/default.nix

@@ -1,50 +0,0 @@
-{ inputs, config, lib, pkgs, namespace, ... }:
-let
-  inherit (lib) mkIf mkEnableOption;
-
-  cfg = config.${namespace}.theming;
-in
-{
-  imports = [
-    inputs.stylix.nixosModules.stylix
-  ];
-
-  options.${namespace}.theming = {
-    enable = mkEnableOption "enable theming" // {
-      default = true;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    stylix = {
-      enable = true;
-      autoEnable = true;
-
-      # base16Scheme = "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml";
-      # image = ./${cfg.theme}.jpg;
-      # polarity = cfg.polarity;
-
-      fonts = {
-        serif = {
-          package = pkgs.dejavu_fonts;
-          name = "DejaVu Serif";
-        };
-
-        sansSerif = {
-          package = pkgs.dejavu_fonts;
-          name = "DejaVu Sans";
-        };
-
-        monospace = {
-          package = pkgs.nerd-fonts.jetbrains-mono;
-          name = "JetBrainsMono Nerd Font Mono";
-        };
-
-        emoji = {
-          package = pkgs.noto-fonts-emoji;
-          name = "Noto Color Emoji";
-        };
-      };
-    };
-  };
-}

systems/x86_64-linux/manwe/default.nix

@@ -20,7 +20,6 @@ in
     };
 
     desktop.use = "plasma";
-    theming.enable = true;
   };
 
   system.stateVersion = "23.11";

systems/x86_64-linux/orome/default.nix

@@ -8,9 +8,10 @@ in
   ];
 
   sneeuwvlok = {
-    preset = "desktop";
-
-    bluetooth.enable = true;
+    hardware.has = {
+      bluetooth = true;
+      audio = true;
+    };
   };
 
   system.stateVersion = "23.11";

systems/x86_64-linux/tulkas/default.nix

@@ -20,7 +20,6 @@ in
     };
 
     desktop.use = "gamescope";
-    theming.enable = true;
   };
 
   system.stateVersion = "23.11";