diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 308cdf6..454fcc6 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -21,7 +21,7 @@ modules = { system = { - impermanence.enable = true; + impermanence.enable = false; hardware = { nvidia.enable = true; bluetooth = { diff --git a/hosts/hermit/filesystem/default.nix b/hosts/hermit/filesystem/default.nix index 39e4a76..82b20e8 100644 --- a/hosts/hermit/filesystem/default.nix +++ b/hosts/hermit/filesystem/default.nix @@ -1,45 +1,33 @@ { config = { - boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/70952ef8-1d73-49ae-bd86-b7614f01fa86"; + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/10318654-ed20-43f6-885d-35366a427581"; fileSystems = { "/boot" = { - device = "/dev/disk/by-uuid/466A-F45E"; + device = "/dev/disk/by-uuid/5D7D-FC52"; fsType = "vfat"; }; - # root on tmpfs + "/" = { - device = "none"; - fsType = "tmpfs"; - options = ["defaults" "size=25%" "mode=755"]; + device = "/dev/disk/by-uuid/e353013b-8ac7-40ed-80f2-ddbea21b8d5e"; + fsType = "btrfs"; + options = ["compress=zstd" "noatime"]; }; "/nix" = { - device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5"; + device = "/dev/disk/by-uuid/e353013b-8ac7-40ed-80f2-ddbea21b8d5e"; fsType = "btrfs"; options = ["subvol=nix" "compress=zstd" "noatime"]; }; - "/persist" = { - device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5"; - neededForBoot = true; - fsType = "btrfs"; - options = ["subvol=persist" "compress=zstd" "noatime"]; - }; "/home" = { - device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5"; + device = "/dev/disk/by-uuid/e353013b-8ac7-40ed-80f2-ddbea21b8d5e"; fsType = "btrfs"; options = ["subvol=home" "compress=zstd" "noatime"]; }; - "/swap" = { - device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5"; - fsType = "btrfs"; - - options = ["subvol=swap" "compress=lzo" "noatime"]; - }; }; - swapDevices = [ - { - device = "/swap/swapfile"; - size = (1024 * 16) + (1024 * 2); - } - ]; + # swapDevices = [ + # { + # device = "/swap/swapfile"; + # size = (1024 * 16) + (1024 * 2); + # } + # ]; }; } diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index c91d567..6ebb6ef 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -55,7 +55,7 @@ polkit python3 ripgrep - signal-desktop-beta + signal-desktop smartmontools taskwarrior3 taskwarrior-tui diff --git a/modules/other/users.nix b/modules/other/users.nix index 6c6bd95..57d6960 100644 --- a/modules/other/users.nix +++ b/modules/other/users.nix @@ -7,7 +7,7 @@ inherit (config.meta.mainUser) username; in { users = { - mutableUsers = false; + mutableUsers = true; users = { ${username} = { isNormalUser = true; diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 2c7fbe8..27565f7 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -16,8 +16,8 @@ title = "foot"; locked-title = "no"; - font = "Iosevka Custom:size=14"; - font-bold = "Iosevka Custom:size=14"; + # font = "Iosevka Custom:size=14"; + # font-bold = "Iosevka Custom:size=14"; line-height = 20; letter-spacing = 0; diff --git a/modules/style/fonts.nix b/modules/style/fonts.nix index ae02227..27c0cb0 100644 --- a/modules/style/fonts.nix +++ b/modules/style/fonts.nix @@ -48,7 +48,7 @@ in { }; }; packages = with pkgs; [ - custom-iosevka + # custom-iosevka material-icons material-design-icons papirus-icon-theme diff --git a/modules/system/os/impermanence/module.nix b/modules/system/os/impermanence/module.nix index e08b29b..acd8f4e 100644 --- a/modules/system/os/impermanence/module.nix +++ b/modules/system/os/impermanence/module.nix @@ -14,7 +14,7 @@ in { ]; config = mkIf cfg.enable { users = { - mutableUsers = false; + mutableUsers = true; users = { cr = { hashedPasswordFile = "/persist/passwords/cr";