,

default.nix

@@ -18,7 +18,6 @@ in
 
   environment.variables = {
     KAAS = config.kaas.dir;
-    KAAS_BIN = config.kaas.binDir;
     NIXPKGS_ALLOW_UNFREE = "1";
   };  
 

flake.nix

@@ -23,13 +23,14 @@
     
     system = "x86_64-linux";
 
-    mkPkgs = pkgs:
+    mkPkgs = pkgs: extraOverlays:
       import pkgs {
         inherit system;
         config.allowUnfree = true;
+        overlays = extraOverlays ++ (lib.attrValues self.overlays);
       };
-    pkgs = mkPkgs nixpkgs;
+    pkgs = mkPkgs nixpkgs [self.overlays.default];
-    pkgs-unstable = mkPkgs nixpkgs-unstable;
+    pkgs-unstable = mkPkgs nixpkgs-unstable [];
 
     lib = nixpkgs.lib.extend (final: prev: {
       my = import ./lib {
@@ -42,6 +43,21 @@
   {
     lib = lib.my;
 
+    overlays = {
+      default = final: prev: {
+        unstable = pkgs-unstable;
+        my = self.packages.${system};
+      };
+
+      nvfetcher = final: prev: {
+        sources =
+          builtins.mapAttrs (_: p: p.src)
+          ((import ./packages/_sources/generated.nix) {
+            inherit (final) fetchurl fetchgit fetchFromGitHub dockerTools;
+          });
+      };
+    };
+
     packages."${system}" = mapModules ./packages (p: pkgs.callPackage p {});
 
     nixosModules =

hosts/chris-laptop/default.nix

@@ -31,10 +31,5 @@
       default = "zsh";
     };
   };
-
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.valent;
-  };
 }
 

hosts/chris-pc/default.nix

@@ -42,10 +42,5 @@
       };
     };
   };
-
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.valent;
-  };
 }
 

hosts/chris-server/default.nix

@@ -34,10 +34,5 @@
       };
     };
   };
-
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.valent;
-  };
 }
 

hosts/mam-laptop/default.nix

@@ -31,10 +31,5 @@
       default = "zsh";
     };
   };
-
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.valent;
-  };
 }
 

modules/shell/toolset/git.nix

@@ -87,7 +87,7 @@ in
           user = {
             name = "Chris Kruining";
             email = "chris@kruining.eu";
-            signingKey = readFile "${config.user.home}/.ssh/id_ed25519.pub";
+            signingKey = readFile "${config.user.home}/.ssh/id_rsa.pub";
           };
 
           gpg.format = "ssh";

modules/shell/toolset/starship.nix

@@ -11,7 +11,7 @@ in
     hm.programs.starship = {
       enable = true;
       settings = let
-        inherit (config.modules.themes.colors.main) normal types;
+        inherit (config.modules.themes.colors.main) normal bright types;
       in {
         scan_timeout = 10;
         add_newline = true;
@@ -37,28 +37,28 @@ in
         nix_shell = {
           symbol = " ";
           format = "[$symbol$name]($style) ";
-          style = "${normal.purple} bold";
+          style = "${normal.magenta} bold";
         };
 
         git_branch = {
           only_attached = true;
           format = "[$symbol$branch]($style) ";
           symbol = "שׂ";
-          style = "${normal.yellow} bold";
+          style = "${bright.yellow} bold";
         };
 
         git_commit = {
           only_detached = true;
           format = "[ﰖ$hash]($style) ";
-          style = "${normal.yellow} bold";
+          style = "${bright.yellow} bold";
         };
 
         git_state = {
-          style = "${normal.purple} bold";
+          style = "${bright.magenta} bold";
         };
 
         git_status = {
-          style = "${normal.green} bold";
+          style = "${bright.green} bold";
         };
 
         directory = {
@@ -68,16 +68,16 @@ in
 
         cmd_duration = {
           format = "[$duration]($style) ";
-          style = "${normal.blue}";
+          style = "${bright.blue}";
         };
 
         jobs = {
-          style = "${normal.green} bold";
+          style = "${bright.green} bold";
         };
 
         character = {
-          success_symbol = "[\\$](${normal.green} bold)";
+          success_symbol = "[\\$](${bright.green} bold)";
-          error_symbol = "[\\$](${normal.red} bold)";
+          error_symbol = "[\\$](${bright.red} bold)";
         };
       };
     };

modules/shell/zsh.nix

@@ -29,7 +29,7 @@ in
 
       history = {
         size = 10000;
-        path = "${config.xdg.dataHome}/zsh/history";
+        path = "$XDG_CONFIG_HOME/zsh/history";
       };
 
       oh-my-zsh = {

modules/system/graphics.nix

@@ -3,10 +3,9 @@
   services.xserver.videoDrivers = [ "nvidia" ];
 
   hardware = {
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport = true;
+      enable32Bit = true;
-      driSupport32Bit = true;
     };
 
     nvidia = {

modules/themes/everforrest/default.nix

@@ -8,18 +8,18 @@ let
   cfg = config.modules.themes;
 in
 {
-  config = mkIf (cfg.active == "everforrest")
+  config = mkIf (cfg.active == "everforest")
   {
     modules.themes = {
-      wallpaper = mkDefault ./assets/wallpaper.jpeg;
+      wallpaper = mkDefault ./assets/wallpaper.jpg;
 
       gtk = {
-        name = "Everforrest-Dark-BL";
+        name = "Everforest-Dark-BL";
-        package = pkgs.my.everforrest-gtk;
+        package = pkgs.my.everforest-gtk;
       };
 
       iconTheme = {
-        name = "everforrest-dark";
+        name = "everforest-dark";
         package = pkgs.fluent-icon-theme.override {
           colorVariants = [];
         };
@@ -98,8 +98,8 @@ in
 
       editor = {
         neovim = {
-          dark = "everforrest";
+          dark = "everforest";
-          light = "everforrest";
+          light = "everforest";
         };
       };
     };

packages/everforrest-gtk/default.nix

@@ -14,7 +14,7 @@
   validSizes = ["standard" "compact"];
 
   single = x: lib.optional (x != null) x;
-  pname = "Everforrest";
+  pname = "Everforest";
 in
   lib.checkListOfEnum "${pname} Valid theme accent(s)" validAccents accent
   lib.checkListOfEnum "${pname} Valid shades" validShades (single shade)
@@ -26,9 +26,9 @@ in
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
-      repo = "Everforrest-GTK-Theme";
+      repo = "Everforest-GTK-Theme";
       rev = "bb3fc27a2468f0965a738d9d3b30c52a799572d2";
-#       hash = "sha256-oKqLb66N4swHfhjUZJIGryE0D9MkuLdKFQa6j3TFmOg=";
+      hash = "sha256-sTHyH1pCq/d2JMmEppdQAc+P8a3y1lM+WQcW7nXEoPE=";
     };
 
     nativeBuildInputs = [jdupes sassc];
@@ -61,8 +61,8 @@ in
     '';
 
     meta = with lib; {
-      description = "A GTK theme based on the Everforrest colour palette";
+      description = "A GTK theme based on the Everforest colour palette";
-      homepage = "https://github.com/Fausto-Korpsvart/Everforrest-GTK-Theme";
+      homepage = "https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme";
       license = licenses.gpl3Only;
       platforms = platforms.all;
     };