diff --git a/flake.lock b/flake.lock index 35b6331..8c2189d 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1788016784, - "narHash": "sha256-RO90Fk+Rn2Yy+I8oL4ePTLLKLgOAr8hrTx7tlpwdLaA=", + "lastModified": 1788444081, + "narHash": "sha256-I8i97p9WBQaZQyyBaHFMt8e01VfgfFZSaO+vAUd0u0A=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "783bfd9ae441d1d0519b979ac68b73ddd6e81df0", + "rev": "36b66db4ddd708ad19f5db850af6a478d8a19b2a", "type": "github" }, "original": { @@ -92,51 +92,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "hermes-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "hermes-agent": { - "inputs": { - "flake-parts": "flake-parts", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2", - "npm-lockfile-fix": "npm-lockfile-fix", - "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix", - "uv2nix": "uv2nix" - }, - "locked": { - "lastModified": 1788300494, - "narHash": "sha256-VxuiU7ymy16GE2R0a18GIeBXfT/Lh1qS0u4AWPMaNd0=", - "owner": "NousResearch", - "repo": "hermes-agent", - "rev": "24f5a60ed1dd382ee453567a9abe1b72316d5e65", - "type": "github" - }, - "original": { - "owner": "NousResearch", - "repo": "hermes-agent", - "type": "github" - } - }, "hjem": { "inputs": { "nixpkgs": [ @@ -201,27 +156,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1786487128, - "narHash": "sha256-ad60hrRVhH/bo3Jl1YLzO+QcS3mUNZr9LNJdzhMO2P4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "f404edbfa4117810c96b97048299242fc50e5362", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -291,17 +225,17 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1788286479, - "narHash": "sha256-qWe/uD9EMZKFs8INJfDyngkjZROC4XJQVFPa16jr2YI=", + "lastModified": 1788607141, + "narHash": "sha256-yjVNYxNkV7KST+K1kW0i4uts2KvZDuK98oot12xHJQ0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c1239d02e759673977de0389d3945c7c9adbc1ee", + "rev": "2eb5180c6f258bb73c4b9b71a1361dede0e1453e", "type": "github" }, "original": { @@ -559,11 +493,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1785318670, - "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", + "lastModified": 1788404924, + "narHash": "sha256-lhEhY8X5EgkQ/eg6IFz4cc8jRuSYSvnxx1al7d1dvZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5", + "rev": "0968519e14f7aa7d3e9b389682bd74d2b51c8ce8", "type": "github" }, "original": { @@ -575,27 +509,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1787736819, - "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1788179007, - "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=", + "lastModified": 1788531059, + "narHash": "sha256-hLD4l3QOGBQhkVp3mQ2lJ/YbEi99qUgKapb40KovZ88=", "owner": "nixos", "repo": "nixpkgs", - "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9", + "rev": "801bef6abd86b91e51083066b83fb354a11fc640", "type": "github" }, "original": { @@ -605,27 +523,6 @@ "type": "github" } }, - "npm-lockfile-fix": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775903712, - "narHash": "sha256-2GV79U6iVH4gKAPWYrxUReB0S41ty/Y3dBLquU8AlaA=", - "owner": "jeslie0", - "repo": "npm-lockfile-fix", - "rev": "c6093acb0c0548e0f9b8b3d82918823721930fe8", - "type": "github" - }, - "original": { - "owner": "jeslie0", - "repo": "npm-lockfile-fix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -635,11 +532,11 @@ ] }, "locked": { - "lastModified": 1787424939, - "narHash": "sha256-O2tBn84NNuHrnqNVxx/XqsXwfYvS1YwBh+7CBnbCYsk=", + "lastModified": 1788267358, + "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "809414f0cdadf82cf11b06c2b29ba9b3168b3297", + "rev": "27555e2624241fb116b49095df4caaee85a25691", "type": "github" }, "original": { @@ -648,64 +545,13 @@ "type": "github" } }, - "pyproject-build-systems": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "nixpkgs" - ], - "pyproject-nix": [ - "hermes-agent", - "pyproject-nix" - ], - "uv2nix": [ - "hermes-agent", - "uv2nix" - ] - }, - "locked": { - "lastModified": 1785115949, - "narHash": "sha256-8AM37BfyGaL2v/SZyg4PupRxJ01Y4htvM+WrTjWrPpo=", - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "rev": "62c0d86027edb1c4f39a5facc09876348144f7c9", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "type": "github" - } - }, - "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1784591072, - "narHash": "sha256-zP/WaDxrRu8GANZM61+V2LT/7ycEEdoyLWn7M6WzU7M=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "e3b599ca2e7fcf93d4edf65d7f19bbf6491724f3", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", - "hermes-agent": "hermes-agent", "hjem": "hjem", "hjem-rum": "hjem-rum", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" } }, "systems": { @@ -738,31 +584,6 @@ "type": "github" } }, - "uv2nix": { - "inputs": { - "nixpkgs": [ - "hermes-agent", - "nixpkgs" - ], - "pyproject-nix": [ - "hermes-agent", - "pyproject-nix" - ] - }, - "locked": { - "lastModified": 1785277507, - "narHash": "sha256-9Tq3UDX2hD/aveW/HvkBlAmEwJTOlY5HQXJM+L5BGmE=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "5a836d395cbf5fc22670eb98dd4aa4fc4d406977", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -791,11 +612,11 @@ ] }, "locked": { - "lastModified": 1786988229, - "narHash": "sha256-frEFLVRj8xXvBBDs44IRiqHo6R2PxsRpluygL7abjjI=", + "lastModified": 1788025068, + "narHash": "sha256-TBqronrrc/F2Ry/E37d/1TLldDLJDFNSwvJjgk+cXzU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "59d429bf45aed4e2209043c0c36565ad8e2859a5", + "rev": "ba31964ee42b56bcb0d3b78a64ead5d8a1c3c6f6", "type": "github" }, "original": { diff --git a/modules/core/default.nix b/modules/core/default.nix index d1be68c..4f9ff4f 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -9,7 +9,7 @@ ./timezone.nix ./nix.nix ./program.nix - ./user.nix + ./users.nix ./ssh.nix ]; } diff --git a/modules/core/nix.nix b/modules/core/nix.nix index eb048f5..7116739 100644 --- a/modules/core/nix.nix +++ b/modules/core/nix.nix @@ -1,5 +1,5 @@ { - nix.settings = { - experimental-features = "nix-command flakes"; - }; + # nix.settings = { + # experimental-features = "nix-command flakes"; + # }; } diff --git a/modules/core/user.nix b/modules/core/user.nix deleted file mode 100644 index b5e290f..0000000 --- a/modules/core/user.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ username, pkgs, ... }: - -{ - users.users.${username} = { - isNormalUser = true; - description = "${username}"; - extraGroups = [ - "wheel" - "docker" - ]; - shell = pkgs.zsh; - }; - nix.settings.allowed-users = [ "@wheel" ]; -} diff --git a/modules/core/users.nix b/modules/core/users.nix new file mode 100644 index 0000000..7084491 --- /dev/null +++ b/modules/core/users.nix @@ -0,0 +1,35 @@ +{ username, pkgs, ... }: + +{ + users.users.${username} = { + isNormalUser = true; + description = "${username}"; + extraGroups = [ + "wheel" + "docker" + ]; + shell = pkgs.zsh; + }; + + users.users.fen = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ8nZT7pA+Wp7mnjKSJPpmYs+tFx5q+gtvOcSSMJt93D fen" + ]; + }; + + nix.settings.allowed-users = [ "@wheel" ]; + + security.sudo.extraRules = [ + { + users = [ "fen" ]; + commands = [ + { + command = "ALL"; + options = [ "NOPASSWD" ]; + } + ]; + } + ]; +} diff --git a/rebuild.sh b/rebuild.sh index 54d1c55..d63e535 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -1 +1 @@ -sudo nixos-rebuild switch --flake ./#qemu-vm +sudo nixos-rebuild switch --flake ./#goyplex-vm