chore(modules): update modules

raexera · Nov 24, 2024 · 75d97bc · 75d97bc
1 parent 7934a0f
commit 75d97bc
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 43 deletions.
diff --git a/home/raexera/shell/zsh.nix b/home/raexera/shell/zsh.nix
@@ -93,7 +93,7 @@
       zstyle ':completion:*' group-name '''
       zstyle ':completion:*' keep-prefix true
       zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
-      zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+      zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
       zstyle ':completion:*' menu select
       zstyle ':completion:*' verbose true
 

diff --git a/hosts/minimal/default.nix b/hosts/minimal/default.nix
@@ -3,10 +3,9 @@
     ./disk-configuration.nix
     ./hardware-configuration.nix
 
-    ../modules/programs/bash.nix
     ../modules/programs/neovim.nix
     ../modules/programs/nh.nix
-    ../modules/programs/zsh.nix
+    ../modules/shell/zsh.nix
     ../modules/services/networking.nix
     ../modules/services/openssh.nix
   ];

diff --git a/hosts/modules/config/default.nix b/hosts/modules/config/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./fonts
     ./nix
 
     ./console.nix

diff --git a/hosts/modules/config/users.nix b/hosts/modules/config/users.nix
@@ -1,7 +1,6 @@
-{pkgs, ...}: {
+{
   users.users.raexera = {
     isNormalUser = true;
-    shell = pkgs.zsh;
     uid = 1000;
     extraGroups = [
       "wheel"

diff --git a/hosts/modules/programs/bash.nix b/hosts/modules/programs/bash.nix
diff --git a/hosts/modules/programs/hyprland.nix b/hosts/modules/programs/hyprland.nix
diff --git a/hosts/modules/programs/zsh.nix b/hosts/modules/programs/zsh.nix
diff --git a/hosts/modules/shell/zsh.nix b/hosts/modules/shell/zsh.nix
@@ -0,0 +1,15 @@
+{pkgs, ...}: {
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestions.enable = true;
+    syntaxHighlighting.enable = true;
+  };
+
+  environment = {
+    shells = pkgs.zsh;
+    pathsToLink = ["/share/zsh"];
+  };
+
+  users.defaultUserShell = pkgs.zsh;
+}
diff --git a/hosts/modules/config/xdg/portal.nix → hosts/modules/window-managers/hyprland.nix b/hosts/modules/config/xdg/portal.nix → hosts/modules/window-managers/hyprland.nix
@@ -1,4 +1,10 @@
 {pkgs, ...}: {
+  programs.hyprland = {
+    enable = true;
+  };
+
+  environment.variables.NIXOS_OZONE_WL = "1";
+
   xdg.portal = {
     enable = true;
     xdgOpenUsePortal = true;

diff --git a/hosts/yuki/default.nix b/hosts/yuki/default.nix
@@ -4,18 +4,14 @@
     ./hardware-configuration.nix
     ./power-management.nix
 
-    ../modules/config/fonts
-    ../modules/config/xdg/portal.nix
     ../modules/hardware/gpu/intel.nix
     ../modules/hardware/gpu/nvidia.nix
-    ../modules/programs/bash.nix
     ../modules/programs/dconf.nix
     ../modules/programs/gnupg.nix
-    ../modules/programs/hyprland.nix
     ../modules/programs/neovim.nix
     ../modules/programs/nh.nix
     ../modules/programs/thunar.nix
-    ../modules/programs/zsh.nix
+    ../modules/shell/zsh.nix
     ../modules/services/blueman.nix
     ../modules/services/dbus.nix
     ../modules/services/gnome-keyring.nix
@@ -30,6 +26,7 @@
     ../modules/virtualisation/containers.nix
     ../modules/virtualisation/docker.nix
     ../modules/virtualisation/podman.nix
+    ../modules/window-managers/hyprland.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
@@ -79,6 +76,8 @@
         nvidiaBusId = "PCI:1:0:0";
       };
     };
+
+    nvidia-container-toolkit.enable = true;
   };
 
   services = {