Alright this ain't finished cause of the home stuff but I don't wanna lose what I've done. Impermanence, disko, lots of changes. TODO: add modularity to home.

modules/home/programs/gui/easyeffects/default.nix

@@ -1,11 +1,11 @@
 { pkgs, ... }:
 {
-  home = {
-    packages = with pkgs; [
-      easyeffects
-    ];
-    file = {
-      ".config/easyeffects/output/JimHeadphones.json".source = ./JimHeadphones.json;
-    };
+  services.easyeffects = {
+    enable = true;
+    preset = "headphones";
+  };
+
+  home.file = {
+    ".config/easyeffects/output/headphones.json".source = ./headphones.json;
   };
 }

modules/home/programs/gui/librewolf/default.nix

@@ -312,7 +312,7 @@ in {
               ];
             }
           ];
-          definedAliases = ["@g"];
+          definedAliases = [ "@g" ];
         };
         "NixPKGs" = {
           urls = [
@@ -331,7 +331,7 @@ in {
             }
           ];
           icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-          definedAliases = ["@pkgs"];
+          definedAliases = [ "@pkgs" ];
         };
       };
     };
@@ -348,6 +348,7 @@ in {
       "privacy.userContext.newTabContainerOnLeftClick.enabled" = true;
       "privacy.clearOnShutdown.history" = false;
       "privacy.clearOnShutdown.cookies" = false;
+      "privacy.clearOnShutdown_v2.cookiesAndStorage" = false;
       "browser.toolbars.bookmarks.visibility" = "never";
       "media.hardware-video-decoding.force-enabled" = true;
       "svg.context-properties.content.enabled" = true;
@@ -400,7 +401,7 @@ in {
             icon = "fingerprint";
             id = 200;
           };
-          Seneca = {
+          Work = {
             color = "red";
             icon = "briefcase";
             id = 201;

modules/home/programs/gui/mako/default.nix

@@ -14,7 +14,12 @@
     defaultTimeout = 6000;
     font = "${config.look.fonts.main} 12";
     anchor = "bottom-right";
-    extraConfig = "on-button-right=dismiss-all\nouter-margin=10\n[mode=do-not-disturb]\ninvisible=1";
+    extraConfig = ''
+      on-button-right=dismiss-all
+      outer-margin=10
+      [mode=do-not-disturb]
+      invisible=1
+    '';
   };
 
   home.packages = let
@@ -36,7 +41,5 @@
         makoctl mode -a do-not-disturb
       fi
     '';
-  in with pkgs; [
-    makoToggle
-  ];
+  in with pkgs; [ makoToggle ];
 }

modules/home/programs/gui/mangohud/default.nix

@@ -1,10 +1,9 @@
 { pkgs, ... }:
 {
   home = {
-    packages = with pkgs; [
-      mangohud
-    ];
+    packages = with pkgs; [ mangohud ];
     file = {
+      # I know options exist for this, but the order is not respected.
       ".config/MangoHud/MangoHud.conf".text = ''
         table_columns=2
         frametime=0
@@ -12,7 +11,6 @@
         font_scale=0.80
         background_alpha=0.25
         
-        # Set the loads and such
         exec=echo $(echo $XDG_CURRENT_DESKTOP | sed 's/./\U&/') on $(cat /etc/os-release | grep PRETTY_NAME | cut -d '"' -f 2)
         fps
         fps_color_change

modules/home/programs/gui/mpv/default.nix

@@ -1,7 +1,12 @@
-{ ... }:
+{ pkgs, ... }:
 {
   programs.mpv = {
     enable = true;
+    scripts = with pkgs.mpvScripts; [
+      mpris
+      sponsorblock
+      thumbnail
+    ];
     config = {
       volume = 55;
       loop-playlist = "inf";

modules/home/programs/misc/avtools/default.nix

@@ -5,6 +5,7 @@
     spotdl
     playerctl
     ffmpeg
+    alsa-utils
     puddletag
     pulsemixer
   ];

modules/home/programs/misc/chat/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     vesktop

modules/home/programs/misc/default.nix

@@ -3,7 +3,11 @@
   imports = [
     ./avtools
     ./chat
+    ./gaming
     ./general
     ./headless
+    ./production
+    ./remote-desktop
+    ./school
   ];
 }

modules/home/programs/misc/gaming/emulators/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     dolphin-emu
@@ -6,6 +6,6 @@
     ryujinx
     duckstation
     pcsx2
-    #lime3ds
+    #unstable.lime3ds
   ];
 }

modules/home/programs/misc/gaming/launchers/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     steam

modules/home/programs/misc/gaming/xash3d/default.nix

@@ -1,6 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
-  home.packages = with pkgs; [
-    xash3d
-  ];
+  home.packages = with pkgs; [ xash3d ];
 }

modules/home/programs/misc/general/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     imv

modules/home/programs/misc/headless/default.nix

@@ -2,12 +2,9 @@
 {
   home.packages = with pkgs; [
     gotop
-    tcptrack
     p7zip
     vimv
     dua
-    pciutils
-    usbutils
     protonvpn-cli_2
   ];
 }

modules/home/programs/misc/production/default.nix

@@ -1,15 +1,12 @@
 { pkgs, blender-bin, ... }:
 {
-  imports = [
-    ./obs
-  ];
+  imports = [ ./obs ];
 
   home.packages = with pkgs; [
     krita
     inkscape
     audacity
     blender_4_2
-    sunvox
   ];
 
   nixpkgs.overlays = [ blender-bin.overlays.default ];

modules/home/programs/misc/production/obs/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, ... }:
 {
   programs.obs-studio = {
     enable = true;

modules/home/programs/misc/school/default.nix

@@ -4,6 +4,6 @@
     remmina
     freerdp
     zoom-us
-    globalprotect-openconnect
+    unstable.gpauth
   ];
 }

modules/home/programs/terminal/default.nix

@@ -7,5 +7,6 @@
     ./neovim
     ./ranger
     ./tmux
+    ./zsh
   ];
 }

