From 723b4c519e0a7003637234e4876e1a083dc97cb1 Mon Sep 17 00:00:00 2001
From: cydiralis <cydiralis@proton.me>
Date: Fri, 27 Jun 2025 19:16:27 +0100
Subject: [PATCH] brings back umbriel, adds isbritish for british keyboarded
 machines, and removes firefox in favour of librewolf. librewolf being the
 browser that was in use that i somehow managed to remove, and keep only
 firefox in. i can be stupid at times

---
 base/umbriel/configuration.nix          |  8 +++++++-
 base/umbriel/default.nix                |  1 +
 base/umbriel/hardware-configuration.nix |  6 +++---
 flake.nix                               | 16 ++++++++--------
 home/niri.nix                           |  2 +-
 home/packages.nix                       |  2 +-
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/base/umbriel/configuration.nix b/base/umbriel/configuration.nix
index 6ae01a4..cbafb98 100644
--- a/base/umbriel/configuration.nix
+++ b/base/umbriel/configuration.nix
@@ -39,7 +39,12 @@
   };
 
   boot.supportedFilesystems = ["exfat" "ntfs" "xfs"];
-  boot.loader.systemd-boot.enable = true;
+  boot.loader.limine.enable = true;
+  boot.loader.limine.style.wallpapers = [];
+  boot.loader.limine.additionalFiles = {
+    "efi/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";
+    "efi/shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi";
+  };
   boot.loader.efi.canTouchEfiVariables = true;
   boot.initrd.systemd.enable = true;
   boot.loader.efi.efiSysMountPoint = "/boot/";
@@ -193,6 +198,7 @@
     wget
     neovim
     cbfstool
+    xwayland-satellite
     git
     keepassxc
     pulseaudio
diff --git a/base/umbriel/default.nix b/base/umbriel/default.nix
index 54a1411..e8ba5f1 100644
--- a/base/umbriel/default.nix
+++ b/base/umbriel/default.nix
@@ -5,5 +5,6 @@
     ../ssh.nix
     ../substituters.nix
     ../fonts.nix
+    ../greetd.nix
   ];
 }
diff --git a/base/umbriel/hardware-configuration.nix b/base/umbriel/hardware-configuration.nix
index 4a4b5fa..f2d4d12 100644
--- a/base/umbriel/hardware-configuration.nix
+++ b/base/umbriel/hardware-configuration.nix
@@ -14,18 +14,18 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/a9d406d6-c188-4a65-91f7-ead5fd091e19";
+    { device = "/dev/disk/by-uuid/c1583ec8-704e-47b4-bba0-5d3534662962";
       fsType = "xfs";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/5216-71E6";
+    { device = "/dev/disk/by-uuid/7598-14E1";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/852efacc-eea6-4d3b-af82-b43e30a7d1c4"; }
+    [ { device = "/dev/disk/by-uuid/ebeb8bb4-7df9-4674-bcff-b81cc8b824e2"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/flake.nix b/flake.nix
index c4f0c40..ee5b655 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
             inherit inputs;
             vars = {
               isNixOS = true;
-              isTough = false;
+              isBritish = true;
               useSyncthing = false;
               class = "desktop";
               user = "alyx";
@@ -51,7 +51,7 @@
             inherit inputs;
             vars = {
               isNixOS = true;
-              isTough = false;
+              isBritish = false;
               class = "lowspec";
               user = "maya";
               useSyncthing = true;
@@ -73,7 +73,7 @@
             inherit inputs;
             vars = {
               isNixOS = true;
-	      isTough = false;
+	      isBritish = false;
               class = "desktop";
               user = "maya";
               useSyncthing = true;
@@ -94,7 +94,7 @@
             inherit inputs;
             vars = {
               isNixOS = true;
-              isTough = false;
+              isBritish = false;
               class = "desktop";
               user = "maya";
               useSyncthing = true;
@@ -117,7 +117,7 @@
             inherit inputs;
             vars = {
               isNixOS = true;
-              isTough = true;
+              isBritish = false;
               useSyncthing = false;
               class = "laptop";
               user = "alyx"; #cursed way of setting username
@@ -138,7 +138,7 @@
             inherit inputs;
             vars = {
               isNixOS = true;
-              isTough = true;
+              isBritish = false;
               class = "lowspec";
               user = "maya";
               useSyncthing = true;
@@ -163,7 +163,7 @@
             inherit inputs;
             vars = {
               isNixOS = true;
-              isTough = false;
+              isBritish = false;
               useSyncthing = false;
               class = "handheld";
               user = "alyx"; #cursed way of setting username
@@ -186,7 +186,7 @@
             inherit inputs;
             vars = {
               isNixOS = true;
-              isTough = false;
+              isBritish = false;
               useSyncthing = false;
               class = "laptop";
               user = "alyx"; #cursed way of setting username
diff --git a/home/niri.nix b/home/niri.nix
index 198e7ba..0b05117 100644
--- a/home/niri.nix
+++ b/home/niri.nix
@@ -29,7 +29,7 @@
         accel-profile = "flat";
       };
       prefer-no-csd = true;
-      input.keyboard.xkb.layout = (if vars.user == "alyx" && !vars.isTough then "gb" else "us");
+      input.keyboard.xkb.layout = (if vars.user == "alyx" && vars.isBritish then "gb" else "us");
       input.focus-follows-mouse.enable = true;
       binds = with config.lib.niri.actions; lib.mkDefault {
         "Mod+Return".action = spawn "foot";
diff --git a/home/packages.nix b/home/packages.nix
index a1ee4a2..aa853d4 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -7,7 +7,7 @@
     comma
     emacs
     fastfetch
-    firefox
+    librewolf
     fzf
     gamescope
     grayjay