.

config/shell-abbr/default.nix

@@ -1,3 +1,3 @@
 {
   ls = "eza -al";
-};
+}

hosts/chris-pc/default.nix

@@ -15,6 +15,7 @@
 
     desktop = {
       plasma.enable = true;
+      type = "wayland";
 
       terminal = {
         default = "alacritty";

hosts/chris-pc/hardware.nix

@@ -32,9 +32,4 @@ in
 
   nixpkgs.hostPlatform = mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
-
-  services = {
-    power-profiles-deamon-enable = false;
-    thermald.enable = false;
-  };
 }

hosts/chris-server/hardware.nix

@@ -30,9 +30,4 @@ in
 
   nixpkgs.hostPlatform = mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
-
-  services = {
-    power-profiles-deamon-enable = false;
-    thermald.enable = false;
-  };
 }

modules/networking/default.nix

@@ -16,7 +16,7 @@ in {
     enable = mkEnableOption "network manager";
   };
 
-  config =mkIf cfg.networkManager.enable {
+  config = mkIf cfg.enable {
     systemd.services.NetworkManager-wait-online.enable = false;
 
     networking = {

modules/networking/samba.nix

@@ -14,7 +14,7 @@ in
   config = mkMerge [
     (mkIf config.modules.networking.samba.sharing.enable {
       users = {
-        group.samba-guest = {};
+        groups.samba-guest = {};
         users.samba-guest = {
           isSystemUser = true;
           description = "Residence of our Samba guest users";

modules/options.nix

@@ -20,6 +20,7 @@ in
         "${config.user.home}/Github/.files"
       ]);
       hostDir = mkOpt path "${config.kaas.dir}/hosts/${config.networking.hostName}";
+      configDir = mkOpt path "${config.kaas.dir}/config";
       modulesDir = mkOpt path "${config.kaas.dir}/modules";
       themesDir = mkOpt path "${config.kaas.modulesDir}/themes";
     };

modules/services/media.nix

@@ -79,7 +79,6 @@ in
         enable = true;
         openFirewall = true;
         configFile = "${directory}/sabnzbd/config.ini";
-        port = 5001;
 
         user = user;
         group = group;

modules/shell/toolset/btop.nix

@@ -90,7 +90,7 @@ in
       };
     };
 
-    home.configFile.btop-theme = let
+    create.configFile.btop-theme = let
       inherit (config.modules.themes) active;
     in
       mkIf (active != null) {

modules/shell/zsh.nix

@@ -132,10 +132,10 @@ in
         };
     };
 
-    home.configFile.zsh-abbreviations = {
+    create.configFile.zsh-abbreviations = {
       target = "zsh/abbreviations";
       text = let
-        abbrevs = import "${config.snowflake.configDir}/shell-abbr";
+        abbrevs = import "${config.kaas.configDir}/shell-abbr";
       in ''
         ${concatStrings (mapAttrsToList
           (k: v: "abbr ${k}=${escapeNixString v}")

modules/themes/default.nix

@@ -164,12 +164,7 @@ in {
           package = iconTheme.package;
         };
         gtk3.bookmarks = map (dir: "file://${config.user.home}/" + dir) [
-          "Workspace/public/snowflake"
-          "Workspace/public/cs-notes"
-          "Workspace/public/notebook"
-          "Library/unexplored"
-          "Library/unexplored/mathematics"
-          "Library/unexplored/programming"
+          "data/Github/.files"
         ];
         gtk4.extraConfig = {
           gtk-cursor-blink = false;

modules/themes/everforrest/default.nix

@@ -97,10 +97,6 @@ in
       };
 
       editor = {
-        helix = {
-          dark = "everforrest";
-          light = "everforrest_storm";
-        };
         neovim = {
           dark = "everforrest";
           light = "everforrest";

modules/virtualisation/default.nix

@@ -3,10 +3,10 @@ let
   inherit (lib.modules) mkIf;
 in
 {
-  options.modules.virtualization = let
+  options.modules.virtualisation = let
     inherit (lib.options) mkEnableOption;
   in
   {
-    enable = mkEnableOption "enable virtualization";
+    enable = mkEnableOption "enable virtualisation";
   };
 }

modules/virtualisation/podman.nix

@@ -2,17 +2,17 @@
 let
   inherit (lib.modules) mkIf;
 
-  cfg = config.modules.virtualization.podman;
+  cfg = config.modules.virtualisation.podman;
 in
 {
-  options.modules.virtualization.podman = let
+  options.modules.virtualisation.podman = let
     inherit (lib.options) mkEnableOption;
   in
   {
     enable = mkEnableOption "enable podman";
   };
 
-  config = mkIf options.modules.virtualization.podman.enable {
+  config = mkIf options.modules.virtualisation.podman.enable {
     virtualisation = {
       containers.enable = true;