Merge remote-tracking branch 'origin/nixos' into nixos

nixos/home-manager/packages/default.nix

@@ -33,6 +33,12 @@
   programs.git = {
     enable = true;
     userName = "Evie Litherland-Smith";
+    delta.enable = true;
+    extraConfig = {
+      pull = {
+        rebase = false;
+      };
+    };
   };
   programs.starship = {
     enable = true;

nixos/home-manager/packages/tui/default.nix

@@ -10,5 +10,6 @@
     (nerdfonts.override { fonts = [ "FiraCode" ]; })
     file
     silver-searcher
+    bat
   ];
 }

nixos/vanguard-xenia.nix

@@ -37,8 +37,12 @@
   # Set up home manager for user
   home-manager.users.xenia = import ./home-manager/vanguard-xenia.nix;
 
+  # Extra hardware configuration
   # For Steam support
   hardware.opengl.driSupport32Bit = true;
-
   hardware.bluetooth.enable = true;
+  hardware.openrazer = {
+    enable = true;
+    users = [ "xenia" ];
+  };
 }