diff options
| -rw-r--r-- | common.nix | 4 | ||||
| -rw-r--r-- | home-modules/apps/desktop/default.nix | 2 | ||||
| -rw-r--r-- | home-modules/apps/nvim/default.nix | 1 | ||||
| -rw-r--r-- | hosts/apocalypse/hardware-configuration.nix | 25 |
4 files changed, 24 insertions, 8 deletions
@@ -3,9 +3,13 @@ ./modules ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; nixpkgs = { config = { + permittedInsecurePackages = [ + "olm-3.2.16" + ]; allowUnfree = true; }; }; diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix index 5eb14f3..58d32e2 100644 --- a/home-modules/apps/desktop/default.nix +++ b/home-modules/apps/desktop/default.nix @@ -21,6 +21,8 @@ in accent = "pink"; variant = "mocha"; }) + + nheko ]; }) (lib.mkIf cfg.email.enable { diff --git a/home-modules/apps/nvim/default.nix b/home-modules/apps/nvim/default.nix index d1641f3..58a7dda 100644 --- a/home-modules/apps/nvim/default.nix +++ b/home-modules/apps/nvim/default.nix @@ -55,6 +55,7 @@ in { texlive.combined.scheme-medium texlab mermaid-cli + ltex-ls deno ] ++ [ ts_ls vue_ls]; diff --git a/hosts/apocalypse/hardware-configuration.nix b/hosts/apocalypse/hardware-configuration.nix index 7470331..2e5d049 100644 --- a/hosts/apocalypse/hardware-configuration.nix +++ b/hosts/apocalypse/hardware-configuration.nix @@ -25,8 +25,9 @@ menuentry 'UEFI Firmware' $menuentry_id_option 'uefi-firmware' { ''; boot.initrd.luks.devices = { - "cryptroot".device = "/dev/disk/by-uuid/d2c3c197-3d75-4da2-a098-207030a91b62"; - "cryptswap".device = "/dev/disk/by-uuid/fd6a5644-a33c-40af-ae48-42db1a5997ac"; + "cryptroot".device = "/dev/disk/by-uuid/d2c3c197-3d75-4da2-a098-207030a91b62"; + "cryptswap".device = "/dev/disk/by-uuid/fd6a5644-a33c-40af-ae48-42db1a5997ac"; + "cryptstore".device = "/dev/disk/by-uuid/b5fb2feb-cbec-4c16-8efe-c08a3cbe05c5"; }; fileSystems."/" = @@ -41,24 +42,32 @@ menuentry 'UEFI Firmware' $menuentry_id_option 'uefi-firmware' { options = [ "subvolid=5" "compress=zstd"]; }; - fileSystems."/snapshots" = { device = "/dev/mapper/cryptroot"; fsType = "btrfs"; options = [ "subvol=@snapshots" "compress=zstd" ]; }; + # TODO: Mount efi and boot separately fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6E1A-07F4"; + { + device = "/dev/disk/by-uuid/6E1A-07F4"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; - }; + }; fileSystems."/store2" = - { device = "/dev/disk/by-uuid/5368282f-c09d-44cf-9cf2-e69a2d415da6"; + { + device = "/dev/mapper/cryptstore"; fsType = "btrfs"; - options = [ "noatime" "compress=zstd" "subvol=/"]; - }; + options = [ "noatime" "compress=zstd" "subvol=store"]; + }; + + fileSystems."/store2/.snapshots" = { + device = "/dev/mapper/cryptstore"; + fsType = "btrfs"; + options = [ "noatime" "compress=zstd" "subvol=store"]; + }; # fileSystems."/store1" = # { device = "/dev/disk/by-uuid/6A2E2BFF2E2BC2C5"; # fsType = "ntfs-3g" ; |