wip: trying to get obsidian working

not a working build, syntax issues, added options that are not available
in stable home-manager

defaults/sway/config

@@ -7,41 +7,37 @@ set $down j
 set $up k
 set $right l
 # Alacritty
-set $term foot
+set $term alacritty
 
 # Menu (rofi)
-set $menu wofi --show
+set $menu wofi --term '$term'
 
-# ### Output configuration
+### Output configuration
-# output DP-3 pos 3840 0 res 1920x1080@59Hz
+output DP-3 pos 3840 0 res 1920x1080@59Hz
-# output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
+output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
-# output DP-2 pos 1920 0 res 1920x1080@60Hz
+output DP-2 pos 1920 0 res 1920x1080@60Hz
 
 ### Wallpaper
-output * bg ~/.wallpaper/.wallpaper.png fill
+output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
-# output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
+output DP-2  bg ~/.wallpaper/.wallpaper.png fill
-# output DP-2  bg ~/.wallpaper/.wallpaper.png fill
+output DP-3 bg ~/.wallpaper/.wallpaper.png fill
-# output DP-3 bg ~/.wallpaper/.wallpaper.png fill
 
 ### Workspace binding
 
 ## DP-3 bindings
-# workspace 1 output DP-2
+workspace 1 output DP-2
-# workspace 2 output DP-2
+workspace 2 output DP-2
-# workspace 4 output DP-2
+workspace 4 output DP-2
-# workspace 5 output DP-2
+workspace 5 output DP-2
-#
-# ## HDMI-A-1 bindings
-# workspace 3 output HDMI-A-1
-# workspace 9 output HDMI-A-1
-#
-# ## DP-2 bindings
-# workspace 6 output DP-3
-# workspace 7 output DP-3
-# workspace 8 output DP-3
 
-## eDP-1 bindings scale
+## HDMI-A-1 bindings
-output eDP-1 scale 1.25
+workspace 3 output HDMI-A-1
+workspace 9 output HDMI-A-1
+
+## DP-2 bindings
+workspace 6 output DP-3
+workspace 7 output DP-3
+workspace 8 output DP-3
 
 ### Colour options
 set $bg 	#24283b
@@ -232,4 +228,10 @@ set $opacity 1.00
 for_window [class=".*"] opacity $opacity
 for_window [app_id=".*"] opacity $opacity
 
