From dc71b603cf1cb7a6a7ed7c06d80d714ee1f3d616 Mon Sep 17 00:00:00 2001
From: vali <valentin@kaas.cc>
Date: Wed, 10 Apr 2024 19:42:28 +0200
Subject: [PATCH] FINALLY working

---
 flake.lock                    | 39 +++++++++++++++++++++++++++++++++++
 flake.nix                     |  5 +++++
 hosts/vali/configuration.nix  |  4 ++--
 hosts/vali/default.nix        |  1 +
 hosts/vali/i3.nix             | 29 ++++++++++++++++++++++++++
 hosts/vali/i3wm.nix           | 29 --------------------------
 hosts/vali/programs.nix       |  3 ++-
 options/common/gpu/nvidia.nix |  2 +-
 options/common/networking.nix |  7 ++++---
 9 files changed, 83 insertions(+), 36 deletions(-)
 delete mode 100644 hosts/vali/i3wm.nix

diff --git a/flake.lock b/flake.lock
index d4890f8..761657f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -65,6 +65,27 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1712730246,
+        "narHash": "sha256-iB8bFj+07RHpmt+XuGGvYQk2Iwm12u6+DklGq/+Tg5s=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "d402ae4a5e5676722290470f61a5e8e3155b5487",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -303,12 +324,30 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "fenix": "fenix",
         "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
         "schizofox": "schizofox"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1712663608,
+        "narHash": "sha256-tN9ZL6kGppmHg84lxlpAlaN+kXWNctKK7Yitq/iXDEw=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "a5feb4f05f09adca661c869b1bf2324898cbaa43",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "schizofox": {
       "inputs": {
         "flake-compat": "flake-compat",
diff --git a/flake.nix b/flake.nix
index 77fa88e..9e56085 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,5 +23,10 @@
                 nixpkgs.follows = "nixpkgs";
             };
         };
+
+        fenix = {
+            url = "github:nix-community/fenix";
+            inputs.nixpkgs.follows = "nixpkgs";
+          };
     };
 }
diff --git a/hosts/vali/configuration.nix b/hosts/vali/configuration.nix
index f01e5cd..f3d3aea 100644
--- a/hosts/vali/configuration.nix
+++ b/hosts/vali/configuration.nix
@@ -40,9 +40,9 @@
       themes = {
           cursor = {
               enable = true;
-              package = pkgs.bibabta.cursors;
+              package = pkgs.bibata-cursors;
               name = "Bibata-Modern-Classic";
-              size = "24";
+              size = 24;
           };
           gtk = {
               enable = true;
diff --git a/hosts/vali/default.nix b/hosts/vali/default.nix
index fc2f103..be36439 100644
--- a/hosts/vali/default.nix
+++ b/hosts/vali/default.nix
@@ -4,5 +4,6 @@ _: {
       ./programs.nix
       ./hardware-configuration.nix
       ./profile.nix
+      ./i3.nix
     ];
 }
diff --git a/hosts/vali/i3.nix b/hosts/vali/i3.nix
index e69de29..90918a6 100644
--- a/hosts/vali/i3.nix
+++ b/hosts/vali/i3.nix
@@ -0,0 +1,29 @@
+{ pkgs, lib, config, ...}:
+
+{
+  options = {
+    i3wm.enable = lib.mkEnableOption "enable i3wm";
+    };
+  config = lib.mkIf config.i3wm.enable {
+    services.xserver = {
+      enable = true;
+      desktopManager = {
+        xterm.enable = false;
+        xfce = {
+          enable = true;
+          noDesktop = true;
+          enableXfwm = false;
+        };
+      };
+      displayManager.defaultSession="xfce+i3";
+      windowManager.i3 = {
+        enable = true;
+        extraPackages = with pkgs; [
+          dmenu
+          i3status
+          i3lock
+        ];
+      };
+    };
+  };
+}
diff --git a/hosts/vali/i3wm.nix b/hosts/vali/i3wm.nix
deleted file mode 100644
index 90918a6..0000000
--- a/hosts/vali/i3wm.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ pkgs, lib, config, ...}:
-
-{
-  options = {
-    i3wm.enable = lib.mkEnableOption "enable i3wm";
-    };
-  config = lib.mkIf config.i3wm.enable {
-    services.xserver = {
-      enable = true;
-      desktopManager = {
-        xterm.enable = false;
-        xfce = {
-          enable = true;
-          noDesktop = true;
-          enableXfwm = false;
-        };
-      };
-      displayManager.defaultSession="xfce+i3";
-      windowManager.i3 = {
-        enable = true;
-        extraPackages = with pkgs; [
-          dmenu
-          i3status
-          i3lock
-        ];
-      };
-    };
-  };
-}
diff --git a/hosts/vali/programs.nix b/hosts/vali/programs.nix
index 0a87ffc..c6fb0e2 100644
--- a/hosts/vali/programs.nix
+++ b/hosts/vali/programs.nix
@@ -1,9 +1,10 @@
 { config, inputs, pkgs, ... }:
 let
-  username = config.myOptions.other.system.usermame;
+  username = config.myOptions.other.system.username;
 in {
     home-manager.users.${username} = {
         home.packages = let
+          fenix = inputs.fenix.packages.${pkgs.system};
 
         in with pkgs; [
             pfetch
diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix
index c17e851..f94ff0d 100644
--- a/options/common/gpu/nvidia.nix
+++ b/options/common/gpu/nvidia.nix
@@ -12,7 +12,7 @@
     powerManagement.enable = false;
     powerManagement.finegrained = false;
     nvidiaSettings = false;
-    package = config.boot.kernel.kernelPackages.nvidiaPackages.beta;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 }
 
diff --git a/options/common/networking.nix b/options/common/networking.nix
index 1796f20..9023909 100644
--- a/options/common/networking.nix
+++ b/options/common/networking.nix
@@ -1,6 +1,7 @@
 { config, lib, ... }:
-
-{
+let 
+  username = config.myOptions.other.system.username;
+in {
 networking = {
     networkmanager = {
         enable = true;
@@ -11,5 +12,5 @@ networking = {
       enable = true;
       fallbackDns = ["9.9.9.9"];
   };
-  users.users.config.myOptions.other.system.username.extraGroups = [ "networkmanager" ];
+  users.users.${username}.extraGroups = [ "networkmanager" ];
 }