test

info.default.nix

@@ -8,21 +8,23 @@
     vpnSecretFile = "/home/biscuit/Wireguard/secret";
   };
 
-  allowUnfree = true;
+  terminal = {
-  touchpadSupport = false;
-
     termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
-
+    termShell = "fish";
     shellAliases = {
       update = ''
         if [[ $(uname) == "Darwin" ]]; then
-        darwin-rebuild switch --flake ~/.config/nixos#macos
+          sudo darwin-rebuild switch --flake ~/.config/nixos#macos
         else
           sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop
         fi
       '';
       agu = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &";
     };
+  };
+
+  allowUnfree = true; # allows installation of commercial apps.
+  touchpadSupport = false;
 
   # Custom Applications
   linux-apps = pkgs:
@@ -37,6 +39,7 @@
   '';
 
   # BUILD (optional), you can remove these blocks.
+  builder = {
     trustedUsers = [
       "@groups"
       "biscuit"
@@ -50,4 +53,5 @@
         supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
       }
     ];
+  };
 }

modules/desktop/editor.nix

@@ -1,11 +0,0 @@
-{...}: {
-  imports = [
-    ../../pkgs/fastfetch/default.nix
-    ../../pkgs/git/default.nix
-    ../../pkgs/kitty/default.nix
-    ../../pkgs/neovim/default.nix
-    ../../pkgs/fish/default.nix
-    ../../pkgs/starship/default.nix
-    # ../../pkgs/zsh/default.nix
-  ];
-}

modules/editor.nix

@@ -6,6 +6,6 @@
     ../pkgs/neovim/default.nix
     ../pkgs/fish/default.nix
     ../pkgs/starship/default.nix
-    # ../../pkgs/zsh/default.nix
+    ../pkgs/zsh/default.nix
   ];
 }

nixos/desktop/configuration.nix

@@ -1,8 +1,7 @@
 {
   pkgs,
   allowUnfree,
-  buildMachines,
+  builder,
-  trustedUsers,
   sshExtraConfig,
   ...
 }: {
@@ -22,7 +21,7 @@
   nixpkgs.config.allowUnfree = allowUnfree;
 
   nix.settings = {
-    trusted-users = trustedUsers;
+    trusted-users = builder.trustedUsers;
     experimental-features = ["nix-command" "flakes"];
   };
 
@@ -31,6 +30,6 @@
   nix.distributedBuilds = true;
   nix.settings.builders-use-substitutes = true;
 
-  # nix.buildMachines = buildMachines;
+  # nix.buildMachines = builder.buildMachines;
   system.stateVersion = "25.05";
 }

nixos/macos/darwin.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
-  trustedUsers,
+  builder,
+  terminal,
   ...
 }: {
   # List packages installed in system profile. To search by name, run:
@@ -17,11 +18,11 @@
 
   # Necessary for using flakes on this system.
   nix.settings.experimental-features = "nix-command flakes";
-  nix.settings.trusted-users = trustedUsers;
+  nix.settings.trusted-users = builder.trustedUsers;
 
   # Create /etc/zshrc that loads the nix-darwin environment.
   programs.zsh.enable = true; # default shell on catalina
-  # programs.fish.enable = true;
+  programs.fish.enable = true;
 
   # $ darwin-rebuild changelog
   system.stateVersion = 5;
@@ -32,6 +33,7 @@
   users.users.lsoriano = {
     name = "lsoriano";
     home = "/Users/lsoriano";
+    shell = pkgs.${terminal.termShell};
   };
 
   home-manager.users.lsoriano = import ../../home/macos/home.nix;

pkgs/fish/default.nix

@@ -1,4 +1,8 @@
-{pkgs, shellAliases, ...}: {
+{
+  pkgs,
+  terminal,
+  ...
+}: {
   programs.zoxide.enable = true;
   programs.fish = {
     enable = true;
@@ -8,7 +12,7 @@
       zoxide init fish | source
 
     '';
-    shellAliases = shellAliases;
+    shellAliases = terminal.shellAliases;
 
     plugins = with pkgs.fishPlugins; [
     ];

pkgs/kitty/default.nix

@@ -1,4 +1,4 @@
-{termFont, ...}: {
+{terminal, ...}: {
   programs.kitty = {
     enable = true;
     themeFile = "Catppuccin-Mocha";
@@ -7,7 +7,7 @@
       window_padding_width = 10;
 
       font_size = 12.0;
-      font_family = termFont;
+      font_family = terminal.termFont;
       bold_font = "auto";
       italic_font = "auto";
       bold_italic_font = "auto";

pkgs/zsh/default.nix

@@ -1,4 +1,8 @@
-{pkgs, shellAliases,...}: {
+{
+  pkgs,
+  terminal,
+  ...
+}: {
   home.packages = with pkgs; [
     zoxide
     oh-my-posh
@@ -28,7 +32,7 @@
     ];
     enableCompletion = true;
     syntaxHighlighting.enable = true;
-    shellAliases = shellAliases;
+    shellAliases = terminal.shellAliases;
     history.size = 10000;
     oh-my-zsh = {
       plugins = [];

system/users.nix

@@ -1,11 +1,15 @@
-{ pkgs, username, ... }: {
+{
+  pkgs,
+  username,
+  terminal,
+  ...
+}: {
   users.users.${username} = {
     isNormalUser = true;
     extraGroups = ["wheel" "networkmanager"];
     initialHashedPassword = "$6$Qab6SSvEJM2YRtVA$7Oyl7E3pp/FKtCC.2Tb2tyzp3yp7BFHFAKngUYJssQJ.v1Q2mqsgW9m7njpaKNcka2vyCwrnmw1R.YPlFqR0p1";
     # shell = pkgs.zsh;
-    shell = pkgs.fish;
+    shell = pkgs.${terminal.termShell};
-    packages = with pkgs; [
+    packages = [];
-    ];
   };
 }