Small clean ups

flake.lock

@@ -173,6 +173,24 @@
       }
     },
     "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nur",
@@ -251,6 +269,25 @@
         "type": "github"
       }
     },
+    "helium": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1778868513,
+        "narHash": "sha256-wbOYtF5N7TISQpfHRQzSSNo7EEsUAp+ZkyY7xzS3s7I=",
+        "owner": "ntgn",
+        "repo": "helium-flake",
+        "rev": "2248af12b62611a9dd850d2ad17e11d4e31e8105",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "ntgn",
+        "repo": "helium-flake",
+        "type": "gitlab"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -310,7 +347,7 @@
     "monique": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1775640310,
@@ -387,21 +424,6 @@
         "type": "github"
       }
     },
-    "nix-jmu-cs345": {
-      "locked": {
-        "lastModified": 1745564874,
-        "narHash": "sha256-WrHuoXd3hiZ7sbrPKF8mJD6jPemwzM5swuDrDkVXlV0=",
-        "owner": "Eclypsed",
-        "repo": "nix-jmu-cs345",
-        "rev": "323dd2c148eb13fbbae5da48d8a0ed61f47c31ad",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Eclypsed",
-        "repo": "nix-jmu-cs345",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1774777275,
@@ -419,11 +441,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775423009,
+        "lastModified": 1775710090,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -448,6 +470,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1775002709,
@@ -465,6 +502,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1773389992,
         "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
@@ -480,7 +533,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1765934234,
         "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=",
@@ -504,11 +557,11 @@
         "noctalia-qs": "noctalia-qs"
       },
       "locked": {
-        "lastModified": 1775039613,
+        "lastModified": 1776774185,
-        "narHash": "sha256-5VzBe0SOXamABAbtjNF5Y7jaMbSeVtGQRhbICoJ6izo=",
+        "narHash": "sha256-riCnQWAxvltNd6KrkzQLdG2EMxODNxjQOB2Z67DA4KU=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "7b29c11d7aaf476723af14865665cf04750f8d20",
+        "rev": "d7b68652e79bce5813dc4fea7e51636a5da3e1b7",
         "type": "github"
       },
       "original": {
@@ -527,11 +580,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1774994931,
+        "lastModified": 1776585574,
-        "narHash": "sha256-WmXA8kyqvDA226DRPrXyR6bLO9VsRr4SUAYCVH6H6Ns=",
+        "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=",
         "owner": "noctalia-dev",
         "repo": "noctalia-qs",
-        "rev": "b053facf8421df220d0bf2496a543b23dee3ca85",
+        "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add",
         "type": "github"
       },
       "original": {
@@ -542,7 +595,7 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -602,14 +655,14 @@
         "agenix-rekey": "agenix-rekey",
         "assets": "assets",
         "flake-parts": "flake-parts_2",
+        "helium": "helium",
         "home-manager": "home-manager_2",
         "import-tree": "import-tree",
         "monique": "monique",
         "niri": "niri",
         "niri-blur": "niri-blur",
-        "nix-jmu-cs345": "nix-jmu-cs345",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "noctalia": "noctalia",
         "nur": "nur",
         "packages": "packages",
@@ -741,11 +794,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773297127,
+        "lastModified": 1775636079,
-        "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=",
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
         "type": "github"
       },
       "original": {
@@ -797,11 +850,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775744672,
+        "lastModified": 1775961625,
-        "narHash": "sha256-Qg3Wnn3WYiiii35CE9kE+XX4ooSFzupAnGC1/NjI5C8=",
+        "narHash": "sha256-8SjilptVv9dSTvn0Z5j65vHHu+flmPXeyrGaSyRJm7U=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "14a238beb0621977e9bf04cba68919d5650deea9",
+        "rev": "0eaab249f5ca1c55921e99cfe07187410758c9fa",
         "type": "github"
       },
       "original": {
@@ -814,7 +867,7 @@
       "inputs": {
         "crane": "crane",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "rust-overlay": "rust-overlay"
       },
       "locked": {

flake.nix

@@ -65,7 +65,9 @@
       };
     };
 
-    nix-jmu-cs345.url = "github:Eclypsed/nix-jmu-cs345";
+    helium = {
+      url = "gitlab:ntgn/helium-flake";
+    };
 
     assets = {
       flake = false;

modules/_unused/fonts.nix

@@ -1,17 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  fonts = {
-    enableDefaultPackages = true;
-    fontconfig.enable = true;
-    packages = with pkgs; [
-      nerd-fonts.fira-code
-      nerd-fonts.jetbrains-mono
-      nerd-fonts.symbols-only
-      nerd-fonts.geist-mono
-      rubik
-    ];
-  };
-}

modules/_unused/helium.nix

@@ -0,0 +1,37 @@
+{
+  inputs,
+  ...
+}:
+{
+  flake.modules.nixos.helium = {
+    imports = [
+      inputs.helium.nixosModules.helium
+    ];
+  };
+
+  flake.modules.homeManager.helium = {
+    imports = [
+      inputs.helium.homeModules.helium
+    ];
+
+    programs.helium = {
+      enable = true;
+      defaultBrowser = false;
+      extensions = [
+        {
+          # Bitwarden
+          id = "nngceckbapebfimnlniiiahkandclblb";
+          hash = "sha256-lhjupdYi1F+MlReNjN/JFGguUagSaU2onfJ1HWEwBKc=";
+        }
+      ];
+
+      extraPolicies = {
+        BookmarkBarEnabled = false;
+        BrowserSignIn = 0;
+        DeveloperToolsAvailability = 1;
+        HomepageLocation = "http://100.78.212.35:30054";
+        PasswordManagerEnabled = false;
+      };
+    };
+  };
+}

modules/_unused/mullvad.nix

@@ -0,0 +1,8 @@
+{
+  flake.modules.nixos.mullvad = {
+    services.mullvad-vpn = {
+      enable = true;
+      enableEarlyBootBlocking = true;
+    };
+  };
+}

modules/_unused/zathura.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.zathura = {
+    programs.zathura = {
+      enable = true;
+    };
+  };
+}

