wip: adding standalone home-manager config

need to modularize though

defaults/sway/config

@@ -7,37 +7,41 @@ set $down j
 set $up k
 set $right l
 # Alacritty
-set $term alacritty
+set $term foot
 
 # Menu (rofi)
-set $menu wofi --term '$term'
+set $menu wofi --show
 
-### 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 HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
+output * bg ~/.wallpaper/.wallpaper.png fill
-output DP-2  bg ~/.wallpaper/.wallpaper.png fill
+# output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
-output DP-3 bg ~/.wallpaper/.wallpaper.png fill
+# output DP-2  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
 
-## HDMI-A-1 bindings
+## eDP-1 bindings scale
-workspace 3 output HDMI-A-1
+output eDP-1 scale 1.25
-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
@@ -228,10 +232,4 @@ 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": 1749744770,
+        "lastModified": 1757432263,
-        "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
+        "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
+        "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb",
         "type": "github"
       },
       "original": {
@@ -55,6 +55,24 @@
         "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",
@@ -64,11 +82,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1754941490,
+        "lastModified": 1759330332,
-        "narHash": "sha256-2AJf0q4u1zakqjr0y4dCyqzdDSil8P5m2YpZxAAzJJw=",
+        "narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "5bf632e9cc0e77a578bad983b0cbdf0451ce87d4",
+        "rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1",
         "type": "github"
       },
       "original": {
@@ -84,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753592768,
+        "lastModified": 1758463745,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
         "type": "github"
       },
       "original": {
@@ -114,6 +132,25 @@
         "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,
@@ -129,11 +166,39 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1754767907,
+        "lastModified": 1758360447,
-        "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
+        "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
+        "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": "c5f08b62ed75415439d48152c2a784e36909b1bc",
+        "rev": "93e8cdce7afc64297cfec447c311470788131cd9",
+        "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": {
@@ -149,7 +214,8 @@
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_2"
+        "nixgl": "nixgl",
+        "nixpkgs": "nixpkgs_4"
       }
     },
     "systems": {
@@ -167,6 +233,21 @@
         "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": [
@@ -198,27 +279,20 @@
     },
     "zon2nix": {
       "inputs": {
-        "flake-utils": [
+        "nixpkgs": "nixpkgs_2"
-          "ghostty",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1742104771,
+        "lastModified": 1758405547,
-        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
+        "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
         "owner": "jcollie",
         "repo": "zon2nix",
-        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
+        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
         "type": "github"
       },
       "original": {
         "owner": "jcollie",
         "repo": "zon2nix",
-        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
+        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
         "type": "github"
       }
     }

flake.nix

@@ -12,6 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
+    nixgl.url = "github:guibou/nixGL";
   };
 
   outputs = inputs @ {
@@ -21,6 +22,7 @@
     darwin,
     home-manager,
     ghostty,
+    nixgl,
     ...
   }: let
     userName = "wyatt";
@@ -129,5 +131,17 @@
       #   }
       # ];
     };
+
+    # 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:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
+        sha256 = "sha256:054kqrai2kd89bzc5c3x17rjfdil2zzxrxrg65vaywmvm77y7kmn";
         # sha256 = lib.fakeSha256;
         version = "1.64.0";
       })
       (createChromiumExtension {
         # bitwarden
         id = "nngceckbapebfimnlniiiahkandclblb";
-        sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
+        sha256 = "sha256:02cscadjqbfx3a5bky1zc38pxymzgndb9h3wing3pb0fwm30yrzd";
         # sha256 = lib.fakeSha256;
         version = "2025.5.0";
       })

home/default.nix

@@ -27,6 +27,7 @@ in {
     ./browser.nix
     ./zellij.nix
     ./bat.nix
+    ./fonts.nix
   ];
 
   # Home Manager needs a bit of information about you and the
@@ -39,9 +40,9 @@ in {
       else "/home/${userName}";
 
     sessionVariables = {
-      XDG_CURRENT_DESKTOP = "sway";
+      XDG_CURRENT_DESKTOP = "gnome";
       XDG_SESSION_TYPE = "wayland";
-      XDG_SESSION_DESKTOP="sway";
+      XDG_SESSION_DESKTOP="gnome";
       XDG_CONFIG_HOME = "$HOME/.config";
       XDG_CACHE_HOME = "$HOME/.cache";
       XDG_DATA_HOME = "$HOME/.local/share";

home/fonts.nix

@@ -0,0 +1,16 @@
+{
+  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.merge = true;
+      pull.rebase = false;
       merge.tool = "nvimdiff";
       mergetool.keepBackup = false;
     };

home/packages/common.nix

@@ -39,9 +39,13 @@
     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,16 +5,19 @@
 }: {
   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, ...}: {
+{pkgs, lib, ...}: {
   programs.fish = {
     enable = true;
-    # initExtra = ''
+    shellInit = ''
-    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
+      fnm env --use-on-cd --shell fish | source
-    # '';
+    '';
 
     shellAliases = {
       # ls aliases
@@ -52,6 +52,27 @@
         '';
         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/terminal.nix

@@ -100,9 +100,52 @@
     };
   };
 
-  programs.kitty = {
+
-    enable = false; # TODO: to enable later
+    programs.foot = {
-  };
+      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/common/environment.nix

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

modules/security/sudo.nix

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

modules/sound/focusrite.nix

@@ -8,7 +8,7 @@
 with lib; let
   cfg = config.sound.hardware.focusrite;
 in {
-  options.focusrite = {
+  options.sound.hardware.focusrite = {
     enable = mkEnableOption "Focusrite audio interface support";
     guiSupport = mkOption {
       type = types.bool;