diff --git a/components/hm/kitty.nix b/components/hm/kitty.nix
index ee61c3a..1b58b46 100644
--- a/components/hm/kitty.nix
+++ b/components/hm/kitty.nix
@@ -1,56 +1,65 @@
-{ ... }:
+{ config, lib, ... }:
 {
-  # Enable Kitty terminal
-  programs.kitty = {
-    enable = true;
-
-    settings = {
-      # Window settings
-      background_opacity = 1.0;
-      os_window_class = "kitty";
-      remember_window_size = false;
-      placement_strategy = "center";
-      initial_window_width = "160c";
-      initial_window_height = "55c";
-
-      # Remove window borders
-      hide_window_decorations = "titlebar-only";
-      tab_title_template = "none";
-      active_tab_title_template  = "none";
-      draw_minimal_borders = "yes";
-      window_border_width = "0.1pt";
-
-      # Colors (Catppuccin Coal)
-      foreground = "#e0e0e0";
-      background = "#262626";
-      color0 = "#1f1f1f";
-      color1 = "#f38ba8";
-      color2 = "#a6e3a1";
-      color3 = "#f9e2af";
-      color4 = "#89b4fa";
-      color5 = "#cba6f7";
-      color6 = "#89dceb";
-      color7 = "#e0e0e0";
-      color8 = "#565656";
-      color9 = "#f38ba8";
-      color10 = "#a6e3a1";
-      color11 = "#f9e2af";
-      color12 = "#89b4fa";
-      color13 = "#cba6f7";
-      color14 = "#89dceb";
-      color15 = "#ffffff";
-
-      # Font settings
-      font_family = "JetBrainsMonoNL Nerd Font";
-      font_size = 12.0;
-      bold_font = "auto";
-      italic_font = "auto";
-      italic_bold_font = "auto";
+  options.components.kitty = {
+    font_size = lib.mkOption {
+      type = lib.types.float;
+      default = 12.0;
+      description = "Font size for Kitty terminal";
     };
+  };
+  config = {
+    # Enable Kitty terminal
+    programs.kitty = {
+      enable = true;
 
-    # If you want to include extra configuration this way instead of through the main `settings` attribute
-    extraConfig = ''
-      # You can add additional config here if needed
-    '';
+      settings = {
+        # Window settings
+        background_opacity = 1.0;
+        os_window_class = "kitty";
+        remember_window_size = false;
+        placement_strategy = "center";
+        initial_window_width = "160c";
+        initial_window_height = "55c";
+
+        # Remove window borders
+        hide_window_decorations = "titlebar-only";
+        tab_title_template = "none";
+        active_tab_title_template = "none";
+        draw_minimal_borders = "yes";
+        window_border_width = "0.1pt";
+
+        # Colors (Catppuccin Coal)
+        foreground = "#e0e0e0";
+        background = "#262626";
+        color0 = "#1f1f1f";
+        color1 = "#f38ba8";
+        color2 = "#a6e3a1";
+        color3 = "#f9e2af";
+        color4 = "#89b4fa";
+        color5 = "#cba6f7";
+        color6 = "#89dceb";
+        color7 = "#e0e0e0";
+        color8 = "#565656";
+        color9 = "#f38ba8";
+        color10 = "#a6e3a1";
+        color11 = "#f9e2af";
+        color12 = "#89b4fa";
+        color13 = "#cba6f7";
+        color14 = "#89dceb";
+        color15 = "#ffffff";
+
+        # Font settings
+        font_family = "JetBrainsMonoNL Nerd Font";
+        font_size = config.components.kitty.font_size;
+        bold_font = "auto";
+        italic_font = "auto";
+        italic_bold_font = "auto";
+      };
+
+      # If you want to include extra configuration this way instead of through the main `settings` attribute
+      extraConfig = ''
+        # You can add additional config here if needed
+      '';
+    };
   };
 }
diff --git a/components/nix/rust-dev.nix b/components/nix/rust-dev.nix
new file mode 100644
index 0000000..c5af076
--- /dev/null
+++ b/components/nix/rust-dev.nix
@@ -0,0 +1,50 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with lib;
+
+let
+  rustChannel = config.programs.rust.channel;
+  rustVersion = config.programs.rust.version;
+in
+{
+  options.components.rust = {
+    enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable Rust programming language support.";
+    };
+
+    repl = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable the evcxr repl for `rust` command.";
+    };
+
+    channel = mkOption {
+      type = types.str;
+      default = "stable";
+      description = "The Rust release channel to use (e.g., stable, beta, nightly).";
+    };
+
+    version = mkOption {
+      type = types.str;
+      default = "latest";
+      description = "The specific version of Rust to use. Use 'latest' for the latest stable release.";
+    };
+  };
+
+  config = mkIf config.components.rust.enable {
+    environment.systemPackages = with pkgs; [
+      rustup gcc
+    ] ++ (if config.components.rust.repl then [ pkgs.evcxr ] else [ ]);
+
+    environment.shellAliases = mkIf config.components.rust.repl {
+      rust = "evcxr";
+    };
+  };
+}
diff --git a/flake.nix b/flake.nix
index 1927860..cc9a80c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,17 +44,23 @@
                 # Check if worktree already exists
                 if [ ! -d "$module_path" ]; then
                     echo "Adding worktree for $branch in $module_path"
