Adding desktop config

2024-11-29 11:11:46 +00:00
parent c48c55275b
commit c5303302f4
7 changed files with 176 additions and 111 deletions
@@ -70,11 +70,11 @@
    },
    "catppuccin": {
      "locked": {
-        "lastModified": 1730458408,
-        "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=",
+        "lastModified": 1732838231,
+        "narHash": "sha256-KJTRqfEcGpONBK/6BkMdWmbGth0r/nYWY3k/rvZl4es=",
        "owner": "catppuccin",
        "repo": "nix",
-        "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad",
+        "rev": "becc64812c8d6af24dedc2f75c5c63ebf778a115",
        "type": "github"
      },
      "original": {
@@ -111,11 +111,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1730635639,
-        "narHash": "sha256-B3PP5BGzu1PVb2e978uXj+7gWRJMHUAE5eUXxyHTxHQ=",
+        "lastModified": 1732852996,
+        "narHash": "sha256-0LD4nyz/Z2bDNjVj6p8O85uGtOmDCC9PdX5hh8Z3rSM=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "178c79df993216cc9be02630d6cf42868b29f9c2",
+        "rev": "0c855b6e0c58aef81f66c52f987f4c5ce8d48af0",
        "type": "gitlab"
      },
      "original": {
@@ -128,11 +128,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1732722421,
+        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
        "type": "github"
      },
      "original": {
@@ -179,11 +179,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727826117,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
        "type": "github"
      },
      "original": {
@@ -269,11 +269,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@@ -316,11 +316,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729104314,
-        "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
+        "lastModified": 1732021966,
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
        "type": "github"
      },
      "original": {
@@ -346,11 +346,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730302582,
-        "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
+        "lastModified": 1732021966,
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
        "type": "github"
      },
      "original": {
@@ -405,11 +405,11 @@
    },
    "hardware": {
      "locked": {
-        "lastModified": 1730537918,
-        "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
+        "lastModified": 1732483221,
+        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
+        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
        "type": "github"
      },
      "original": {
@@ -428,11 +428,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724947644,
-        "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=",
+        "lastModified": 1730903510,
+        "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=",
        "owner": "hercules-ci",
        "repo": "hercules-ci-effects",
-        "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef",
+        "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141",
        "type": "github"
      },
      "original": {
@@ -448,11 +448,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730633670,
-        "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
+        "lastModified": 1732793095,
+        "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
+        "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3",
        "type": "github"
      },
      "original": {
@@ -469,11 +469,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730490306,
-        "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
+        "lastModified": 1732482255,
+        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1743615b61c7285976f85b303a36cdf88a556503",
+        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
        "type": "github"
      },
      "original": {
@@ -623,11 +623,11 @@
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1730628553,
-        "narHash": "sha256-yfPRDXpOjqXic7sPHkB3eW0HcsIsPhiZ+BIPFvt4JQs=",
+        "lastModified": 1732776432,
+        "narHash": "sha256-WuE4suVoWL5asL0HrW+vbMbONb1WeCBRZv8SDiTtz/I=",
        "owner": "Jas-SinghFSU",
        "repo": "HyprPanel",
-        "rev": "9287e1d6a40d5aaa7ae0a8f38623327241f03e6f",
+        "rev": "56c94166446c2cf8546f1e7f642ea0306c468e3a",
        "type": "github"
      },
      "original": {
@@ -700,16 +700,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1729544999,
-        "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=",
+        "lastModified": 1729958008,
+        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
        "owner": "NuschtOS",
        "repo": "ixx",
-        "rev": "65c207c92befec93e22086da9456d3906a4e999c",
+        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
        "type": "github"
      },
      "original": {
        "owner": "NuschtOS",
-        "ref": "v0.0.5",
+        "ref": "v0.0.6",
        "repo": "ixx",
        "type": "github"
      }
@@ -724,11 +724,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1730088025,
-        "narHash": "sha256-FIdIaN7f6karwtDV65VXTV8VThNrR63nwykfgXpm4p4=",
+        "lastModified": 1732864781,
+        "narHash": "sha256-EZTMM8MqMw4a/gVfg0T69uAh76KMRdj/0vOhEoqVZXc=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "f35afbe60a4ff71fd65fec3839fc38943f961951",
+        "rev": "3bb3b28e072e0e1995ae67b76d70e475c9599b90",
        "type": "github"
      },
      "original": {
@@ -740,11 +740,11 @@
    "neovim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1729121305,
-        "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=",
+        "lastModified": 1732810107,
+        "narHash": "sha256-7/pNOWesVpmFFM8o1aNqALBJ8NgodPZAe4gkOnFWS7E=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921",
+        "rev": "146b8300a145efa64e579527da8606546a36162b",
        "type": "github"
      },
      "original": {
@@ -780,11 +780,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730448474,
-        "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=",
+        "lastModified": 1732603785,
+        "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e",
+        "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
        "type": "github"
      },
      "original": {
@@ -872,11 +872,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1729880355,
-        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
+        "lastModified": 1731676054,
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
        "type": "github"
      },
      "original": {
@@ -888,11 +888,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1728863046,
-        "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=",
+        "lastModified": 1732617236,
+        "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732",
+        "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
        "type": "github"
      },
      "original": {
@@ -904,11 +904,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1730531603,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
+        "lastModified": 1732521221,
+        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
+        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
        "type": "github"
      },
      "original": {
@@ -920,11 +920,11 @@
    },
    "nixpkgs_8": {
      "locked": {
-        "lastModified": 1730200266,
-        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "lastModified": 1732521221,
+        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
        "type": "github"
      },
      "original": {
@@ -963,11 +963,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1730569492,
-        "narHash": "sha256-NByr7l7JetL9kIrdCOcRqBu+lAkruYXETp1DMiDHNQs=",
+        "lastModified": 1732838896,
+        "narHash": "sha256-9YfEyCU2wB/aSbtpZ+OHb++xS2Km970Ja33H13oEaWM=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "6f210158b03b01a1fd44bf3968165e6da80635ce",
+        "rev": "05331006a42846d6e55129b642485f45f90c9efc",
        "type": "github"
      },
      "original": {
@@ -986,11 +986,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730515563,
-        "narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=",
+        "lastModified": 1731936508,
+        "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e",
+        "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
        "type": "github"
      },
      "original": {
@@ -1002,11 +1002,11 @@
    "nvchad-starter": {
      "flake": false,
      "locked": {
-        "lastModified": 1731410731,
-        "narHash": "sha256-g9rA4Sd6vXCPf0nMimq0eqSYbEy8suKbtJ7HwRBt2zQ=",
+        "lastModified": 1732833034,
+        "narHash": "sha256-kr/5YUzFHKUHZbCFDaYY1pW1yL30pKdWsc/ekAJGFco=",
        "owner": "naps62",
        "repo": "nvchad-starter",
-        "rev": "0c20f410afc8a2156488a7c7ae73a242bfa7e106",
+        "rev": "3a761f738c9437725b117fc644673057e37ef6e3",
        "type": "github"
      },
      "original": {
@@ -1025,11 +1025,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730543154,
-        "narHash": "sha256-r12a4K6sZaTcmj4cu+ClDern7JMP/k/O82ZBCrgfXog=",
+        "lastModified": 1732768408,
+        "narHash": "sha256-Eep/vmKujXy7lopSdisDjGXOesxWLqF/euRkPBpaHtc=",
        "owner": "nix-community",
        "repo": "nix4nvchad",
-        "rev": "9d7eabd828eb01d9bb0968a5b901683a5da4a3ff",
+        "rev": "877ba899e2a88872171340660fa2abe075b21a0e",
        "type": "github"
      },
      "original": {
@@ -1191,11 +1191,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730321837,
-        "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
+        "lastModified": 1732643199,
+        "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
+        "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c",
        "type": "github"
      },
      "original": {
@@ -1227,11 +1227,11 @@
        "systems": "systems_7"
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@@ -31,9 +31,9 @@ in
          new_optimizations = "on";
        };

-        drop_shadow = "yes";
-        shadow_range = 2;
-        shadow_render_power = 1;
+        shadow = {
+          enabled = false;
+        };
      };

      input = {
@@ -54,14 +54,20 @@ in
      };

      general = {
-        gaps_in = 2;
+        border_size = 0;
+        gaps_in = 0;
        gaps_out = 0;
      };

-      monitor = [
-        "eDP-1, 1920x1080, 0x0, 1"
-        "DP-1, 1920x1080, auto, 1, mirror, eDP-1"
-      ];
+      misc = {
+        disable_hyprland_logo = true;
+        disable_splash_rendering = true;
+        force_default_wallpaper = 0;
+      };
+
+      xwayland = {
+        force_zero_scaling = true;
+      };

      animations = {
        bezier = "easeOutQuad, 0.5, 1, 0.89, 1";
@@ -79,14 +85,15 @@ in

      dwindle = {
        preserve_split = "yes";
-        no_gaps_when_only = true;
      };
+
      master = {
        orientation = "center";
-        no_gaps_when_only = true;
      };

      env = [
+        "GDK_SCALE, 2"
+        "XCURSOR_SIZE, 32"
        "HYPRCURSOR_THEME, rose-pine-hyprcursor"
        "HYPRCURSOR_SIZE, 24"
      ];
@@ -180,4 +187,12 @@ in
      ];
    };
  };
+
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      ipc = "off";
+      splash = false;
+    };
+  };
 }
