clean <host>/default.nix (part 3)

hosts/lolcathost/default.nix

@@ -22,6 +22,11 @@ in {
     ../modules/chameleonultragui.nix
   ];
 
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+
   nixpkgs.config.allowUnfreePredicate = let
     whitelist = map lib.getName [
       pkgs.obsidian
@@ -125,12 +130,10 @@ in {
   };
   security.rtkit.enable = true; # I *think* this is for pipewire
 
-  # allow wheel group to use passwordless sudo
+  # ------- USERS -------
   users = {
-    # using fish as the login shell tends
-    # to go very poorly because it isn't
-    # POSIX compliant, so we'll just use
-    # simple Bash then :)
+    # Using fish as the login shell tends to go very poorly because it isn't
+    # POSIX compliant, so we default the login shell to Bash instead :)
     defaultUserShell = pkgs.bash;
 
     users = {
@@ -138,7 +141,7 @@ in {
       me = {
         isNormalUser = true;
         extraGroups = ["wheel" "netdev" "docker"];
-        shell = pkgs.bash; #pkgs.fish
+        shell = pkgs.bash;
         packages = let
           # TODO: can I just do this: https://nix.dev/manual/nix/2.18/command-ref/new-cli/nix3-flake#url-like-syntax
           #       instead to use colmena's flake.nix by specifying a rev hash in the flake input?
@@ -165,8 +168,6 @@ in {
       friends = {
         isNormalUser = true;
         shell = pkgs.fish;
-        packages = with pkgs; [
-        ];
       };
     };
   };
@@ -179,7 +180,7 @@ in {
     ];
   };
 
-  # set environment variables
+  # ---- ENVIRONMENT VARIABLES ----
   environment.sessionVariables = {
     # folder names with capitalisation look awful!
     XDG_DOWNLOAD_DIR = "$HOME/downloads";
@@ -194,10 +195,10 @@ in {
     swww
     helvum
     easyeffects
+    pavucontrol
     ani-cli
     bluetui
     wl-clipboard # clipboard for wayland
-    pavucontrol
     qbittorrent # torrenting
     signal-desktop
 
@@ -206,10 +207,14 @@ in {
     pkgs.libsForQt5.qt5.qtgraphicaleffects
 
     # Shell
+    bash
+    zsh
+    fish
     shellcheck
-    # Fish Plugins
     grc # colorise command outputs
 
+    # Make
+    gnumake
     # C Family
     gcc
     clang
@@ -228,9 +233,6 @@ in {
     # Sage
     sageWithDoc # SageMath + HTML Documentation
 
-    # DEBUG: using neofetch temporarily to see if my system upgrades properly
-    neofetch
-
     openvpn
     inetutils
 
@@ -263,12 +265,12 @@ in {
     # Pretty necessary
     git
     git-filter-repo
+    nix-prefetch-git
     brightnessctl
     acpi
     # upower
     vim
     powertop
-    gnumake
     imagemagick
 
     # "Standard" Unix Commands
@@ -279,7 +281,11 @@ in {
     unrar-free
     man-pages
     man-pages-posix
+
+    # Cryptography
     gnupg
+    openssl
+    libargon2
 
     # Games
     mindustry
@@ -294,6 +300,7 @@ in {
       xwayland.enable = true;
     };
 
+    zsh.enable = true;
     fish.enable = true;
 
     nix-ld.enable = true;
@@ -322,6 +329,9 @@ in {
         thunar-media-tags-plugin # change metadata for media files
       ];
     };
+
+    # mozilla's email client
+    thunderbird.enable = true;
   };
 
   # ----- FONTS -----
@@ -357,26 +367,8 @@ in {
     };
   };
 
-  # Enable the new CLI commands and the flakes as experimental features
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-
   virtualisation.docker.enable = true;
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Enable OpenGL
   hardware = {
     graphics.enable = true;