diff --git a/flake.nix b/flake.nix index a6106ae..0d74eea 100644 --- a/flake.nix +++ b/flake.nix @@ -111,12 +111,12 @@ inherit lib overlays nixosModules homeManagerModules; - nixosConfigurations.felix-nixos = nixpkgs.lib.nixosSystem { + nixosConfigurations.home-pc = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ nixpkgs.nixosModules.notDetected - (lib.createSystem "felix-nixos" { - hardwareConfig = ./hardware/felix-nixos.nix; + (lib.createSystem "home-pc" { + hardwareConfig = ./hardware/home-pc.nix; config = ./home-pc.nix; }) (lib.createUser "felschr" { diff --git a/hardware/felix-nixos.nix b/hardware/home-pc.nix similarity index 96% rename from hardware/felix-nixos.nix rename to hardware/home-pc.nix index a212599..23a341a 100644 --- a/hardware/felix-nixos.nix +++ b/hardware/home-pc.nix @@ -28,7 +28,7 @@ fileSystems."/.swap" = { device = "/dev/disk/by-uuid/5830e9b3-260b-451c-bfee-2028c64c6199"; fsType = "btrfs"; - options = [ "subvol=@swap" "nodatacow" ]; + options = [ "subvol=@swap" "nodatacow" "noatime" ]; neededForBoot = true; }; diff --git a/home-pc.nix b/home-pc.nix index cba147e..fd4a777 100644 --- a/home-pc.nix +++ b/home-pc.nix @@ -11,7 +11,7 @@ ./desktop ./virtualisation/docker.nix ./services/samba/home-pc.nix - ./services/syncthing/felix-nixos.nix + ./services/syncthing/home-pc.nix ./services/restic/home-pc.nix ./services/pcscd.nix ]; diff --git a/services/syncthing/felix-nixos.nix b/services/syncthing/home-pc.nix similarity index 100% rename from services/syncthing/felix-nixos.nix rename to services/syncthing/home-pc.nix diff --git a/services/syncthing/rpi4.nix b/services/syncthing/rpi4.nix index 81a3272..988edca 100644 --- a/services/syncthing/rpi4.nix +++ b/services/syncthing/rpi4.nix @@ -13,7 +13,7 @@ in { configDir = "/home/felschr/.config/syncthing"; dataDir = "/home/felschr/.local/share/syncthing"; devices = { - felix-nixos = { + home-pc = { id = "S4GZGYU-YN4SRVQ-SXSVWSJ-QYJYNIZ-LECWTJN-YMIUN5U-SNKECTW-BD3KOAB"; }; }; @@ -22,13 +22,13 @@ in { "Default" = { id = "default"; path = "/home/felschr/sync/default"; - devices = [ "felix-nixos" ]; + devices = [ "home-pc" ]; inherit versioning; }; "Backups" = { id = "backups"; path = "/home/felschr/sync/backups"; - devices = [ "felix-nixos" ]; + devices = [ "home-pc" ]; inherit versioning; }; };