diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2025-03-17 15:22:02 +0000 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2025-03-17 15:22:02 +0000 |
| commit | 919b14b4cef330464b81c75a3a9c3c42f882b3e9 (patch) | |
| tree | 3de6cdb6e4fa8c39fa46880d5a0272ccb5761dfa | |
| parent | d91fc98a76bf336507976c50dad04a136f3a636f (diff) | |
| parent | e86d5755194572fad8ba492171929fa2e20144eb (diff) | |
Merge branch 'master' of localhost:/srv/git/.flake
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | machines/biski/default.nix | 2 | ||||
| -rw-r--r-- | machines/biski/hardware-configuration.nix | 14 |
3 files changed, 10 insertions, 7 deletions
@@ -232,6 +232,7 @@ biski = lib.nixosSystem { # another networking server, physical instead of cloud modules = minimalConfigSettings ++ [ ./machines/biski disko.nixosModules.disko + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; picast = lib.nixosSystem { # anger at chromecast diff --git a/machines/biski/default.nix b/machines/biski/default.nix index 532ebe3..5dc0bc8 100644 --- a/machines/biski/default.nix +++ b/machines/biski/default.nix @@ -28,6 +28,8 @@ networking.hostName = "biski"; # Define your hostname. + services.tailscale.useRoutingFeatures = "both"; + security.pam.sshAgentAuth.enable = true; # Set your time zone. diff --git a/machines/biski/hardware-configuration.nix b/machines/biski/hardware-configuration.nix index dc2e787..9010b7b 100644 --- a/machines/biski/hardware-configuration.nix +++ b/machines/biski/hardware-configuration.nix @@ -14,43 +14,43 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + { device = "/dev/disk/by-partlabel/root"; fsType = "btrfs"; options = [ "subvol=@root" ]; }; fileSystems."/nix" = - { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + { device = "/dev/disk/by-partlabel/root"; fsType = "btrfs"; options = [ "subvol=@nix" ]; }; fileSystems."/persist" = - { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + { device = "/dev/disk/by-partlabel/root"; fsType = "btrfs"; options = [ "subvol=@persist" ]; }; fileSystems."/var/log" = - { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + { device = "/dev/disk/by-partlabel/root"; fsType = "btrfs"; options = [ "subvol=@log" ]; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + { device = "/dev/disk/by-partlabel/root"; fsType = "btrfs"; options = [ "subvol=@home" ]; }; fileSystems."/swap" = - { device = "/dev/disk/by-uuid/8b016d79-af5b-4803-baa1-f1b4c1ba44b4"; + { device = "/dev/disk/by-partlabel/root"; fsType = "btrfs"; options = [ "subvol=@swap" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/E24B-30F2"; + { device = "/dev/disk/by-partlabel/boot"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; |