modules/_unused/zen-browser.nix

@@ -77,12 +77,22 @@
               Default = false;
               Locked = true;
             };
+            Preferences = {
+              "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+            };
             PrimaryPassword = false;
             SearchBar = "unified";
             ShowHomeButton = true;
             SkipTermsOfUse = true;
           };
           profiles.default = {
+            id = 0;
+            name = "default";
+            isDefault = true;
+            settings = {
+              # Auto-enable extensions
+              "extensions.autoDisableScopes" = 0;
+            };
             search = {
               force = true;
               default = "google";
@@ -159,10 +169,6 @@
                   };
                 };
             };
-            settings = {
-              # Auto-enable extensions
-              "extensions.autoDisableScopes" = 0;
-            };
           };
         };
     };

modules/features/btop.nix

@@ -0,0 +1,98 @@
+{
+  flake.modules.homeManager.btop = {
+    programs.btop = {
+      enable = true;
+      settings = {
+        color_theme = "catppuccin_mocha";
+        theme_background = false;
+      };
+      themes = {
+        catppuccin_mocha = ''
+          # Main background, empty for terminal default, need to be empty if you want transparent background
+          theme[main_bg]="#1e1e2e"
+
+          # Main text color
+          theme[main_fg]="#cdd6f4"
+
+          # Title color for boxes
+          theme[title]="#cdd6f4"
+
+          # Highlight color for keyboard shortcuts
+          theme[hi_fg]="#89b4fa"
+
+          # Background color of selected item in processes box
+          theme[selected_bg]="#45475a"
+
+          # Foreground color of selected item in processes box
+          theme[selected_fg]="#89b4fa"
+
+          # Color of inactive/disabled text
+          theme[inactive_fg]="#7f849c"
+
+          # Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+          theme[graph_text]="#f5e0dc"
+
+          # Background color of the percentage meters
+          theme[meter_bg]="#45475a"
+
+          # Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+          theme[proc_misc]="#f5e0dc"
+
+          # CPU, Memory, Network, Proc box outline colors
+          theme[cpu_box]="#cba6f7" #Mauve
+          theme[mem_box]="#a6e3a1" #Green
+          theme[net_box]="#eba0ac" #Maroon
+          theme[proc_box]="#89b4fa" #Blue
+
+          # Box divider line and small boxes line color
+          theme[div_line]="#6c7086"
+
+          # Temperature graph color (Green -> Yellow -> Red)
+          theme[temp_start]="#a6e3a1"
+          theme[temp_mid]="#f9e2af"
+          theme[temp_end]="#f38ba8"
+
+          # CPU graph colors (Teal -> Lavender)
+          theme[cpu_start]="#94e2d5"
+          theme[cpu_mid]="#74c7ec"
+          theme[cpu_end]="#b4befe"
+
+          # Mem/Disk free meter (Mauve -> Lavender -> Blue)
+          theme[free_start]="#cba6f7"
+          theme[free_mid]="#b4befe"
+          theme[free_end]="#89b4fa"
+
+          # Mem/Disk cached meter (Sapphire -> Lavender)
+          theme[cached_start]="#74c7ec"
+          theme[cached_mid]="#89b4fa"
+          theme[cached_end]="#b4befe"
+
+          # Mem/Disk available meter (Peach -> Red)
+          theme[available_start]="#fab387"
+          theme[available_mid]="#eba0ac"
+          theme[available_end]="#f38ba8"
+
+          # Mem/Disk used meter (Green -> Sky)
+          theme[used_start]="#a6e3a1"
+          theme[used_mid]="#94e2d5"
+          theme[used_end]="#89dceb"
+
+          # Download graph colors (Peach -> Red)
+          theme[download_start]="#fab387"
+          theme[download_mid]="#eba0ac"
+          theme[download_end]="#f38ba8"
+
+          # Upload graph colors (Green -> Sky)
+          theme[upload_start]="#a6e3a1"
+          theme[upload_mid]="#94e2d5"
+          theme[upload_end]="#89dceb"
+
+          # Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
+          theme[process_start]="#74c7ec"
+          theme[process_mid]="#b4befe"
+          theme[process_end]="#cba6f7"
+        '';
+      };
+    };
+  };
+}

