reorganize home-manager

home-manager/gui.nix

@@ -7,8 +7,8 @@
 {
   imports = [
     ./no-gui.nix
-    # ./progs/librewolf.nix
     ./progs/gpt4all/gpt4all.nix
+    ./progs/alacritty.nix
   ];
 
   nixpkgs.config.allowUnfreePredicate =
@@ -110,13 +110,6 @@
     BROWSER = "zen";
   };
 
-  #Terminal emulator
-  programs.alacritty = {
-    enable = true;
-    package = pkgs.alacritty;
-    settings = import ./progs/alacritty.nix { inherit pkgs; };
-  };
-
   #for trezor stuff
   /*
     trezor-udev-rules #trezor udev rules

home-manager/no-gui.nix

@@ -7,6 +7,11 @@
   ...
 }:
 {
+  imports = [
+    ./progs/fish.nix
+    ./progs/helix.nix
+  ];
+
   home.stateVersion = "24.11";
 
   home.packages = with pkgs; [
@@ -186,12 +191,6 @@
     ${pkgs.gnupg}/bin/gpg --import ${config.age.secrets.gnupg.path}
   '';
 
-  #fish shell!
-  programs.fish = import ./progs/fish.nix { inherit pkgs; };
-
-  #text editor
-  programs.helix = import ./progs/helix.nix { inherit pkgs; };
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }

home-manager/progs/alacritty.nix

@@ -1,5 +1,9 @@
-{ pkgs }:
+{ pkgs, ... }:
 {
+  programs.alacritty = {
+    enable = true;
+    package = pkgs.alacritty;
+    settings = {
       #use the fish shell
       shell.program = "${pkgs.fish}/bin/fish";
 
@@ -121,4 +125,6 @@
         style = "Underline";
         vi_mode_style = "Underline";
       };
+    };
+  };
 }

home-manager/progs/fish.nix

@@ -1,10 +1,11 @@
-{ pkgs }:
+{ pkgs, ... }:
 let
   eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first";
   cargo = "${pkgs.cargo}/bin/cargo";
   coreutil = "${pkgs.coreutils}/bin";
 in
 {
+  programs.fish = {
     enable = true;
 
     interactiveShellInit = ''
@@ -64,4 +65,5 @@ in
         src = pkgs.fishPlugins.hydro.src;
       }
     ];
+  };
 }

home-manager/progs/helix.nix

@@ -1,5 +1,6 @@
-{ pkgs }:
+{ pkgs, ... }:
 {
+  programs.helix = {
     enable = true;
     package = pkgs.helix;
     settings = {
@@ -285,4 +286,5 @@
           };
         };
     };
+  };
 }

home-manager/progs/librewolf.nix

@@ -1,77 +0,0 @@
-{ pkgs, inputs, ... }:
-{
-  home.packages = with pkgs; [ librewolf ];
-
-  programs.librewolf = {
-    enable = true;
-    settings = {
-      "webgl.disabled" = false;
-      "privacy.resistFingerprinting" = false;
-      "privacy.clearOnShutdown.history" = false;
-      "privacy.clearOnShutdown.cookies" = false;
-      "network.cookie.lifetimePolicy" = 0;
-      "general.useragent.compatMode.firefox" = true;
-      "identity.fxaccounts.enabled" = true;
-      "services.sync.prefs.sync.privacy.clearOnShutdown.cookies" = false;
-      "services.sync.prefs.sync.privacy.clearOnShutdown_v2.cookiesAndStorage" = false;
-
-      "general.useragent.override" = "Mozilla/5.0 (X11; Linux x86_64; rv:${pkgs.firefox.version}) Gecko/20100101 Firefox/${pkgs.firefox.version}";
-
-      "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
-
-      # For themeing
-      "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-      "browser.tabs.drawInTitlebar" = true;
-      "svg.context-properties.content.enabled" = true;
-
-      #fake location, FIT (just about)
-      "geo.provider.network.url" =
-        "data:application/json,"
-        + builtins.toJSON {
-          location = {
-            lat = 28.0749;
-            lng = -80.6302;
-          };
-          accuracy = 1.0;
-        };
-    };
-  };
-
-  home.file =
-    let
-      chromeTheme = ".librewolf/tckj7njq.default-release/chrome";
-
-      firefoxThemeFile = file: src: {
-        target = "${chromeTheme}/${file}";
-        source = "${inputs.firefox-mod-theme}/${src}/${file}";
-        recursive = true;
-      };
-
-      baseThemeFile = {
-        file = "";
-        src = "";
-      };
-
-      modThemeFiles = [
-        {
-          file = "userChrome.css";
-        }
-        {
-          file = "userContent.css";
-        }
-        {
-          file = "ASSETS";
-        }
-      ];
-    in
-    builtins.listToAttrs (
-      map (f: {
-        name = "firefox-theme-${f.file}";
-        value = firefoxThemeFile f.file f.src;
-      }) (map (f: baseThemeFile // f) modThemeFiles)
-    );
-
-  home.sessionVariables = {
-    BROWSER = "librewolf";
-  };
-}