-                    git worktree add "$module_path" "$branch" 2>/dev/null
+                    (git worktree add "$module_path" "$branch" 2>/dev/null) &
                 else
-                    cd "$module_path"
-                    git fetch origin "$branch" >/dev/null 2>&1
-                    if ! git diff --quiet HEAD "origin/$branch"; then
-                        echo "Updates available for $branch in $module_path"
-                    fi
-                    cd - >/dev/null
+                    (
+                      cd "$module_path"
+                      git fetch origin "$branch" >/dev/null 2>&1
+                      if ! git diff --quiet HEAD "origin/$branch"; then
+                          echo "Updates available for $branch in $module_path"
+                          git pull origin "$branch"
+                      fi
+                      cd - >/dev/null
+                    ) &
                 fi
             done
 
+            # Wait for all background processes to finish
+            wait
+
             # Check for and remove orphaned module directories
             if [ -d "modules" ]; then
                 for dir in modules/*; do
@@ -62,11 +68,13 @@
                         module_name="$(basename "$dir")"
                         if ! echo "$branches" | grep -q "^mod_$module_name$"; then
                             echo "Removing orphaned module directory: $dir"
-                            git worktree remove --force "$dir"
+                            (git worktree remove --force "$dir") &
                         fi
                     fi
                 done
             fi 
+
+            wait
           '';
           mod_status = pkgs.writeShellScriptBin "mod_status" ''
             cwd=$(pwd)
diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock
index f2defaa..f3f3813 100644
--- a/hosts/oren/flake.lock
+++ b/hosts/oren/flake.lock
@@ -25,32 +25,6 @@
         "type": "github"
       }
     },
-    "cosmic": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": [
-          "mod_de_cosmic",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "mod_de_cosmic",
-          "nixpkgs-stable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736513564,
-        "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=",
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "rev": "0855bf33427209e4f5e3d2d0968a14784525e929",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "type": "github"
-      }
-    },
     "crane": {
       "locked": {
         "lastModified": 1725409566,
@@ -90,22 +64,6 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1717312683,
-        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -192,11 +150,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736544147,
-        "narHash": "sha256-WijrrGDuY8O0VUgsIbZK6PrvCMdgUGPex23hv1FmmHs=",
+        "lastModified": 1737140780,
+        "narHash": "sha256-qf0GX8TZcu05RqBdqm3kYz82EVWH0Ijl7FMa89UMAks=",
         "ref": "mod_common",
-        "rev": "780bcb7c44a274e4128af656dafce6d26463d6b8",
-        "revCount": 6,
+        "rev": "172ff3a299bbd8463fdd71a2ac2dc257bc7331e8",
+        "revCount": 11,
         "type": "git",
         "url": "https://git.joshuabell.xyz/dotfiles"
       },
@@ -206,27 +164,18 @@
         "url": "https://git.joshuabell.xyz/dotfiles"
       }
     },
-    "mod_de_cosmic": {
-      "inputs": {
-        "cosmic": "cosmic",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs"
-        ]
-      },
+    "mod_de_gnome": {
       "locked": {
-        "lastModified": 1736544162,
-        "narHash": "sha256-C1pkQDar5XSdZtir3EfMWtW9gX3z8vaucGg800YzMvw=",
-        "ref": "mod_de_cosmic",
-        "rev": "6d8795b3c6ce2a640abe36801959e3af37d85a2e",
-        "revCount": 3,
+        "lastModified": 1737060750,
+        "narHash": "sha256-2uPSP5KyEUcmArlYDvfZvumL3Yo7x0D+//Q28QzTdjQ=",
+        "ref": "mod_de_gnome",
+        "rev": "218ad3b357bb2c3e6d5e52c484c397ea506c0628",
+        "revCount": 38,
         "type": "git",
         "url": "https://git.joshuabell.xyz/dotfiles"
       },
       "original": {
-        "ref": "mod_de_cosmic",
+        "ref": "mod_de_gnome",
         "type": "git",
         "url": "https://git.joshuabell.xyz/dotfiles"
       }
@@ -255,11 +204,11 @@
     },
     "mod_nebula": {
       "locked": {
-        "lastModified": 1735839301,
-        "narHash": "sha256-f2JlNaCrA3BA8fPT0uThiuiIZX5ehDe0lPlSLL/QMgY=",
+        "lastModified": 1737504380,
+        "narHash": "sha256-fCUUWkXAzsJDdZuGoG4GhAMdGld4J8cvDtzo6SlB9Dg=",
         "ref": "mod_nebula",
-        "rev": "38c50b65c66740566b39529bbd91624b01b6ea2a",
-        "revCount": 3,
+        "rev": "70cea59e9f1f750fd0aee8cde8cd54aee8601336",
+        "revCount": 5,
         "type": "git",
         "url": "https://git.joshuabell.xyz/dotfiles"
       },
@@ -293,11 +242,11 @@
         "ragenix": "ragenix"
       },
       "locked": {
-        "lastModified": 1736544189,
-        "narHash": "sha256-itFFi1SGZRdmREBhcDpuSD93bInq2Juoj3JQ7Q/oF+8=",
+        "lastModified": 1737492763,
+        "narHash": "sha256-AMh+4cqU9bhOQ85du76RsJ78ip1yDaiTtModlpREMSI=",
         "ref": "mod_secrets",
-        "rev": "17777b25238d4cb84b903252c49c75bd7030a3f6",
-        "revCount": 8,
+        "rev": "b45dd1d219a656c52cde4b98c509c36ed1833ae0",
+        "revCount": 11,
         "type": "git",
         "url": "https://git.joshuabell.xyz/dotfiles"
       },
@@ -356,11 +305,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1736200483,
-        "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
+        "lastModified": 1738023785,
+        "narHash": "sha256-BPHmb3fUwdHkonHyHi1+x89eXB3kA1jffIpwPVJIVys=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
+        "rev": "2b4230bf03deb33103947e2528cac2ed516c5c89",
         "type": "github"
       },
       "original": {
@@ -372,11 +321,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1735854365,
-        "narHash": "sha256-pNb03vdsQmn0jS5dKAdx2DFZ2QH4RRvrIzZxqpfMcS8=",
+        "lastModified": 1737567054,
+        "narHash": "sha256-LI1z4HET4hgP6iyWehrWRd5luNbUk9zz/GFzqI1iAFo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cd9f495ef7584a714938915d3fe9327c2735d7e4",
+        "rev": "bbe8109b528365cf3fd3a93c931dd86d57c3bd5a",
         "type": "github"
       },
       "original": {
@@ -436,11 +385,11 @@
     "nvim_plugin-L3MON4D3/LuaSnip": {
       "flake": false,
       "locked": {
-        "lastModified": 1733162004,
-        "narHash": "sha256-efDe3RXncnNVkj37AmIv8oj0DKurB50Dziao5FGTLP4=",
+        "lastModified": 1736009707,
+        "narHash": "sha256-3ecm5SDTcSOh256xSQPHhddQfMpepiEIpv58fHXrVg0=",
         "owner": "L3MON4D3",
         "repo": "LuaSnip",
-        "rev": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d",
+        "rev": "c9b9a22904c97d0eb69ccb9bab76037838326817",
         "type": "github"
       },
       "original": {
@@ -452,11 +401,11 @@
     "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1735525479,
-        "narHash": "sha256-ncFqBv0JITX3pTsLON+HctLUaKXhLRMBUrRWmI8KOSA=",
+        "lastModified": 1737054285,
+        "narHash": "sha256-7yepeUhhViVJpbj48qg0Z3cCCtGt6bZ90hM/ie+5LqA=",
         "owner": "MeanderingProgrammer",
         "repo": "render-markdown.nvim",
-        "rev": "6fbd1491abc104409f119685de5353c35c97c005",
+        "rev": "ad055861d17afe058bd835e82292e14a64b51b1d",
         "type": "github"
       },
       "original": {
@@ -500,11 +449,11 @@
     "nvim_plugin-Saecki/crates.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1727384188,
-        "narHash": "sha256-DIG0MXRTit4iEVoLlgsTK4znjam/QDjeZEpIDn6KHiE=",
+        "lastModified": 1735942265,
+        "narHash": "sha256-dj7VXlMbS4HvSc+/WMQprtqWzrYrWaCnSEE0ygp/LcI=",
         "owner": "Saecki",
         "repo": "crates.nvim",
-        "rev": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785",
+        "rev": "bd35b13e94a292ee6e32c351e05ca2202dc9f070",
         "type": "github"
       },
       "original": {
@@ -532,11 +481,11 @@
     "nvim_plugin-b0o/schemastore.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1735689742,
-        "narHash": "sha256-Q/MD8cmYfZGJ0n13oixSPcNFq/VkmaKsLF4JbwFEilU=",
+        "lastModified": 1737490106,
+        "narHash": "sha256-jtZ6cta98Wx4vZHcXq0jKfOfpQtTFRFrH5W+/8jyL5g=",
         "owner": "b0o",
         "repo": "schemastore.nvim",
-        "rev": "fa47222e29d6f6e80eddcdd0f125c27edf274ad5",
+        "rev": "5be212138af55d3dcae9d77b5b14f63634243e3d",
         "type": "github"
       },
       "original": {
@@ -596,11 +545,11 @@
     "nvim_plugin-folke/lazy.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1734116297,
-        "narHash": "sha256-48i6Z6cwccjd5rRRuIyuuFS68J0lAIAEEiSBJ4Vq5vY=",
+        "lastModified": 1736194490,
+        "narHash": "sha256-7npvUPMmQC6/Ywdcuxbmdboa8eJ1RNgZ+rzb3MeN0t0=",
         "owner": "folke",
         "repo": "lazy.nvim",
-        "rev": "7e6c863bc7563efbdd757a310d17ebc95166cef3",
+        "rev": "d8f26efd456190241afd1b0f5235fe6fdba13d4a",
         "type": "github"
       },
       "original": {
@@ -628,11 +577,11 @@
     "nvim_plugin-folke/which-key.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1734253151,
-        "narHash": "sha256-f/+sYMDEguB5ZDiYiQAsDvdF/2cVcWnLBU+9qwigk4s=",
+        "lastModified": 1736055319,
+        "narHash": "sha256-9V74V01dCqg1w5fpzzCmyfhR3/AYQg2MCIYkkjFv1go=",
         "owner": "folke",
         "repo": "which-key.nvim",
-        "rev": "8ab96b38a2530eacba5be717f52e04601eb59326",
+        "rev": "1f8d414f61e0b05958c342df9b6a4c89ce268766",
         "type": "github"
       },
       "original": {
@@ -692,11 +641,11 @@
     "nvim_plugin-hrsh7th/nvim-cmp": {
       "flake": false,
       "locked": {
-        "lastModified": 1734672427,
-        "narHash": "sha256-Z/Qy2ErbCa7dbjZVuJUkMmb4d24amNunNgRcbCGPfOg=",
+        "lastModified": 1736172730,
+        "narHash": "sha256-TmXpMgkPWXHn4+leojZg1V18wOiPDsKQeG1h8nGgVHo=",
         "owner": "hrsh7th",
         "repo": "nvim-cmp",
-        "rev": "b555203ce4bd7ff6192e759af3362f9d217e8c89",
+        "rev": "8c82d0bd31299dbff7f8e780f5e06d2283de9678",
         "type": "github"
       },
       "original": {
@@ -708,11 +657,11 @@
     "nvim_plugin-j-hui/fidget.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1734334336,
+        "lastModified": 1736356439,
         "narHash": "sha256-o0za2NxFtzHZa7PRIm9U/P1/fwJrxS1G79ukdGLhJ4Q=",
         "owner": "j-hui",
         "repo": "fidget.nvim",
-        "rev": "9238947645ce17d96f30842e61ba81147185b657",
+        "rev": "a0abbf18084b77d28bc70e24752e4f4fd54aea17",
         "type": "github"
       },
       "original": {
@@ -740,11 +689,11 @@
     "nvim_plugin-lewis6991/gitsigns.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1732361574,
-        "narHash": "sha256-H7A+AxioiedSuC+jqRwP4c7DjZR/0j4o/fTUasT2urc=",
+        "lastModified": 1737539715,
+        "narHash": "sha256-Htx06FTru66DPFJUZEe6AaKqVtrD65MMqcerjjEZMR4=",
         "owner": "lewis6991",
         "repo": "gitsigns.nvim",
-        "rev": "5f808b5e4fef30bd8aca1b803b4e555da07fc412",
+        "rev": "632fda72df903255dc1683cd739dceaa7338128a",
         "type": "github"
       },
       "original": {
@@ -772,11 +721,11 @@
     "nvim_plugin-lukas-reineke/indent-blankline.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1733296464,
-        "narHash": "sha256-H3lUQZDvgj3a2STYeMUDiOYPe7rfsy08tJ4SlDd+LuE=",
+        "lastModified": 1737369467,
+        "narHash": "sha256-0+boInVEzS2myYil/l+frs8PAa/2eJcVTyXnEk6TGvI=",
         "owner": "lukas-reineke",
         "repo": "indent-blankline.nvim",
-        "rev": "259357fa4097e232730341fa60988087d189193a",
+        "rev": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78",
         "type": "github"
       },
       "original": {
@@ -820,11 +769,11 @@
     "nvim_plugin-mbbill/undotree": {
       "flake": false,
       "locked": {
-        "lastModified": 1726704151,
-        "narHash": "sha256-XU2n5S2XLIQcPUJESzW+g/ZAXqJo/9uIHYtFutlqmvA=",
+        "lastModified": 1735763701,
+        "narHash": "sha256-0DnRarEuDPdYo+zkwH47jG4B4fGjvL1LxqEoFQ7vpjE=",
         "owner": "mbbill",
         "repo": "undotree",
-        "rev": "78b5241191852ffa9bb5da5ff2ee033160798c3b",
+        "rev": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f",
         "type": "github"
       },
       "original": {
@@ -836,11 +785,11 @@
     "nvim_plugin-mfussenegger/nvim-lint": {
       "flake": false,
       "locked": {
-        "lastModified": 1734606055,
-        "narHash": "sha256-tD1ciHUdHIcqymImZjSSNq6M5hjsrD66AJhmLTy0cIY=",
+        "lastModified": 1737487916,
+        "narHash": "sha256-DKfivSjBFra/iXIuYQa7Mv5f2LglNbQTr8bQ+sCm8to=",
         "owner": "mfussenegger",
         "repo": "nvim-lint",
-        "rev": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55",
+        "rev": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87",
         "type": "github"
       },
       "original": {
@@ -852,11 +801,11 @@
     "nvim_plugin-mrcjkb/rustaceanvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1735588128,
-        "narHash": "sha256-0NfZ5GjSpq7kzzwoOcv7E+5QwHBxtcCv5ELd/9WEX0M=",
+        "lastModified": 1737246102,
+        "narHash": "sha256-SSBv1+GxuVpYhpCH//6EXFJ4NXZdZM0pGe19f53JpiA=",
         "owner": "mrcjkb",
         "repo": "rustaceanvim",
-        "rev": "d6183fda8341157d763e487b0ef59a83e55f535b",
+        "rev": "8cf9705d98cc77837aa388a5d48f9a73f27f4782",
         "type": "github"
       },
       "original": {
@@ -868,11 +817,11 @@
     "nvim_plugin-neovim/nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1735439232,
-        "narHash": "sha256-6a1HjpLYdZ+ZmWM1B0tv631A3EHHstPrjaV15UnVtoY=",
+        "lastModified": 1737559700,
+        "narHash": "sha256-p+hGgy6jGErqVy+pbTrfTNF2FosrQlQnMkDHsCl9/kE=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "8b15a1a597a59f4f5306fad9adfe99454feab743",
+        "rev": "513f4f0bde469ecb3abe2e1b606f63cf142e751e",
         "type": "github"
       },
       "original": {
@@ -916,11 +865,11 @@
     "nvim_plugin-nvim-lua/plenary.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1726602776,
-        "narHash": "sha256-bmmPekAvuBvLQmrnnX0n+FRBqfVxBsObhxIEkDGAla4=",
+        "lastModified": 1736675595,
+        "narHash": "sha256-18zX3kZ42ynRefFP0mOcy6ESEpejTukjNi4jCRXx48A=",
         "owner": "nvim-lua",
         "repo": "plenary.nvim",
-        "rev": "2d9b06177a975543726ce5c73fca176cedbffe9d",
+        "rev": "3707cdb1e43f5cea73afb6037e6494e7ce847a66",
         "type": "github"
       },
       "original": {
@@ -996,11 +945,11 @@
     "nvim_plugin-nvim-telescope/telescope.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1732884846,
-        "narHash": "sha256-npb61MZYAotz71Co5G1dUeIqWt7GVeqZNz0A2Yz2dy4=",
+        "lastModified": 1736328372,
+        "narHash": "sha256-5y8srYKaAqFplMtDjsc8GdDF8yui5vCNMiOeFLrC/sM=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc",
+        "rev": "415af52339215926d705cccc08145f3782c4d132",
         "type": "github"
       },
       "original": {
@@ -1012,11 +961,11 @@
     "nvim_plugin-nvim-tree/nvim-tree.lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1734820548,
-        "narHash": "sha256-4PmP31vYPH9xw4AjV5rDSKvcvZGTnIaPfR4Bwc0lAiA=",
+        "lastModified": 1737156486,
+        "narHash": "sha256-b8YOOIYML9aKy4Y7S+iLKIaTfCqrxK1wB/ZaeFRCUmo=",
         "owner": "nvim-tree",
         "repo": "nvim-tree.lua",
-        "rev": "68fc4c20f5803444277022c681785c5edd11916d",
+        "rev": "fca0b67c0b5a31727fb33addc4d9c100736a2894",
         "type": "github"
       },
       "original": {
@@ -1028,11 +977,11 @@
     "nvim_plugin-nvim-tree/nvim-web-devicons": {
       "flake": false,
       "locked": {
-        "lastModified": 1735569123,
-        "narHash": "sha256-h9rY6F+2sBlG9PFN34/0ZTkY66oCeCIPe/HEadM03K4=",
+        "lastModified": 1736480892,
+        "narHash": "sha256-lUlEVEzXX8iCPxXIlpwkqBc19hks8qTvz4FdDNsTviI=",
         "owner": "nvim-tree",
         "repo": "nvim-web-devicons",
-        "rev": "4adeeaa7a32d46cf3b5833341358c797304f950a",
+        "rev": "aafa5c187a15701a7299a392b907ec15d9a7075f",
         "type": "github"
       },
       "original": {
@@ -1044,11 +993,11 @@
     "nvim_plugin-nvim-treesitter/nvim-treesitter-context": {
       "flake": false,
       "locked": {
-        "lastModified": 1734710732,
-        "narHash": "sha256-TIFMPKzD2ero1eK9aVfY1iKEvf/Sw8SL/9mk9omCQ3c=",
+        "lastModified": 1737125584,
+        "narHash": "sha256-W5fELF3Am1c6wpA4/JxWjGVWQuDYKUqKO+M2+7anugM=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-context",
-        "rev": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0",
+        "rev": "bece284c5322ddf6946fa4bdc383a2bc033269d7",
         "type": "github"
       },
       "original": {
@@ -1076,11 +1025,11 @@
     "nvim_plugin-rcarriga/nvim-notify": {
       "flake": false,
       "locked": {
-        "lastModified": 1735562588,
-        "narHash": "sha256-9jDpoLLto9WgTsV399WeE2XGrTJXWTYbcJ+zOFWldAA=",
+        "lastModified": 1737405174,
+        "narHash": "sha256-6vNfc7E9DMXF0IBXJCLA8Rp+uOgbDch/Q7beW0ys3Vo=",
         "owner": "rcarriga",
         "repo": "nvim-notify",
-        "rev": "c3797193536711b5d8983975791c4b11dc35ab3a",
+        "rev": "22f29093eae7785773ee9d543f8750348b1a195c",
         "type": "github"
       },
       "original": {
@@ -1156,11 +1105,11 @@
     "nvim_plugin-stevearc/conform.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1735092409,
-        "narHash": "sha256-J663AMnRT7S0vIpMxGxQNJNR0lodqJe8NvXTDIhfDYk=",
+        "lastModified": 1737567375,
+        "narHash": "sha256-tMLkOLANg87wuq6OSkb0iGm00mnZwOF7Xd+gai4mKNg=",
         "owner": "stevearc",
         "repo": "conform.nvim",
-        "rev": "9180320205d250429f0f80e073326c674e2a7149",
+        "rev": "bf94626f32fbc3c9987ce2f4aab60d96866587df",
         "type": "github"
       },
       "original": {
@@ -1220,11 +1169,11 @@
     "nvim_plugin-uga-rosa/ccc.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1727935067,
-        "narHash": "sha256-OhdR2sAQV5PvlhaKQ6rYneMmvQiN3QfymOeanpAs9wY=",
+        "lastModified": 1735970087,
+        "narHash": "sha256-53WsxOfWULlO4VbSXA4DW6wjkbCzpQjkzv4O8pReuEc=",
         "owner": "uga-rosa",
         "repo": "ccc.nvim",
-        "rev": "7c639042583c7bdc7ce2e37e5a0e0aa6d0659c6a",
+        "rev": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed",
         "type": "github"
       },
       "original": {
@@ -1252,11 +1201,11 @@
     "nvim_plugin-yetone/avante.nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1735541893,
-        "narHash": "sha256-QY7Rt27ul6S4jKrlbsn7hkVy0qd/YWgxYO6dSiFvdk8=",
+        "lastModified": 1737518419,
+        "narHash": "sha256-Opp6ACJwnAIkLdCQwbqjahjCErxDGIpsX9Hj/87Wm/I=",
         "owner": "yetone",
         "repo": "avante.nvim",
-        "rev": "9abbec4c5b580b514184990490dea74d0cdc27cc",
+        "rev": "396840a152be82354984b16f9a22cb425d0840d1",
         "type": "github"
       },
       "original": {
@@ -1343,7 +1292,7 @@
       "inputs": {
         "mod_boot_systemd": "mod_boot_systemd",
         "mod_common": "mod_common",
-        "mod_de_cosmic": "mod_de_cosmic",
+        "mod_de_gnome": "mod_de_gnome",
         "mod_home-manager": "mod_home-manager",
         "mod_nebula": "mod_nebula",
         "mod_ros_stormd": "mod_ros_stormd",
@@ -1415,11 +1364,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1735857201,
-        "narHash": "sha256-zyljmBv1FegF4kF2ZWdSdBCIktSHxJljPipwLOOyjrk=",
+        "lastModified": 1737610236,
+        "narHash": "sha256-UfC+hBu09KEepjnqbXGqRJ0jTlV8HTuD1GjB+ZjTjYM=",
         "ref": "refs/heads/master",
-        "rev": "31220281739c7b6432f3533313a0fa0164f232c0",
-        "revCount": 254,
+        "rev": "631d85a771f3e22822b9ac02d895e2a06aa1e183",
+        "revCount": 260,
         "type": "git",
         "url": "https://git.joshuabell.xyz/nvim"
       },
@@ -1480,11 +1429,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735612067,
-        "narHash": "sha256-rsjojgfPUf9tWuMXuuo2KAIoUZ49XGZQJSjFGOO8Cq4=",
+        "lastModified": 1737512878,
+        "narHash": "sha256-dgF6htdmfNnZzVInifks6npnCAyVsIHWSpWNs10RSW0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d199142e84bfaae476ffb4e09a70879d7918784d",
+        "rev": "06b8ed0eee289fe94c66f1202ced9a6a2c59a14c",
         "type": "github"
       },
       "original": {
diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix
index 768a09f..d2b754b 100644
--- a/hosts/oren/flake.nix
+++ b/hosts/oren/flake.nix
@@ -7,9 +7,8 @@
     mod_common.inputs.nixpkgs.follows = "nixpkgs";
     mod_secrets.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_secrets";
     mod_boot_systemd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_boot_systemd";
-    mod_de_cosmic.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_cosmic";
-    mod_de_cosmic.inputs.nixpkgs-stable.follows = "nixpkgs";
-    mod_de_cosmic.inputs.nixpkgs.follows = "nixpkgs";
+    # mod_de_cosmic.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_cosmic";
+    mod_de_gnome.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_gnome";
     mod_ros_stormd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_stormd";
     mod_nebula.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_nebula";
     mod_home-manager.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_home_manager";
@@ -48,7 +47,7 @@
                 {
                   imports = [
                     ../../components/nix/lua.nix
-                    ../../components/nix/rust-repl.nix
+                    ../../components/nix/rust-dev.nix
                     ../../components/nix/qflipper.nix
                     ../../components/nix/qdirstat.nix
                   ];
@@ -89,6 +88,7 @@
                           imports = [
                             ../../components/hm/tmux/tmux.nix
                             ../../components/hm/alacritty.nix
+                            ../../components/hm/kitty.nix
                             ../../components/hm/atuin.nix
                             ../../components/hm/direnv.nix
                             ../../components/hm/git.nix
@@ -99,6 +99,7 @@
                             ../../components/hm/zoxide.nix
                             ../../components/hm/zsh.nix
                           ];
+                          components.kitty.font_size = 20.0;
                         };
                       };
                     };