wip: got inhibit working but fish_greeting fails

i think i am reverting a false fix, idk

flake.lock

@@ -64,11 +64,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1756131615,
+        "lastModified": 1754941490,
-        "narHash": "sha256-rmmsEZglqzgxIePTKe5wCIQ3syzAb4jE3RpNxD/2tzY=",
+        "narHash": "sha256-2AJf0q4u1zakqjr0y4dCyqzdDSil8P5m2YpZxAAzJJw=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "8aa0b4c92a54f822043e134d2b84ee29844f944e",
+        "rev": "5bf632e9cc0e77a578bad983b0cbdf0451ce87d4",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755928099,
+        "lastModified": 1753592768,
-        "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=",
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4a44fb9f7555da362af9d499817084f4288a957f",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
         "type": "github"
       },
       "original": {
@@ -129,24 +129,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1755972213,
+        "lastModified": 1754767907,
-        "narHash": "sha256-VYK7aDAv8H1enXn1ECRHmGbeY6RqLnNwUJkOwloIsko=",
+        "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
-        "rev": "73e96df7cff5783f45e21342a75a1540c4eddce4",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre850642.73e96df7cff5/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1755922037,
-        "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c",
+        "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
         "type": "github"
       },
       "original": {
@@ -162,7 +149,7 @@
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {
@@ -215,20 +202,23 @@
           "ghostty",
           "flake-utils"
         ],
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "ghostty",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1756000480,
+        "lastModified": 1742104771,
-        "narHash": "sha256-fR5pdcjO0II5MNdCzqvyokyuFkmff7/FyBAjUS6sMfA=",
+        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
         "owner": "jcollie",
         "repo": "zon2nix",
-        "rev": "d9dc9ef1ab9ae45b5c9d80c6a747cc9968ee0c60",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       },
       "original": {
         "owner": "jcollie",
         "repo": "zon2nix",
-        "rev": "d9dc9ef1ab9ae45b5c9d80c6a747cc9968ee0c60",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       }
     }

home/git.nix

@@ -15,7 +15,7 @@
     extraConfig = {
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
-      pull.merge = true;
+      pull.rebase = false;
       merge.tool = "nvimdiff";
       mergetool.keepBackup = false;
     };

home/shell.nix