@@ -1,9 +1,11 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
  programs.kitty = {
    enable = true;
    settings = {
      confirm_os_window_close = 0;
      enable_audio_bell = false;
+      cursor_trail = 1;

      enabled_layouts = "tall, grid, fat, splits";

@@ -18,8 +20,7 @@
      tab_bar_edge = "bottom";
      tab_bar_style = "powerline";
      tab_powerline_style = "slanted";
-      tab_title_template =
-        "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}";
+      tab_title_template = "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}";

      # keys
      kitty_mod = "alt";
@@ -93,6 +93,7 @@
    procs
    eza
    asdf-vm
+    fd
  ];

  home.sessionPath = [
@@ -21,6 +21,7 @@
    ../common/features/colorscheme.nix
    ../common/features/xdg.nix
    ../common/features/bluetooth.nix
+    ./wallpaper.nix
  ];

  home.sessionVariables = {
@@ -31,7 +32,6 @@
  };

  wayland.windowManager.hyprland.settings = {
-    monitor = [ "eDP-1, preferred, 0x1080, 1, bitdepth, 8" ];
    windowrulev2 = [
      "float, class:thunar"
      "move cursor -50% -50%, class:thunar"
@@ -0,0 +1,30 @@
+{
+  inputs,
+  pkgs,
+  config,
+}:
+let
+  wallpaper1 = pkgs.fetchurl {
+    url = "https://i.redd.it/mvev8aelh7zc1.png";
+    hash = "sha256-lJjIq+3140a5OkNy/FAEOCoCcvQqOi73GWJGwR2zT9w";
+  };
+in
+{
+  wayland.windowManager.hyprland.settings = {
+    monitor = [
+      "DP-1, preferred, 0x0, auto, bitdepth, 8"
+      "HDMI-A-1, preferred, 2560x0, auto, bitdepth, 8"
+    ];
+    workspace = [
+      "1, monitor=HDMI-A-1"
+      "2, monitor=DP-1"
+      "3, monitor=DP-1"
+      "4, monitor=DP-1"
+    ];
+  };
+
+  services.hyprpaper.settings.wallpapers = [
+    "DP-1, ${builtins.toString wallpaper1}"
+    "HDMI-A-1, ${builtins.toString wallpaper1}"
+  ];
+}
@@ -1,34 +1,52 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];

-  boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "thunderbolt" ];
+  boot.initrd.availableKernelModules = [
+    "vmd"
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "thunderbolt"
+  ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-intel" ];
  boot.extraModulePackages = [ ];

-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c8b56d56-3482-48d4-a8dd-825c4c2cf10e";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/c8b56d56-3482-48d4-a8dd-825c4c2cf10e";
+    fsType = "ext4";
+  };

-  boot.initrd.luks.devices."luks-51347cdc-de81-4132-b21c-f1d089e387eb".device = "/dev/disk/by-uuid/51347cdc-de81-4132-b21c-f1d089e387eb";
+  boot.initrd.luks.devices = {
+    "luks-51347cdc-de81-4132-b21c-f1d089e387eb".device = "/dev/disk/by-uuid/51347cdc-de81-4132-b21c-f1d089e387eb";
+    "luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a".device = "/dev/disk/by-uuid/9ffb64c6-54c2-46f2-9df5-e42c33a52d1a";
+  };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/D86A-A762";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/d102468f-46c6-4eeb-bd8c-1f9f049d1feb"; }
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/D86A-A762";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
    ];
+  };
+
+  swapDevices = [
+    { device = "/dev/mapper/luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a"; }
+  ];

  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's