Experiment with stuff

hosts/default/configuration.nix

@@ -13,6 +13,9 @@
       # System
       ../../modules/system
 
+      # Shell
+      ../../modules/shell
+
       # NH
       ../../modules/nh
 

hosts/default/home.nix

@@ -4,9 +4,6 @@
   imports =
   [
     ../../modules/home-manager
-
-    # Styling
-    ../../modules/home-manager/stylix/gruvbox
   ];
 
   home.username = "shoi";

modules/home-manager/default.nix

@@ -4,8 +4,8 @@
     imports = [
         ./git
         ./qt/retro
-        ./shell
         ./terminal
+        ./oh-my-posh
     ];
 
     # Allow Unfree
@@ -38,8 +38,17 @@
 
         # Utils
         bat.enable = true;
+        eza.enable = true;
         lazygit.enable = true;
         mangohud.enable = true;
         zathura.enable = true;
+        zoxide.enable = true;
+
+        zsh = {
+            enable = true;
+            enableCompletion = true;
+            syntaxHighlighting.enable = true;
+            autosuggestion.enable = true;
+        };
     };
 }

modules/home-manager/stylix/gruvbox/default.nix

@@ -1,31 +0,0 @@
-{ pkgs, ... }:
-
-{
-  stylix = {
-    enable = true;
-    autoEnable = false;
-
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
-
-    cursor = {
-      package = pkgs.afterglow-cursors-recolored;
-      name = "Afterglow-Recolored-Gruvbox-White";
-      size = 24;
-    };
-
-    image = ../../../wallpapers/gruvbox_ghibli-6.png;
-
-    polarity = "dark";
-
-    targets = {
-      bat.enable = true;
-      firefox.enable = true;
-      kde.enable = true;
-      lazygit.enable = true;
-      mangohud.enable = true;
-      vesktop.enable = true;
-      xresources.enable = true;
-      zathura.enable = true;
-    };
-  };
-}

modules/shell/default.nix

@@ -1,32 +1,29 @@
 { pkgs, ... }:
 
 {
-    imports = [
-        ./oh-my-posh
-    ];
-
     # Download zsh packages
-    home.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
         zsh
         oh-my-zsh
-        starship
     ];
 
     # Enable zsh
     programs.zsh = {
         enable = true;
-        enableCompletion = true;
-        autosuggestion.enable = true;
-        syntaxHighlighting.enable = true;
 
         # oh-my-zsh
         oh-my-zsh = {
             enable = true;
             plugins = [
                 "git"
+                "thefuck"
+                "zoxide"
             ];
         };
+    };
 
-        
+    programs.thefuck = {
+        enable = true;
+        alias = "fuck";
     };
 }

modules/stylix/gruvbox/default.nix

@@ -5,6 +5,8 @@
     enable = true;
     autoEnable = false;
 
+    homeManagerIntegration.autoImport = false;
+
     base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
 
     cursor = {
@@ -13,8 +15,6 @@
       size = 24;
     };
 
-    image = ../wallpapers/gruvbox_ghibli-6.png;
-
     polarity = "dark";
 
     targets = {

modules/system/default.nix

@@ -9,21 +9,13 @@
         ./printing
         ./bluetooth
         ./audio
+        ./window-manager
     ];
 
     services.xserver = {
         enable = true;
     };
 
-    services.displayManager.sddm = {
-        enable = true;
-
-        wayland = {
-            enable = true;
-            compositor = "kwin";
-        };
-    };
-
     nixpkgs.config.allowUnfree = true;
 
     environment.systemPackages = with pkgs; [
@@ -41,5 +33,13 @@
             nerdfonts
             font-awesome
         ];
+
+        fontconfig = {
+            defaultFonts = {
+                serif = [ "Hack Nerd Font" ];
+                sansSerif = [ "DejaVuSansM Nerd Font" ];
+                monospace = [ "JetBrainsMono Nerd Font" ];
+            };
+        };
     };
 }

modules/system/desktop/plasma.nix

@@ -2,4 +2,8 @@
 
 {
   services.xserver.desktopManager.plasma6.enable = true;
+
+  environment.systemPackages = with pkgs.kdePackages; [
+    sddm-kcm
+  ];
 }

modules/system/window-manager/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  services.displayManager.sddm = {
+    enable = true;
+  };
+}