+# Disable locking when conditions are met
+for_window [class="streaming_client"] inhibit_idle fullscreen
+for_window [app_id="firefox"] inhibit_idle fullscreen
+for_window [app_id="neovide"] inhibit_idle fullscreen
+
+for_window [title="Beyond All Reason"] inhibit_idle fullscreen
 include /etc/sway/config.d/*

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757432263,
+        "lastModified": 1749744770,
-        "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=",
+        "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb",
+        "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
         "type": "github"
       },
       "original": {
@@ -55,24 +55,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "ghostty": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -82,11 +64,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1759330332,
+        "lastModified": 1753816554,
-        "narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
+        "narHash": "sha256-eyFfBXb5IJaNTGTdkjpWKSMTs8wiJ0i+9n5jUKtVFa4=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1",
+        "rev": "c78d32074ebab14d2060e5cd3c7667cbe37ab8ee",
         "type": "github"
       },
       "original": {
@@ -102,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
+        "lastModified": 1753592768,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
         "type": "github"
       },
       "original": {
@@ -132,25 +114,6 @@
         "type": "github"
       }
     },
-    "nixgl": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1752054764,
-        "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
-        "owner": "guibou",
-        "repo": "nixGL",
-        "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "guibou",
-        "repo": "nixGL",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1748189127,
@@ -166,39 +129,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1758360447,
+        "lastModified": 1753749649,
-        "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
+        "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
-        "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1746378225,
-        "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "93e8cdce7afc64297cfec447c311470788131cd9",
+        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1759281824,
-        "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "5b5be50345d4113d04ba58c444348849f5585b4a",
         "type": "github"
       },
       "original": {
@@ -214,8 +149,7 @@
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixgl": "nixgl",
+        "nixpkgs": "nixpkgs_2"
-        "nixpkgs": "nixpkgs_4"
       }
     },
     "systems": {
@@ -233,21 +167,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "zig": {
       "inputs": {
         "flake-compat": [
@@ -279,20 +198,27 @@
     },
     "zon2nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": [
+          "ghostty",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ghostty",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1758405547,
+        "lastModified": 1742104771,
-        "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
+        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
         "owner": "jcollie",
         "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       },
       "original": {
         "owner": "jcollie",
         "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       }
     }

flake.nix

@@ -2,27 +2,32 @@
   description = "Wyatt's nix configuration suite";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
     home-manager = {
       url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    home-manager-unstable = {
+      url = "https://github.com/nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
     darwin = {
       url = "github:lnl7/nix-darwin/nix-darwin-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    nixgl.url = "github:guibou/nixGL";
   };
 
   outputs = inputs @ {
     self,
     nixpkgs,
+    nixpkgs-unstable,
     nix-flatpak,
     darwin,
     home-manager,
+    home-manager-unstable,
     ghostty,
-    nixgl,
     ...
   }: let
     userName = "wyatt";
@@ -30,6 +35,10 @@
     extraSpecialArgs = {
       inherit userName userEmail ghostty;
     };
+
+    obsidianOverlay = final: prev: {
+      obsidian = nixpkgs-unstable.legacyPackages.${final.system}.obsidian;
+    };
   in {
     meta = import ./meta;
 
@@ -68,6 +77,10 @@
         ./modules/common
         ./modules/machine/cloud
 
+        {
+          nixpkgs.overlays = [ obsidianOverlay ];
+        }
+
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
@@ -131,17 +144,5 @@
       #   }
       # ];
     };
-
-    # For anyone running home-manager standalone
-    homeConfigurations.${userName} = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
-      modules = [
-        ./home
-      ];
-      # Optionally, pass specialArgs if needed
-      extraSpecialArgs = extraSpecialArgs // { 
-        inherit nixgl;
-      };
-    };
   };
 }

home/browser.nix

@@ -38,14 +38,14 @@
       (createChromiumExtension {
         # ublock origin
         id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
-        sha256 = "sha256:054kqrai2kd89bzc5c3x17rjfdil2zzxrxrg65vaywmvm77y7kmn";
+        sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
         # sha256 = lib.fakeSha256;
         version = "1.64.0";
       })
       (createChromiumExtension {
         # bitwarden
         id = "nngceckbapebfimnlniiiahkandclblb";
-        sha256 = "sha256:02cscadjqbfx3a5bky1zc38pxymzgndb9h3wing3pb0fwm30yrzd";
+        sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
         # sha256 = lib.fakeSha256;
         version = "2025.5.0";
       })

home/default.nix

@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   pkgs,
   userName,
@@ -13,7 +14,7 @@
   };
 in {
   # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+  imports = map (module: import module {inherit config lib pkgs dirs userName userEmail ghostty;}) [
     ./atuin.nix
     ./shell.nix
     ./packages
@@ -27,7 +28,7 @@ in {
     ./browser.nix
     ./zellij.nix
     ./bat.nix
-    ./fonts.nix
+    ./obsidian.nix
   ];
 
   # Home Manager needs a bit of information about you and the
@@ -40,9 +41,9 @@ in {
       else "/home/${userName}";
 
     sessionVariables = {
-      XDG_CURRENT_DESKTOP = "gnome";
+      XDG_CURRENT_DESKTOP = "sway";
       XDG_SESSION_TYPE = "wayland";
-      XDG_SESSION_DESKTOP="gnome";
+      XDG_SESSION_DESKTOP="sway";
       XDG_CONFIG_HOME = "$HOME/.config";
       XDG_CACHE_HOME = "$HOME/.cache";
       XDG_DATA_HOME = "$HOME/.local/share";
@@ -57,7 +58,7 @@ in {
       size = 22;
     };
 
-    stateVersion = "24.11";
+    stateVersion = "25.05";
   };
 
   # Let Home Manager install and manage itself.

home/fonts.nix

@@ -1,16 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  fonts.fontconfig.enable = true;
-  home.packages = with pkgs;
-    [
-      noto-fonts
-      noto-fonts-emoji
-      liberation_ttf
-      noto-fonts-cjk-sans
-      monaspace
-    ]
-    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-}

home/git.nix

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

home/obsidian.nix

@@ -0,0 +1,53 @@
+{ config, home-manager-unstable, pkgs, ...}: {
+  home.packages = with pkgs; [
+    obsidian
+    obsidian-export
+  ];
+  programs.obsidian = {
+    enable = true;
+    package = 
+    vaults = {
+      "notes" = {
+        enable = true;
+        target = "${config.home.homeDirectory}/Documents/obsidian/notes";
+      };
+      "work-notes" = {
+        enable = true;
+        target = "${config.home.homeDirectory}/Documents/obsidian/work-notes";
+      };
+    };
+    # defaultSettings = {
+    #   themes = [ "catppuccin" ];
+    # };
+  };
+
+  home.activation.obsidianRepos = config.lib.dag.entryAfter ["writeBoundary"] ''
+    REPOS_DIR="${config.home.homeDirectory}/Documents/obsidian"
+    
+    # Create the repos directory if it doesn't exist
+    mkdir -p "$REPOS_DIR"
+    
+    # Function to clone or update a repository
+    clone_or_update() {
+      local repo_url="$1"
+      local vault_name="$2"
+      local vault_path="$REPOS_DIR/$vault_name"
+      
+      if [ -d "$vault_path/.git" ]; then
+        echo "Updating existing vault: $vault_name"
+        cd "$vault_path"
+        ${pkgs.git}/bin/git pull origin main || ${pkgs.git}/bin/git pull origin master || true
+      else
+        echo "Cloning new vault: $vault_name"
+        rm -rf "$vault_path"  # Remove if exists but not a git repo
+        ${pkgs.git}/bin/git clone "$repo_url" "$vault_path" || true
+      fi
+    }
+    
+    # Clone repositories
+    clone_or_update "https://scm.wyattjmiller.com/NoteFolio/notes.git" "notes"
+    clone_or_update "https://scm.wyattjmiller.com/NoteFolio/work-notes.git" "work-notes"
+    
+    echo "Obsidian repository vaults setup complete in $REPOS_DIR"
+  '';
+}

home/packages/common.nix

@@ -23,7 +23,6 @@
     fh
     aria2
     yt-dlp
-    obsidian
     vscode
     weechat
     inetutils
@@ -39,13 +38,9 @@
     babelfish
 
     # language-specific package managers
-    # nodejs
+    nodejs
-    fnm
     cargo
     python3
-    python312Packages.gyp
-    node-gyp
-    node-pre-gyp
 
     # nix specific stuff
     nixd

home/packages/linux.nix

@@ -5,19 +5,16 @@
 }: {
   home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
     imv
-    # betterdiscordctl
+    betterdiscordctl
-    # vesktop
+    vesktop
     xdg-utils
+    mcrcon
     xfce.thunar
     pavucontrol
-    # godot
+    godot
-    # aseprite
+    aseprite
     gpu-screen-recorder
     gpu-screen-recorder-gtk
     # ungoogled-chromium
-    playerctl
-    light
-    brightnessctl
-    wttrbar
   ]);
 }

home/shell.nix

@@ -1,9 +1,9 @@
-{pkgs, lib, ...}: {
+{pkgs, ...}: {
   programs.fish = {
     enable = true;
-    shellInit = ''
+    # initExtra = ''
-      fnm env --use-on-cd --shell fish | source
+    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
-    '';
+    # '';
 
     shellAliases = {
       # ls aliases
@@ -52,27 +52,6 @@
         '';
         onEvent = "fish_greeting";
       };
-    } // lib.optionalAttrs pkgs.stdenv.isLinux {
-      block = {
-        body = ''
-          systemd-inhibit --what=sleep --who="$USER" --why="manual invocation" --mode=block sleep infinity &
-          set -g INHIBIT_PID $last_pid
-          echo "Sleep inhibited. PID: $INHIBIT_PID"
-        '';
-      };
-
-      unblock = {
-        body = ''
-          if set -q INHIBIT_PID
-            kill $INHIBIT_PID 2>/dev/null
-            and echo "Sleep inhibitor removed. PID: $INHIBIT_PID"
-            or echo "Failed to kill process or already terminated."
-            set -e INHIBIT_PID
-          else
-            echo "No active sleep inhibitor found."
-          end
-        '';
-      };
     };
   };
 

home/sway.nix

@@ -147,5 +147,20 @@ in {
   programs.waybar = {
     enable = pkgs.stdenv.isLinux;
     systemd.enable = true;
+
+    package = pkgs.waybar.overrideAttrs (old: {
+      version = "0.13.0";
+
+      src = pkgs.fetchFromGitHub {
+        owner = "Alexays";
+        repo = "Waybar";
+        rev = "0fcda9afa519eb84deda68c051f7938a6c6bdbce";
+        sha256 = "sha256-Puo/Y4qotb6uEEe9vbu/hyFXwLntr48R2C6mrmDKs0c=";
+        fetchSubmodules = true;
+      };
+
+      buildInputs = old.buildInputs ++ [ pkgs.fftw ];
+      mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
+    });
   };
 }

home/terminal.nix

@@ -100,52 +100,9 @@
     };
   };
 
-
+  programs.kitty = {
-    programs.foot = {
+    enable = false; # TODO: to enable later
-      enable = true;
+  };
-      settings = {
-        main = {
-          font = "Monaspace Argon:size=11";
-        };
-        colors = {
-          alpha = 0.9;
-
-          cursor = "11111b f5e0dc";
-          foreground = "cdd6f4";
-          background = "1e1e2e";
-
-          regular0 = "45475a";
-          regular1 = "f38ba8";
-          regular2 = "a6e3a1";
-          regular3 = "f9e2af";
-          regular4 = "89b4fa";
-          regular5 = "f5c2e7";
-          regular6 = "94e2d5";
-          regular7 = "bac2de";
-
-          bright0 = "585b70";
-          bright1 = "f38ba8";
-          bright2 = "a6e3a1";
-          bright3 = "f9e2af";
-          bright4 = "89b4fa";
-          bright5 = "f5c2e7";
-          bright6 = "94e2d5";
-          bright7 = "a6adc8";
-
-          "16" = "fab387";
-          "17" = "f5e0dc";
-
-          selection-foreground = "cdd6f4";
-          selection-background = "414356";
-
-          search-box-no-match = "11111b f38ba8";
-          search-box-match = "cdd6f4 313244";
-
-          jump-labels = "11111b fab387";
-          urls = "89b4fa";
-        };
-      };
-    };
 
   home.packages = if pkgs.stdenv.isLinux then
     [ ghostty.packages.${pkgs.system}.default ]

modules/apps/appimage.nix

@@ -1,19 +0,0 @@
-{
-  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}" = {
-    home = if pkgs.stdenv.isDarwin 
-           then "/Users/${userName}" 
-           else "/home/${userName}";
-    description = userName;
-  } // lib.optionalAttrs pkgs.stdenv.isLinux {
-    group = "${userName}";
-    isNormalUser = true;
-  };
-  
-  users.groups.wyatt = {};
-  nix.settings.trusted-users = [userName];
 
-  security = lib.optionalAttrs pkgs.stdenv.isLinux {
+  # Don't forget to set a password with ‘passwd’!
-    sudo.extraRules = [
+  users.users."${userName}" = lib.mkMerge [
+    {
+      home =
+        if pkgs.stdenv.isDarwin
+        then "/Users/${userName}"
+        else "/home/${userName}";
+      description = userName;
+    }
+
+    (lib.mkIf (pkgs.stdenv.isLinux) {
+      group = "${userName}";
+      isNormalUser = true;
+    })
+  ];
+
+  security.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

@@ -11,7 +11,6 @@
     "info.beyondallreason.bar"
     "io.dbeaver.DBeaverCommunity"
     "io.openrct2.OpenRCT2"
-    "md.obsidian.Obsidian"
     "org.prismlauncher.PrismLauncher"
     "sh.cider.Cider"
   ];
@@ -21,13 +20,11 @@ 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
   ];
@@ -36,13 +33,9 @@ in {
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
   # Custom kernel/boot stuff
-  boot = {
+  boot.kernelPackages = pkgs.linuxPackages_latest;
-    kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
-    loader = {
+  boot.loader.efi.canTouchEfiVariables = true;
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
 
   # Enable Bluetooth if present
   hardware.bluetooth.enable = true;
@@ -69,6 +62,21 @@ 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;
 
@@ -136,39 +144,14 @@ in {
     networkManager.enable = true;
   };
 
-  programs = {
+  # Enable dconf
-    # Enable GnuPG
+  programs.dconf.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-
-    # Enable SUID wrappers (some programs need them)
-    mtr.enable = true;
-
-    # Enable dconf
-    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 = {
+  # Flatpak packages (see ../../apps/flatpak.nix)
-    # Enable OpenSSH
+  services.flatpak.packages = flatpakPackages;
-    openssh.enable = true;
-
-    # Enable keyring
-    gnome.gnome-keyring.enable = true;
-
-    # Flatpak packages (see ../../apps/flatpak.nix)
-    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 = {
@@ -176,12 +159,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

@@ -1,33 +0,0 @@
-# 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 []
-        );
-    }
-  ]);
-}