modules/features/helix.nix

@@ -92,7 +92,7 @@
             {
               normal = {
                 "C-y" =
-                  ":sh zellij run -n Yazi -c -f -x 10%% -y 10%% --width 80%% --height 80%% -- yazi-picker open %{buffer_name}";
+                  ":sh zellij run -n Yazi -c -f -x 10%% -y 10%% --width 80%% --height 80%% -- yazi-picker open \"%{buffer_name}\"";
               }
               // arrow_keys;
               insert = {

modules/features/zellij.nix

@@ -38,6 +38,9 @@
             theme = "catppuccin-mocha";
             show_startup_tips = false;
             default_mode = "locked";
+            session_serialization = false;
+            on_force_close = "quit";
+            support_kitty_keyboard_protocol = false;
 
             ui._children = [
               {
@@ -62,19 +65,51 @@
                   }
                 ])
                 (sharedExcept
-                  [ "locked" "normal" "renamepane" "renametab" ]
+                  [ "locked" "renamepane" "renametab" ]
                   [
                     {
                       keys = "Esc";
+                      actions = [ (switchMode "Locked") ];
+                    }
+                  ]
+                )
+                (sharedExcept
+                  [ "locked" "normal" "renamepane" "renametab" ]
+                  [
+                    {
+                      keys = "${mod} n";
                       actions = [ (switchMode "Normal") ];
                     }
                   ]
                 )
+                (sharedExcept
+                  [ "locked" "pane" "renamepane" "renametab" ]
+                  [
+                    {
+                      keys = "${mod} p";
+                      actions = [ (switchMode "Pane") ];
+                    }
+                  ]
+                )
+                (sharedExcept
+                  [ "locked" "tab" "renamepane" "renametab" ]
+                  [
+                    {
+                      keys = "${mod} t";
+                      actions = [ (switchMode "Tab") ];
+                    }
+                  ]
+                )
+                (sharedExcept
+                  [ "locked" "resize" "renamepane" "renametab" ]
+                  [
+                    {
+                      keys = "${mod} r";
+                      actions = [ (switchMode "Resize") ];
+                    }
+                  ]
+                )
                 (modeBinds "normal" [
-                  {
-                    keys = "Esc";
-                    actions = [ (switchMode "Locked") ];
-                  }
                   {
                     keys = "h";
                     actions = [ (actionWith "MoveFocusOrTab" [ "Left" ]) ];
@@ -99,18 +134,6 @@
                     keys = "L";
                     actions = [ (action "GoToNextTab") ];
                   }
-                  {
-                    keys = "p";
-                    actions = [ (switchMode "Pane") ];
-                  }
-                  {
-                    keys = "t";
-                    actions = [ (switchMode "Tab") ];
-                  }
-                  {
-                    keys = "r";
-                    actions = [ (switchMode "Resize") ];
-                  }
                 ])
                 (modeBinds "pane" [
                   {

modules/users/eclypse.nix

@@ -37,12 +37,13 @@ in
     { pkgs, ... }:
     {
       imports = with self.modules.homeManager; [
-        inputs.nix-jmu-cs345.homeManagerModules.bernstdh
         assets
         bat
+        btop
         direnv
         eza
         fastfetch
+        firefox
         fonts
         foot
         fzf
@@ -61,7 +62,6 @@ in
         yazi
         zed
         zellij
-        zen-browser
         zoxide
         zsh
       ];
@@ -76,7 +76,6 @@ in
       wallpaperDir = "${inputs.assets}/wallpapers";
 
       programs.home-manager.enable = true;
-      programs.nix-jmu-cs345.enable = true;
 
       home.packages = with pkgs; [
         devenv
@@ -84,11 +83,13 @@ in
         obsidian
         upscayl
         trayscale
+        cura-appimage
 
         # CD Stuff
         picard
         heybrochecklog
         rsgain
+        vlc
 
         playerctl
         brightnessctl