refactor: nixvim

FredeHoey · Feb 2, 2025 · 8b4363c · 8b4363c
1 parent a6e5b08
commit 8b4363c
Show file tree

Hide file tree

Showing 9 changed files with 690 additions and 79 deletions.
diff --git a/common/base.nix b/common/base.nix
@@ -3,7 +3,10 @@
   imports = [ inputs.home-manager.nixosModules.default ];
 
   home-manager = {
-    extraSpecialArgs = { inherit inputs; };
+    extraSpecialArgs = { 
+      inherit pkgs;
+      inherit (inputs) nixvim stylix;
+    };
     users = { "bun" = import ../users/bun.nix; };
   };
 

diff --git a/common/desktop.nix b/common/desktop.nix
@@ -1,43 +1,9 @@
-{ pkgs, inputs, ... }: {
+{ pkgs, ... }: {
 
-  imports = [ ../modules/sway.nix inputs.stylix.nixosModules.stylix ];
+  imports = [ ../modules/sway.nix ];
 
   fonts.packages = [ pkgs.nerd-fonts.iosevka ];
 
-  stylix = {
-    enable = true;
-    autoEnable = true;
-    image = ../assets/desktop.jpg;
-    polarity = "dark";
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/kanagawa.yaml";
-
-    cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Ice";
-    };
-    fonts = {
-      serif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Serif";
-      };
-
-      sansSerif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans";
-      };
-
-      monospace = {
-        package = pkgs.nerd-fonts.iosevka;
-        name = "Iosevka Nerd Font Mono";
-      };
-
-      emoji = {
-        package = pkgs.noto-fonts-emoji;
-        name = "Noto Color Emoji";
-      };
-    };
-  };
-
   # Enable networking
   networking.wireless.iwd.enable = true;
   networking.firewall.enable = false;