diff --git a/extras/laura-ssh-root.nix b/extras/laura-ssh-root.nix new file mode 100644 index 0000000..d412cd2 --- /dev/null +++ b/extras/laura-ssh-root.nix @@ -0,0 +1,7 @@ +{...}: { + users.users.root = { + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWDArL4+m9kUmLyWcmUby5+CVrmBThP0KbQWep32+BF laura@zotan.network" + ]; + }; +} \ No newline at end of file diff --git a/flake.lock b/flake.lock index d9558c1..f1066ff 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1643787431, - "narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=", + "lastModified": 1648475189, + "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", "owner": "serokell", "repo": "deploy-rs", - "rev": "4154ba1aaaf7333a916384c348d867d03b6f1409", + "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1645970334, - "narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=", + "lastModified": 1649392573, + "narHash": "sha256-dCPEJZzExz2+i7AjUuViZUgHC+JXDlBBG/IzuSYWCh8=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25", + "rev": "f911ebbec927e8e9b582f2e32e2b35f730074cfc", "type": "github" }, "original": { @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1645293039, - "narHash": "sha256-PwdDu+SkX8dreeuJ/4av1sEluNZdrpdXv8JsRKKg1Yc=", + "lastModified": 1648278671, + "narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "1df878b6f8351795a3bebfbe4fd2d02e1e8b29d6", + "rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79", "type": "github" }, "original": { @@ -119,11 +119,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1646159311, - "narHash": "sha256-ILKckkiG074t3a0pwaPLjio8zVWgowpEp7AUwI5HjHE=", + "lastModified": 1649225869, + "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18bd82edcc752d6a0e6cce1401ba0c81353a03ca", + "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "utils": { "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { diff --git a/home/programming/editors/vscode.nix b/home/programming/editors/vscode.nix index 958b30a..d693f8b 100644 --- a/home/programming/editors/vscode.nix +++ b/home/programming/editors/vscode.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: let configDir = "Code"; userDir = if pkgs.stdenv.hostPlatform.isDarwin then - "Library/Application Support/${configDir}/User" + "$HOME/Library/Application Support/${configDir}/User" else "${config.xdg.configHome}/${configDir}/User"; in { @@ -28,7 +28,7 @@ in { after = [ "writeBoundary" ]; before = [ ]; data = '' - vscodeDir="$HOME/${userDir}" + vscodeDir="${userDir}" $DRY_RUN_CMD cat "$vscodeDir/settings.json" > "$vscodeDir/settings_whatever.json" $DRY_RUN_CMD rm -f "$vscodeDir/settings.json" $DRY_RUN_CMD cp "$vscodeDir/settings_whatever.json" "$vscodeDir/settings.json" diff --git a/hosts/hetzner-vm/hetzner-vm.nix b/hosts/hetzner-vm/hetzner-vm.nix index 8aa3277..d1c3a0b 100644 --- a/hosts/hetzner-vm/hetzner-vm.nix +++ b/hosts/hetzner-vm/hetzner-vm.nix @@ -18,6 +18,8 @@ hosts.hetzner-vm.services.storage-sftp (modulesPath + "/profiles/qemu-guest.nix") + + ../../extras/laura-ssh-root.nix ]; home-manager.users.root = { diff --git a/hosts/lappy/lappy.nix b/hosts/lappy/lappy.nix index 8d90b9e..aaad739 100644 --- a/hosts/lappy/lappy.nix +++ b/hosts/lappy/lappy.nix @@ -18,7 +18,7 @@ in { profiles.laptop # Bluetooth - profiles.connectivity.bluetooth + #profiles.connectivity.bluetooth profiles.connectivity.network_manager profiles.connectivity.ios @@ -61,8 +61,8 @@ in { #home.gaming.games.osu #home.gaming.platforms.steam - home.bluetooth - home.network_manager + #home.bluetooth + #home.network_manager home.apps.vivaldi home.apps.telegram diff --git a/users/chaos.nix b/users/chaos.nix index 7735324..7ffc6bc 100644 --- a/users/chaos.nix +++ b/users/chaos.nix @@ -15,7 +15,6 @@ ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAeN3T1aZkTm5xS0b66cRDyKUbdEQCFyzVWXeW+eIbsa chaos@chaos" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDlq6+Okg6FYOM0lhwCHTpPfhKPW6uwbyD7NFS+1u1V63vBIlcSFqHEWkM0ksD7QvMn9lOPY4Q1lpiOQbyeyy5H/OAsjmopDsniAH5GVGWCDn+mu2aQwOzm2oeEDIA8p5KTr8/etKMZ1VJoKuKyL9XT3ZMSD8RAuabc0dR0krOevRczN8+GUNnTFbDhc++jK+XqwPVrPqA78cpfyZP3w9it/T15hmIzbbEvfTWYAPBfwdCdVumIA2t76yUMtrwNU7Fy3U+6nuJ197c62p55HepbLqf9zS9gvi7rh9lQd/EkSFKPGDaYOShQwZWjxPHzMiYlHRfRhkINh9ryGLN6uol arsenijs@User-PC" ]; }; }