@@ -1,30 +1,29 @@
-{pkgs, ...}: {
+{
-  programs.fish = {
+  lib,
+  pkgs,
+  userName,
+  ...
+}: {
+  programs = {
+    fish = {
       enable = true;
-    # initExtra = ''
-    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
-    # '';
-
       shellAliases = {
         # ls aliases
         ls = "eza --color";
         la = "eza -l -all --color";
         ll = "eza -l --color";
         lt = "eza -l --color --git";
-
         # lazygit alias
         lg = "lazygit";
-
         # cat, less, more alias
         cat = "bat";
         less = "bat";
         more = "bat";
-
         # top alias
         top = "btm";
       };
-
+      functions =
-    functions = {
+        {
           fish_greeting = {
             body = ''
               set memes \
@@ -43,19 +42,60 @@
                 "Can I get a waffle? Can I please get a waffle?" \
                 "I'm lesbian. I thought you were American." \
                 "You gotta give 'em that 'hawk tuah' and spit on that thang!" \
-            "We don't do that here..."
+                "We don't do that here..." \
+                "What are those?! They are my crocs..." \
+                "It's an avocado... Thanks!" \
+                "I am once again asking for your financial support" \
+                "Is that a weed?" \
+                "No, this is Patrick!" \
+                "Come ride, heroes, ride" \
+                "Away with the tide" \
+                "Concede your mind unto the fiend" \
+                "Darkness come, rend the shield of light" \
+                "The sun is setting, darkness taking over - a date with chaos and you're dressed to the nines" \
+                "Now kneel overdweller, your lord commands, there's no salvation for the sons of man" \
+                "Snap click clank whirr whizz wham boom!" \
+                "Rohs an kyn ala na"
 
               set choose_meme (random)"%"(count $memes)
               set choose_meme $memes[(math $choose_meme"+1")]
-
               printf (set_color F90)"%s\n" $choose_meme
             '';
-        onEvent = "fish_greeting";
+            # onEvent = "fish_greeting";
           };
+        } // (lib.mkIf pkgs.stdenv.isLinux {
+          block = {
+            body = ''
+              echo "Starting systemd-inhibit..."
+              set inhibit_pid_file /tmp/fish_inhibit_pid_(whoami)
+              bash -c 'systemd-inhibit --no-ask-password --what=idle --who="'${userName}'" --why="manual invocation" sh & echo $! > '"$inhibit_pid_file"' && disown'
+              if test -f $inhibit_pid_file
+                set -g INHIBIT_PID (cat $inhibit_pid_file)
+                echo "Inhibit process started with PID: $INHIBIT_PID"
+              else
+                echo "Failed to start inhibit process"
+                return 1
+              end
+            '';
           };
+          unblock = {
+            body = ''
+              set inhibit_pid_file /tmp/fish_inhibit_pid_(whoami)
+              if test -f $inhibit_pid_file
+                set INHIBIT_PID (cat $inhibit_pid_file)
+                echo "Killing inhibit process: $INHIBIT_PID"
+                kill -SIGTERM $INHIBIT_PID 2>/dev/null; or kill -SIGKILL $INHIBIT_PID 2>/dev/null
+                rm -f $inhibit_pid_file
+                set -e INHIBIT_PID
+                echo "Inhibit process terminated"
+              else
+                echo "No inhibit process file found"
+              end
+            '';
           };
-
+        });
-  programs.zsh = {
+    };
+    zsh = {
       enable = true;
       initContent = ''
         if [[ -z "$BASH_EXECUTION_STRING" ]]; then
@@ -68,8 +108,7 @@
         fi
       '';
     };
-
+    bash = {
-  programs.bash = {
       enable = true;
       initExtra = ''
         if [[ -z "$BASH_EXECUTION_STRING" ]]; then
@@ -82,4 +121,5 @@
         fi
       '';
     };
+  };
 }

modules/apps/appimage.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.appimage;
+in {
+  options.appimage = {
+    enable = mkEnableOption "AppImage support";
+  };
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      appimageupdate
+      appimage-run
+    ];
+  };
+}

modules/common/environment.nix

@@ -1,23 +1,20 @@
 { lib, pkgs, ... }: {
+  # Common packages that every system will use
   environment.systemPackages = with pkgs; [
     git
     vim
     neovim
     usbutils
     coreutils
+    lshw
+    systemd
+    dmidecode
     pciutils
+    nix-ld
     patchelf
     htop
-  ] ++ 
+  ];
-  lib.optionals pkgs.stdenv.isLinux (with pkgs; [
-    systemd
-    lshw
-    dmidecode
-    nix-ld
-  ]) ++
-  lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
-      # nothing here, yet ;)
-  ]);
 
+  # Common environment variables that every system will use
   environment.variables.EDITOR = "nvim";
 }

modules/common/users.nix

@@ -1,23 +1,30 @@
-{ lib, pkgs, userName, hostname, ... }:
-
 {
+  lib,
+  pkgs,
+  userName,
+  hostname,
+  ...
+} @ args: {
   networking.hostName = hostname;
 
-  users.users."${userName}" = {
+  # Don't forget to set a password with ‘passwd’!
-    home = if pkgs.stdenv.isDarwin 
+  users.users."${userName}" = lib.mkMerge [
+    {
+      home =
+        if pkgs.stdenv.isDarwin
         then "/Users/${userName}"
         else "/home/${userName}";
       description = userName;
-  } // lib.optionalAttrs pkgs.stdenv.isLinux {
+    }
+
+    (lib.mkIf (pkgs.stdenv.isLinux) {
       group = "${userName}";
       isNormalUser = true;
-  };
+    })
+  ];
 
