Move fonts to be defined when needed, move program shell integration settings into shell-specific expressions

nixos/home/collections/common/desktop.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ../../browser/librewolf.nix
+    ../../desktop/wayland/hyprland.nix
+    ../../env/bash.nix
+    ../../env/fish.nix
+    ../../env/bat.nix
+    ../../env/direnv.nix
+    ../../env/keychain.nix
+    ../../env/ssh.nix
+    ../../env/starship.nix
+    ../../terminal/wezterm.nix
+    ../../tui/neovim.nix
+    ../../tui/lazygit.nix
+  ];
+  home.packages = with pkgs; [
+    bitwarden
+    file
+    marktext
+    silver-searcher
+    signal-desktop
+    zotero
+  ];
+}

nixos/home/collections/personal/default.nix

@@ -1,35 +1,15 @@
 { pkgs, ... }:
 {
   imports = [
-    ../../browser/librewolf.nix
-    ../../desktop/wayland/hyprland.nix
-    ../../env/fonts/firacode.nix
-    ../../env/shell/bash.nix
-    ../../env/shell/fish.nix
-    ../../env/bat.nix
-    ../../env/direnv.nix
-    ../../env/keychain.nix
-    ../../env/nixpkgs.nix
-    ../../env/ssh.nix
-    ../../env/starship.nix
+    ../common/desktop.nix
     ../../git/personal.nix
-    ../../terminal/foot.nix
-    ../../terminal/wezterm.nix
-    ../../tui/neovim.nix
-    ../../tui/lazygit.nix
   ];
   home.packages = with pkgs; [
-    bitwarden
-    file
-    marktext
     mesa
     neovide
     nomachine-client
     otpclient
-    silver-searcher
-    signal-desktop
     steam
     steam-run
-    zotero
   ];
 }

nixos/home/collections/work/default.nix

@@ -1,35 +1,15 @@
 { pkgs, ... }:
 {
   imports = [
-    ../../browser/librewolf.nix
-    ../../desktop/wayland/hyprland.nix
-    ../../env/fonts/firacode.nix
-    ../../env/shell/bash.nix
-    ../../env/shell/fish.nix
-    ../../env/bat.nix
-    ../../env/direnv.nix
-    ../../env/keychain.nix
-    ../../env/nixpkgs.nix
-    ../../env/ssh.nix
-    ../../env/starship.nix
+    ../common/desktop.nix
     ../../git/work.nix
-    ../../terminal/wezterm.nix
-    ../../terminal/foot.nix
-    ../../tui/neovim.nix
-    ../../tui/lazygit.nix
   ];
   home.packages = with pkgs; [
-    bitwarden
-    file
     libreoffice-fresh
-    marktext
     neovide
     nomachine-client
     otpclient
-    silver-searcher
-    signal-desktop
     teams
     zoom-us
-    zotero
   ];
 }

nixos/home/desktop/wayland/hyprland.nix

@@ -30,6 +30,7 @@ in
     # text = "# test";
   };
   xsession.enable = true;
+  programs.keychain.enableXsessionIntegration = true;
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland = {

nixos/home/desktop/wayland/waybar.nix

@@ -1,5 +1,9 @@
-{ ... }:
+{ pkgs, ... }:
 {
+  home.packages = with pkgs; [
+    (nerdfonts.override { fonts = [ "FiraCode" ]; })
+    bluez
+  ];
   xdg.configFile."waybar".source = ./config/waybar;
   programs.waybar.enable = true;
 }

nixos/home/desktop/xorg/common.nix

@@ -1,2 +1,5 @@
 { ... }:
-{ xsession.enable = true; }
+{
+  xsession.enable = true;
+  programs.keychain.enableXsessionIntegration = true;
+}

nixos/home/desktop/xorg/xresources.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }:
 {
+  imports = [ ./common.nix ];
   xresources.extraConfig = builtins.readFile
     (
       pkgs.fetchFromGitHub

nixos/home/env/bash.nix

@@ -11,4 +11,6 @@
       xnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized";
     };
   };
+  programs.keychain.enableBashIntegration = true;
+  programs.starship.enableBashIntegration = true;
 }

nixos/home/env/bat.nix

@@ -1,6 +1,5 @@
 { pkgs, ... }:
 {
-  imports = [ ../env/fonts];
   programs.bat = {
     enable = true;
     config = {

nixos/home/env/direnv.nix

@@ -1,10 +1,4 @@
-{...}:
+{ ... }:
 {
-  imports = [ ./shell ];
-  programs.direnv = {
-    enable = true;
-    #enableBashIntegration = true;
-    #enableZshIntegration = true;
-    #enableFishIntegration = true;
-  };
+  programs.direnv.enable = true;
 }

nixos/home/env/fish.nix

@@ -14,4 +14,6 @@
       rxnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized --server ~/.nvim.sock";
     };
   };
+  programs.keychain.enableFishIntegration = true;
+  programs.starship.enableFishIntegration = true;
 }

nixos/home/env/fonts/firacode.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    fira-code
-    (nerdfonts.override { fonts = [ "FiraCode" ]; })
-  ];
-}

nixos/home/env/fonts/iosevka.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    iosevka
-    (nerdfonts.override { fonts = [ "Iosevka" ]; })
-  ];
-}

nixos/home/env/keychain.nix

@@ -1,12 +1,7 @@
 { ... }:
 {
-  imports = [ ./shell ];
   programs.keychain = {
     enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    enableFishIntegration = true;
-    enableXsessionIntegration = true;
     extraFlags = [
       "--quiet"
       "--ignore-missing"

nixos/home/env/nixpkgs.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  nixpkgs.config.allowUnfree = true;
-}

nixos/home/env/shell/default.nix

@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./bash.nix
-    ./zsh.nix
-    ./fish.nix
-  ];
-}

nixos/home/env/ssh.nix

@@ -1,6 +1,5 @@
 { ... }:
 {
-  imports = [ ./shell ];
   programs.ssh = {
     enable = true;
     includes = [ "config.d/*" ];

nixos/home/env/starship.nix

@@ -1,11 +1,6 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  imports = [ ./shell ];
+  home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
   xdg.configFile."starship.toml".source = ./config/starship.toml;
-  programs.starship = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    enableFishIntegration = true;
-  };
+  programs.starship.enable = true;
 }

nixos/home/env/zsh.nix

@@ -17,4 +17,6 @@
       path = "${config.xdg.dataHome}/zsh/history";
     };
   };
+  programs.keychain.enableZshIntegration = true;
+  programs.starship.enableZshIntegration = true;
 }

nixos/home/terminal/foot.nix

@@ -1,6 +1,6 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  fonts.fontconfig.enable = true;
+  home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
   programs.foot = {
     enable = true;
     settings = {
@@ -9,9 +9,6 @@
         font = "FiraCode Nerd Font:size=12";
         dpi-aware = "yes";
       };
-      mouse = {
-        hide-when-typing = true;
-      };
       colors = {
         # Catppuccin Macchiato
         foreground = "cad3f5"; # Text

nixos/home/terminal/urxvt.nix

@@ -1,11 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  imports = [ ../env/fonts ];
+  home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
   programs.urxvt = {
     enable = true;
-    fonts = [
-      "xft:FiraCode Nerd Font Mono:pixelsize=16"
-      "xft:Iosevka Nerd Font Mono:pixelsize=16"
-    ];
+    fonts = [ "xft:FiraCode Nerd Font Mono:pixelsize=16" ];
   };
 }