,

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)";
-          error_symbol = "[\\$](${normal.red} bold)";
+          success_symbol = "[\\$](${bright.green} 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;
-      driSupport32Bit = true;
+      enable32Bit = 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";
-        package = pkgs.my.everforrest-gtk;
+        name = "Everforest-Dark-BL";
+        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";
-          light = "everforrest";
+          dark = "everforest";
+          light = "everforest";
         };
       };
     };