From ddd3fb39e4c92dba014241d9cad0851fffb6f62d Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 27 Aug 2025 11:31:06 -0400 Subject: [PATCH 1/7] bulk of the refactor --- modules/common/environment.nix | 15 +++++++---- modules/common/users.nix | 49 +++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/modules/common/environment.nix b/modules/common/environment.nix index d4e931c..826ad32 100644 --- a/modules/common/environment.nix +++ b/modules/common/environment.nix @@ -6,14 +6,19 @@ 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"; diff --git a/modules/common/users.nix b/modules/common/users.nix index 1663a61..0ac1fb9 100644 --- a/modules/common/users.nix +++ b/modules/common/users.nix @@ -1,30 +1,23 @@ +{ 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]; - # Don't forget to set a password with ‘passwd’! - 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 = [ + security = lib.optionalAttrs pkgs.stdenv.isLinux { + sudo.extraRules = [ { groups = [ "wheel" ]; commands = [ @@ -37,7 +30,9 @@ ]; }; - users.groups.wyatt = {}; - - nix.settings.trusted-users = [userName]; + environment = lib.optionalAttrs pkgs.stdenv.isDarwin { + etc."sudoers.d/wheel-nopasswd".text = '' + %wheel ALL=(ALL:ALL) NOPASSWD: SETENV: ALL + ''; + }; } From 3af5061a7933e8ddbefd20dd4d123b5cd508a099 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 27 Aug 2025 11:31:11 -0400 Subject: [PATCH 2/7] system update --- flake.lock | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 0b81522..93bf57e 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1754941490, - "narHash": "sha256-2AJf0q4u1zakqjr0y4dCyqzdDSil8P5m2YpZxAAzJJw=", + "lastModified": 1756131615, + "narHash": "sha256-rmmsEZglqzgxIePTKe5wCIQ3syzAb4jE3RpNxD/2tzY=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "5bf632e9cc0e77a578bad983b0cbdf0451ce87d4", + "rev": "8aa0b4c92a54f822043e134d2b84ee29844f944e", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1755928099, + "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "4a44fb9f7555da362af9d499817084f4288a957f", "type": "github" }, "original": { @@ -129,11 +129,24 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754767907, - "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", + "lastModified": 1755972213, + "narHash": "sha256-VYK7aDAv8H1enXn1ECRHmGbeY6RqLnNwUJkOwloIsko=", + "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": "c5f08b62ed75415439d48152c2a784e36909b1bc", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "type": "github" }, "original": { @@ -149,7 +162,7 @@ "ghostty": "ghostty", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" } }, "systems": { @@ -202,23 +215,20 @@ "ghostty", "flake-utils" ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1742104771, - "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", + "lastModified": 1756000480, + "narHash": "sha256-fR5pdcjO0II5MNdCzqvyokyuFkmff7/FyBAjUS6sMfA=", "owner": "jcollie", "repo": "zon2nix", - "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "rev": "d9dc9ef1ab9ae45b5c9d80c6a747cc9968ee0c60", "type": "github" }, "original": { "owner": "jcollie", "repo": "zon2nix", - "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "rev": "d9dc9ef1ab9ae45b5c9d80c6a747cc9968ee0c60", "type": "github" } } From faed026258ca6301e66526dcf635f57791540cd3 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 4 Sep 2025 14:05:36 -0400 Subject: [PATCH 3/7] some formatting modifications --- modules/common/environment.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/common/environment.nix b/modules/common/environment.nix index 826ad32..2c7c8b9 100644 --- a/modules/common/environment.nix +++ b/modules/common/environment.nix @@ -1,5 +1,4 @@ { lib, pkgs, ... }: { - # Common packages that every system will use environment.systemPackages = with pkgs; [ git vim @@ -17,9 +16,8 @@ nix-ld ]) ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ - # nothing here, yet + # nothing here, yet ;) ]); - # Common environment variables that every system will use environment.variables.EDITOR = "nvim"; } From 93052529b82d5c977b693cfe9fc1bec134074da7 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 13 Sep 2025 16:30:26 -0400 Subject: [PATCH 4/7] modified things --- modules/security/sudo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix index 79360e8..e71b56d 100644 --- a/modules/security/sudo.nix +++ b/modules/security/sudo.nix @@ -5,7 +5,7 @@ }: with lib; { options = { - security.sudo = { + security.sudoers = { needsPassword = mkOption { type = types.bool; default = true; From 7bc7749f51c6f440ca48febbd81969970f655aab Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 21 Sep 2025 11:55:14 -0400 Subject: [PATCH 5/7] fixed focusrite module --- modules/sound/focusrite.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sound/focusrite.nix b/modules/sound/focusrite.nix index 24a6f00..39de544 100644 --- a/modules/sound/focusrite.nix +++ b/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; From 29feb9223e354351d71b8b8d95fc96b433279b45 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 21 Sep 2025 11:55:46 -0400 Subject: [PATCH 6/7] fixed git config i think i am reverting a false fix, idk --- home/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/git.nix b/home/git.nix index 7c3504a..db30f9d 100644 --- a/home/git.nix +++ b/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; }; From bfa957adcd27960c77d42f9148a249748524698e Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 2 Oct 2025 09:58:03 -0400 Subject: [PATCH 7/7] flake update --- flake.lock | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 93bf57e..e482aa1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1749744770, - "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=", + "lastModified": 1757432263, + "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb", + "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1756131615, - "narHash": "sha256-rmmsEZglqzgxIePTKe5wCIQ3syzAb4jE3RpNxD/2tzY=", + "lastModified": 1759330332, + "narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "8aa0b4c92a54f822043e134d2b84ee29844f944e", + "rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1755928099, - "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a44fb9f7555da362af9d499817084f4288a957f", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -129,24 +129,24 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755972213, - "narHash": "sha256-VYK7aDAv8H1enXn1ECRHmGbeY6RqLnNwUJkOwloIsko=", - "rev": "73e96df7cff5783f45e21342a75a1540c4eddce4", + "lastModified": 1758360447, + "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre850642.73e96df7cff5/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "nixpkgs_3": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "lastModified": 1759281824, + "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", "type": "github" }, "original": { @@ -211,24 +211,20 @@ }, "zon2nix": { "inputs": { - "flake-utils": [ - "ghostty", - "flake-utils" - ], "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1756000480, - "narHash": "sha256-fR5pdcjO0II5MNdCzqvyokyuFkmff7/FyBAjUS6sMfA=", + "lastModified": 1758405547, + "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=", "owner": "jcollie", "repo": "zon2nix", - "rev": "d9dc9ef1ab9ae45b5c9d80c6a747cc9968ee0c60", + "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", "type": "github" }, "original": { "owner": "jcollie", "repo": "zon2nix", - "rev": "d9dc9ef1ab9ae45b5c9d80c6a747cc9968ee0c60", + "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", "type": "github" } }