Merge branch 'main' of https://github.com/bloxx12/nichts

hosts/lars/default.nix

@@ -16,17 +16,20 @@
           };
       };
 
+      waybar.enable = true;
+
       programs = {
           vesktop.enable = true;
           btop.enable = true;
           mpv.enable = true;
+          yazi.enable = true;
 
           zsh = {
               enable = true;
               profiling = false;
 	            extraAliases = {
 	                cls = "clear"; 
-
+                  Hyprland = "dbus-run-session Hyprland";
   	          };
 	      ohmyzsh = {
 	          enable = true;

hosts/lars/hyprland.nix

@@ -3,6 +3,10 @@ with lib; let
   username = config.modules.other.system.username;
   cfg = config.modules.hyprland;
 in {
+    imports = [
+      ./waybar.nix
+    ];
+
     options.modules.hyprland.nvidia.enable = mkEnableOption "nvidia";
     options.modules.hyprland = {
         enable = mkEnableOption "hyprland";
@@ -18,8 +22,8 @@ in {
 	};
     };
 
-  config = mkIf cfg.enable {
-	  environment.sessionVariables = mkIf cfg.nvidia.enable {
+  	config = mkIf cfg.enable {
+	  	environment.sessionVariables = mkIf cfg.nvidia.enable {
 	    LIBVA_DRIVER_NAME = "nvidia";
 	    XDG_SESSION_TYPE = "wayland";
 	    GBM_BACKEND = "nvidia-drm";
@@ -34,11 +38,16 @@ in {
 	    GTK_USE_PORTAL = "1";
 	    NIXOS_XDG_OPEN_USE_PORTAL = "1";
 	  };
+
     programs.hyprland = {
         enable = true;
-	xwayland.enable = true;
-    };
+		xwayland.enable = true;
+		};
+
   xdg.portal.wlr.enable = true;
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  xdg.portal.config.common.default = "gtk";
+
   xdg.portal.lxqt.enable = false;
   systemd.user.services.xdg-desktop-portal-gnome.enable = false;
 
@@ -74,6 +83,7 @@ in {
 			];
 
 			exec-once = [
+				"waybar"
 			];
 
 			bind = [

hosts/lars/programs.nix

@@ -53,6 +53,8 @@ in {
             wl-clipboard
             pavucontrol
             wofi
+            dolphin
+            xdg-utils # xdg-mime script
         ];
     };
 }

hosts/lars/waybar.nix

@@ -0,0 +1,15 @@
+{ config, lib, inputs, pkgs, ... }:
+with lib; let
+  username = config.modules.other.system.username;
+  cfg = config.modules.waybar;
+in {
+    options.modules.waybar = {
+        enable = mkEnableOption "hyprland";
+	};
+
+	config = mkIf cfg.enable {
+    	home-manager.users.${username} = {
+      		programs.waybar.enable = true;
+		};
+	};
+}

modules/tui/default.nix

@@ -5,5 +5,6 @@ _: {
         ./neovim.nix
 #       ./newsboat.nix
         ./ncmpcpp.nix
+        ./yazi.nix
     ];
 }

modules/tui/yazi.nix

@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+with lib; let
+    cfg = config.modules.programs.yazi;
+    username = config.modules.other.system.username;
+in {
+    options.modules.programs.yazi = {
+        enable = mkEnableOption "yazi";
+    };
+
+    config = mkIf cfg.enable {
+        home-manager.users.${username} = {
+            programs.yazi = {
+                enable = true;
+                enableZshIntegration = true;
+            };
+        };
+    };
+}