From 59777d1c93d01bd59be93799bbc21cb3c6f2ca26 Mon Sep 17 00:00:00 2001 From: Roy Dumblauskas Date: Sat, 7 Jun 2025 15:31:09 -0500 Subject: [PATCH] additional configuration --- configuration.nix | 8 +++++++- flake.nix | 6 +++--- hardware-configuration.nix | 21 +++++++++++++++++++++ home.nix | 6 +++--- 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 1d402ad..b5743a1 100755 --- a/configuration.nix +++ b/configuration.nix @@ -14,10 +14,16 @@ efiSupport = true; efiInstallAsRemovable = true; mirroredBoots = [ - { devices = [ "nodev" ]; path = "/boot"; } + { + devices = [ "nodev" ]; + path = "/boot"; + } ]; }; + # needed to allowOther in home.nix + programs.fuse.userAllowOther = true; + networking.hostName = "nixos"; networking.hostId = "4cb9fc76"; diff --git a/flake.nix b/flake.nix index 88fe231..a300775 100755 --- a/flake.nix +++ b/flake.nix @@ -25,8 +25,8 @@ modules = [ ./configuration.nix ./hardware-configuration.nix - impermanence.nixosModules.impermanence - sops-nix.nixosModules.sops + impermanence.nixosModules.impermanence + sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -34,7 +34,7 @@ imports = [ ./home.nix nixvim.homeManagerModules.nixvim - impermanence.homeManagerModules.impermanence + impermanence.homeManagerModules.impermanence ]; }; } diff --git a/hardware-configuration.nix b/hardware-configuration.nix index f62b7f2..8d312c6 100755 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -13,6 +13,27 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + fileSystems."/" = + { device = "zroot/root"; + fsType = "zfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2755-9134"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + fileSystems."/nix" = + { device = "zroot/nix"; + fsType = "zfs"; + }; + + fileSystems."/persist" = + { device = "zroot/persist"; + fsType = "zfs"; + }; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/home.nix b/home.nix index 0d1b251..4037910 100755 --- a/home.nix +++ b/home.nix @@ -32,12 +32,12 @@ # user program config files home.file = { - "hypr".source = ./roy-config/hypr; - "waybar".source = ./roy-config/waybar; + ".config/hypr".source = ./roy-config/hypr; + ".config/waybar".source = ./roy-config/waybar; }; # user persisted dirs - home.persistence."/persist/home" = { + home.persistence."/persist/home/roy" = { directories = [ ".ssh" "rp"