-  users.groups.wyatt = {};
+  security.sudo = {
-  nix.settings.trusted-users = [userName];
+    extraRules = [
-
-  security = lib.optionalAttrs pkgs.stdenv.isLinux {
-    sudo.extraRules = [
       {
         groups = [ "wheel" ];
         commands = [
@@ -30,9 +37,7 @@
     ];
   };
 
-  environment = lib.optionalAttrs pkgs.stdenv.isDarwin {
+  users.groups.wyatt = {};
-    etc."sudoers.d/wheel-nopasswd".text = ''
+
-      %wheel ALL=(ALL:ALL) NOPASSWD: SETENV: ALL
+  nix.settings.trusted-users = [userName];
-    '';
-  };
 }

modules/machine/cloud/configuration.nix

@@ -21,11 +21,13 @@ in {
       inherit lib pkgs flatpakPackages;
     })
     ../../apps/gaming.nix
+    ../../apps/appimage.nix
     ../../graphics
     ../../pwrMgmt
     ../../networking/core.nix
     ../../sound/pipewire.nix
     ../../sound/shairport.nix
+    ../../sound/focusrite.nix
     ../../virtualization/podman.nix
     ../../virtualization/hardware.nix
   ];
@@ -34,9 +36,13 @@ in {
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
   # Custom kernel/boot stuff
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot = {
-  boot.loader.systemd-boot.enable = true;
+    kernelPackages = pkgs.linuxPackages_latest;
-  boot.loader.efi.canTouchEfiVariables = true;
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
 
   # Enable Bluetooth if present
   hardware.bluetooth.enable = true;
@@ -63,21 +69,6 @@ in {
     wl-clip-persist
   ];
 
-  # Enable OpenSSH
-  services.openssh.enable = true;
-
-  # Enable keyring
-  services.gnome.gnome-keyring.enable = true;
-
-  # Enable GnuPG
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  # Enable SUID wrappers (some programs need them)
-  programs.mtr.enable = true;
-
   # Enable Polkit
   security.polkit.enable = true;
 
@@ -145,14 +136,39 @@ in {
     networkManager.enable = true;
   };
 
+  programs = {
+    # Enable GnuPG
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+
+    # Enable SUID wrappers (some programs need them)
+    mtr.enable = true;
+
     # Enable dconf
-  programs.dconf.enable = true;
+    dconf.enable = true;
+  };
 
   # Add username to groups "wheel" and "video" - more may be added here later
   users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
 
+  services = {
+    # Enable OpenSSH
+    openssh.enable = true;
+
+    # Enable keyring
+    gnome.gnome-keyring.enable = true;
+
     # Flatpak packages (see ../../apps/flatpak.nix)
-  services.flatpak.packages = flatpakPackages;
+    flatpak.packages = flatpakPackages;
+  };
+
+  # Focusrite Scarlett audio interface support (see ../../sound/focusrite.nix)
+  sound.hardware.focusrite.enable = true;
+
+  # AppImage support
+  appimage.enable = true;
 
   # XDG stuff
   xdg = {
@@ -160,12 +176,12 @@ in {
       enable = true;
       config = {
         sway = {
-          default = [ "wlr" "gtk" ];
+          default = ["wlr" "gtk"];
-          "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
+          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
         };
         common = {
-          default = [ "gtk" ];
+          default = ["gtk"];
-          "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
+          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
         };
       };
       extraPortals = with pkgs; [

modules/security/sudo.nix

@@ -5,7 +5,7 @@
 }:
 with lib; {
   options = {
-    security.sudoers = {
+    security.sudo = {
       needsPassword = mkOption {
         type = types.bool;
         default = true;

modules/sound/focusrite.nix

@@ -0,0 +1,33 @@
+# Must be paired with the pipewire Nix module, this does nothing but install packages
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.sound.hardware.focusrite;
+in {
+  options.sound.hardware.focusrite = {
+    enable = mkEnableOption "Focusrite audio interface support";
+    guiSupport = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable GUI support for Focusrite Scarlett audio interface (installs alsa-scarlett-gui)";
+    };
+  };
+  config = mkIf cfg.enable (mkMerge [
+    {
+      environment.systemPackages = with pkgs;
+        [
+          scarlett2
+          alsa-scarlett-gui
+        ]
+        ++ (
+          if cfg.guiSupport
+          then [pkgs.alsa-scarlett-gui]
+          else []
+        );
+    }
+  ]);
+}