From ec562be4b28a4af334b4b2d4073c22d37cc58211 Mon Sep 17 00:00:00 2001
From: meml0rz <meml0rz>
Date: Mon, 9 Dec 2024 20:28:32 +0100
Subject: [PATCH] kekl

---
 configuration.nix           |  2 +-
 flake.nix                   |  1 -
 hardware-configuration.nix  | 52 ++++++++++++++++---------------------
 modules/home.nix            |  2 +-
 modules/nix/bspwm/bspwm.nix |  7 ++++-
 modules/nix/user.nix        |  2 +-
 6 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 5bbe53a..8c88642 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -154,7 +154,7 @@
 
     ])
     ++ (with pkgs-stable; [
-
+      wezterm
     ]);
 
   networking = {
diff --git a/flake.nix b/flake.nix
index c19d693..6442652 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,6 @@
               home-manager.users.fabian = import ./modules/home.nix;
               home-manager.extraSpecialArgs = {
                 inherit nixvim;
-                inherit inputs;
               };
             }
           ];
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 3a31bee..c098d80 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -1,47 +1,39 @@
 # 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"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/0869359e-4c7e-4410-aab0-55bc72a45e0b";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/7C74-E1AE";
-    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-label/ESP";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
   swapDevices = [ ];
+
+  # 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
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/modules/home.nix b/modules/home.nix
index b71bda1..b7898cd 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -3,7 +3,7 @@
   imports = [
     ./nix/user.nix
     ./nix/nvim/default.nix
-    #./nix/hypr/default.nix
+    ./nix/hypr/default.nix
     ./nix/bspwm/default.nix
   ];
 
diff --git a/modules/nix/bspwm/bspwm.nix b/modules/nix/bspwm/bspwm.nix
index 31b3cb3..db56732 100644
--- a/modules/nix/bspwm/bspwm.nix
+++ b/modules/nix/bspwm/bspwm.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  pkgs-stable,
+  ...
+}:
 {
   services = {
     sxhkd = {
diff --git a/modules/nix/user.nix b/modules/nix/user.nix
index a71ceff..2cf4226 100644
--- a/modules/nix/user.nix
+++ b/modules/nix/user.nix
@@ -29,7 +29,7 @@
       ];
       initExtra = ''
         eval "$(fzf --bash)"
-        PS1="\[\e[38;5;216m\]\u\[\e[38;5;220m\]@\[\e[38;5;222m\]\h \[\e[38;5;229m\]\w \[\033[0m\]% "
+        PS1="\w % "
 
       '';
     };