From 4e8eacce3724b4e4f39bad36c39ec213dacd4be6 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felixalbrigtsen@gmail.com>
Date: Fri, 26 May 2023 13:48:43 +0200
Subject: [PATCH] Cleanup redshirt

---
 flake.nix                                 |  4 +++-
 hosts/redshirt/configuration.nix          | 18 ++++++++++--------
 hosts/redshirt/hardware-configuration.nix | 11 +++++++----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 30583c8..536b53b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,9 @@
             inherit inputs;
           };
           modules = [
-            ./hosts/chapel/configuration.nix
+            ./hosts/redshirt/configuration.nix
+            ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+            sops-nix.nixosModules.sops
           ];
         };
       };
diff --git a/hosts/redshirt/configuration.nix b/hosts/redshirt/configuration.nix
index 6bcf9e5..efc10c8 100644
--- a/hosts/redshirt/configuration.nix
+++ b/hosts/redshirt/configuration.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   imports =
     [
@@ -29,14 +28,14 @@
   };
 
   # The NixOS module enables critical components needed to run Hyprland properly, such as: polkit, xdg-desktop-portal-hyprland, graphics drivers, fonts, dconf, xwayland, and adding a proper Desktop Entry to your Display Manager.
-  programs.hyprland = {
-    enable = true;
-    package = pkgs.unstable.hyprland;
-  };
+  #programs.hyprland = {
+  #  enable = true;
+  #  package = pkgs.unstable.hyprland;
+  #};
 
   services.xserver.displayManager = {
     lightdm.enable = true;
-    defaultSession = "hyprland";
+    #defaultSession = "hyprland";
   };
 
   # Configure keymap in X11
@@ -57,12 +56,15 @@
   };
 
   users.users.felixalb = {
-    extraGroups = [ "networkmanager" ]; 
-    shell = pkgs.zsh;
+    extraGroups = [ "networkmanager" ];
   };
 
   environment.systemPackages = with pkgs; [
     zsh
+    neovim
+    git
+    ripgrep
+    rsync
     cifs-utils
   ];
 
diff --git a/hosts/redshirt/hardware-configuration.nix b/hosts/redshirt/hardware-configuration.nix
index fc98b1b..3ead3f9 100644
--- a/hosts/redshirt/hardware-configuration.nix
+++ b/hosts/redshirt/hardware-configuration.nix
@@ -14,16 +14,18 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/1446d565-a448-471f-bb7d-2fa519492573";
-      fsType = "ext4";
+    { device = "/dev/disk/by-uuid/0d709ab3-0d10-46eb-9e4f-10a320af703e";
+      fsType = "btrfs";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/678A-B7E8";
+    { device = "/dev/disk/by-uuid/6EE9-1C06";
       fsType = "vfat";
     };
 
-  swapDevices = [ ];
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/2067bbb4-b4fa-4326-9f58-4018857058a7"; }
+    ];
 
   # 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
@@ -33,6 +35,7 @@
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
 
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }