diff options
| -rw-r--r-- | flake.lock | 9 | ||||
| -rw-r--r-- | system/linde.nix | 6 | ||||
| -rw-r--r-- | system/marvin.nix | 1 | ||||
| -rw-r--r-- | user/settings/development/base.nix | 2 | ||||
| -rw-r--r-- | user/settings/shell.nix | 1 |
5 files changed, 8 insertions, 11 deletions
diff --git a/flake.lock b/flake.lock index 1c851e53..1280f7c4 100644 --- a/flake.lock +++ b/flake.lock @@ -530,11 +530,11 @@ ] }, "locked": { - "lastModified": 1732995839, - "narHash": "sha256-W4puZ9bsWChKITK/9eFWP33yNP9hd40QHYy8nFntTkE=", + "lastModified": 1734038092, + "narHash": "sha256-+/Utn3VkdSwz+QZhJtA4vYtw/OOrV59bJlX0Z3k4S8g=", "ref": "refs/heads/main", - "rev": "7045e0e5dee00764d5329f3d3cecde04ef61a630", - "revCount": 37, + "rev": "a80f62bbc86309725cb74f1d5bb0d32d52674bda", + "revCount": 38, "type": "git", "url": "file:packages" }, @@ -610,7 +610,6 @@ "locked": { "lastModified": 1734265815, "narHash": "sha256-+01ZVjfGLM+aipy79TjUT2+oMm9PZHyhWOf8pRDUW2M=", - "ref": "refs/heads/main", "rev": "7a81d7be169c14234e37fbc7aefd88b51cf68b28", "revCount": 76, "type": "git", diff --git a/system/linde.nix b/system/linde.nix index 563931aa..68bcac43 100644 --- a/system/linde.nix +++ b/system/linde.nix @@ -229,6 +229,7 @@ in services.tailscale = { enable = true; extraUpFlags = [ "--accept-routes" ]; + extraSetFlags = [ "--advertise-exit-node" ]; useRoutingFeatures = "client"; }; services.golink = { @@ -317,12 +318,9 @@ in home = "/var/lib/nixremote/"; createHome = true; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxa7lxDu0M4chats/VvpFzjT3ruexKa3J9UC6ASo3bN root@NanoPi.lan" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBmDSZnUzIPQowLrKSa24eSb1WFQe7yPjTcDPPe3UY0Q nix@mba" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9of82WBHK8nr8L9RGeieLMfcAWaFCeCkmvYHM9LCuT nanopi" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKGzXGgFm/4Da2KNl1wb7TC2YOu/baP/2eFVBaJY0Wq root@marvin" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIy9jFioBvV0JA0lc+De2N+vDOABGHgCECW6vkD33CE4 sourcehut" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIII7sWEwsm8JZiJ0LUnjSt0Kg1RXypG6p5AzP/R2n5ca actions@github.com" - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEsD23eNmxBQj+FCxXXvSAX9U+9HPLKei95vdHPGWbyA5TVlD0N8ROxcfRwDepaQfCqOxEchh7liLAivI1PRCd0= secretive@macbook-pro" ]; }; diff --git a/system/marvin.nix b/system/marvin.nix index 0e022fb7..2dd7986a 100644 --- a/system/marvin.nix +++ b/system/marvin.nix @@ -81,6 +81,7 @@ }; NSGlobalDomain = { AppleShowScrollBars = "Always"; + ApplePressAndHoldEnabled = false; }; screensaver = { askForPasswordDelay = 60; diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix index fe243ad5..b0d23147 100644 --- a/user/settings/development/base.nix +++ b/user/settings/development/base.nix @@ -33,7 +33,7 @@ docker-credential-helpers dive ] ++ (if stdenv.isDarwin then [ - lima-bin + lima colima docker-client ] else [ diff --git a/user/settings/shell.nix b/user/settings/shell.nix index c33e808e..66ebaade 100644 --- a/user/settings/shell.nix +++ b/user/settings/shell.nix @@ -143,7 +143,6 @@ in }; }; home.packages = with pkgs; [ - babashka fzf up ]; |