modules/home/programs/terminal/zsh/default.nix

@@ -0,0 +1,52 @@
+{ pkgs, ... }:
+{
+  programs.zsh = {
+    enable = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    oh-my-zsh = {
+      enable = true;
+      theme = "agnoster";
+      plugins = [ "git" ];
+    };
+    shellAliases = {
+      # NixOS aliases
+      nixclean = "doas nix-store --gc; nix-collect-garbage -d";
+      nixpurge = "doas nix-collect-garbage --delete-old";
+      nixoptimize = "doas nix store optimise";
+      nixscrub = "nixclean; nixpurge; nixoptimize";
+
+      # Flake commands
+      flakedate = "doas nix flake update /etc/nixos";
+      nixswitch = "doas nixos-rebuild switch --flake /etc/nixos";
+      nixdate = "flakedate && nixswitch";
+
+      # Shortcut aliases
+      neo = "clear && fastfetch";
+      ip = "ip -c";
+      ls = "${pkgs.eza}/bin/eza -a --color=always --group-directories-first --icons";
+      nls = "/usr/bin/env ls";
+      cat = "${pkgs.bat}/bin/bat --paging never";
+      ncat = "/usr/bin/env cat";
+      copycat = "wl-copy <";
+      sunshinehost = "WAYLAND_DISPLAY=wayland-1 DISPLAY=:1 sunshine -0";
+      seneca = "ssh jhampton1@matrix.senecapolytechnic.ca";
+
+      # Curl tools
+      myip = "curl ifconfig.co";
+
+      # Download from sources
+      ytdl = ''yt-dlp --embed-thumbnail --embed-metadata --output "%(title)s.%(ext)s"'';
+      ytm3u = "yt-dlp -gS proto:m3u8";
+      opusdl = "ytdl --recode-video opus";
+      ytopus = "opusdl --format 251";
+      spotdl = "spotdl --m3u --format opus";
+    };
+    initExtra = ''
+      source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
+      ${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin; pfetch
+      setopt HIST_IGNORE_SPACE
+      setopt RM_STAR_WAIT
+    '';
+  };
+}