diff --git a/flake.lock b/flake.lock index 5ba7f10..8e5cba1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,70 +1,6 @@ { "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", - "owner": "ryantm", - "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -86,22 +22,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1759281824, "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", @@ -118,24 +38,8 @@ }, "root": { "inputs": { - "agenix": "agenix", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" } } }, diff --git a/hosts/snowbelle/configuration.nix b/hosts/snowbelle/configuration.nix index 3c5f730..c5b0abc 100644 --- a/hosts/snowbelle/configuration.nix +++ b/hosts/snowbelle/configuration.nix @@ -14,7 +14,7 @@ ssh.enable = true; docker.enable = true; syncthing.enable = true; - tailscale.enable = true; + tailscale.enable = false; nvidia.enable = false; }; homelab = { @@ -29,21 +29,6 @@ blake.enable = true; }; - - # passwordless rebuild - security.sudo.extraRules = [ - { - users = [ "blake" ]; - commands = [ - { - command = "/run/current-system/sw/bin/nixos-rebuild"; - options = [ "NOPASSWD" ]; - } - ]; - } - ]; - - # use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -82,7 +67,6 @@ # programs here, NOT in environment.systemPackages ]; - # enable flakes nix.settings.experimental-features = [ "nix-command" "flakes" ]; diff --git a/modules/system/tailscale.nix b/modules/system/tailscale.nix index 7631d26..00d9187 100644 --- a/modules/system/tailscale.nix +++ b/modules/system/tailscale.nix @@ -1,23 +1,15 @@ { pkgs, config, lib, ... }: { - #imports = [ agenix.nixosModules.default ]; - options = { modules.system.tailscale.enable = lib.mkEnableOption "enables tailscale"; }; config = lib.mkIf config.modules.system.tailscale.enable { - age.secrets."tailscale_authkey" = { - file = ../../secrets/tailscale_authkey.txt.age; - owner = "blake"; - group = "blake"; - mode = "0400"; - }; services.tailscale = { enable = true; }; useRoutingFeatures = "both"; - authKeyFile = "/run/agenix/tailscale_authkey"; + #authKeyFile = "/home/blake/.nix/.keyring/tailscale/tailscale_authfile"; }; } diff --git a/users/blake/blake.nix b/users/blake/blake.nix index 7d03016..1ebd671 100644 --- a/users/blake/blake.nix +++ b/users/blake/blake.nix @@ -31,5 +31,18 @@ users.groups.blake = { gid = 1000; }; + + # passwordless rebuild + security.sudo.extraRules = [ + { + users = [ "blake" ]; + commands = [ + { + command = "/run/current-system/sw/bin/nixos-rebuild"; + options = [ "NOPASSWD" ]; + } + ]; + } + ]; }; }