2 files changed, 37 insertions, 79 deletions

diff --git a/hosts/niuwux/default.nix b/hosts/niuwux/default.nix
index 44674dd..265769e 100644
--- a/hosts/niuwux/default.nix
+++ b/hosts/niuwux/default.nix
@@ -31,8 +31,6 @@
   beeMods = {
     windowManagers = {
       mango.enable = true;
-      hyprland.enable = false;
-      dwm.enable = false;
     };
   };
 
@@ -80,7 +78,7 @@
 
   users.users.${user} = {
     isNormalUser = true;
-    shell = pkgs.fish;
+    shell = pkgs.bash;
     extraGroups = [
       "networkmanager"
       "wheel"
@@ -88,7 +86,9 @@
     ];
   };
 
-  environment.sessionVariables = { };
+  environment.sessionVariables = {
+    EDITOR = "nvim";
+  };
 
   networking.hostName = hostname;
   networking.firewall.allowedTCPPorts = [ ];
@@ -101,14 +101,13 @@
     pciutils
     direnv
     # mangohud
-    neovim
   ];
 
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware = {
     graphics = {
       enable = true;
-      enable32Bit = config.programs.steam.enable;
+      enable32Bit = false;
       extraPackages = with pkgs; [
         libvdpau-va-gl
         nvidia-vaapi-driver
@@ -118,7 +117,7 @@
     nvidia = {
       modesetting.enable = true;
       powerManagement.enable = true;
-      powerManagement.finegrained = true;
+      powerManagement.finegrained = false;
       open = true;
       nvidiaSettings = false;
 
diff --git a/hosts/niuwux/hardware-configuration.nix b/hosts/niuwux/hardware-configuration.nix
index 96c39c3..4c20a84 100644
--- a/hosts/niuwux/hardware-configuration.nix
+++ b/hosts/niuwux/hardware-configuration.nix
@@ -1,90 +1,49 @@
 # 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 = [
-    "nvme"
-    "xhci_pci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc";
-    fsType = "btrfs";
-    options = [
-      "subvol=@"
-      "compress=zstd"
-      "noatime"
-      "discard=async"
-      "space_cache=v2"
-    ];
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
+      fsType = "btrfs";
+      options = [ "subvol=@" "noatime" "space_cache=v2" "nodiscard" "ssd" "compress=zstd:3" ];
+    };
 
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc";
-    fsType = "btrfs";
-    options = [
-      "subvol=@home"
-      "compress=zstd"
-      "noatime"
-      "discard=async"
-      "space_cache=v2"
-    ];
-  };
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
+      fsType = "btrfs";
+      options = [ "subvol=@home" "noatime" "space_cache=v2" "nodiscard" "ssd" "compress=zstd:3" ];
+    };
 
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc";
-    fsType = "btrfs";
-    options = [
-      "subvol=@nix"
-      "compress=zstd"
-      "noatime"
-      "discard=async"
-      "space_cache=v2"
-    ];
-  };
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
+      fsType = "btrfs";
+      options = [ "subvol=@nix" "noatime" "space_cache=v2" "nodiscard" "ssd" "compress=zstd:3" ];
+    };
 
-  fileSystems."/var/log" = {
-    device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc";
-    fsType = "btrfs";
-    options = [
-      "subvol=@log"
-      "compress=zstd"
-      "noatime"
-      "discard=async"
-      "space_cache=v2"
-    ];
-  };
+  fileSystems."/var" =
+    { device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
+      fsType = "btrfs";
+      options = [ "subvol=@var" "noatime" "space_cache=v2" "nodiscard" "ssd" "compress=zstd:3" ];
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/DD2D-BC85";
-    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/59FA-D495";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/247afe44-bbc1-4931-bf26-29a540e9d7df"; }
-  ];
+  swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;