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

modules/gui/default.nix

@@ -10,10 +10,12 @@ _: {
         ./obs.nix
         ./foot.nix
         ./rofi.nix
-        ./vivado2.nix
         ./WM
+        ./kitty.nix
+        ./vivado.nix
         ./alacritty.nix
 	    ./firefox.nix
         ./steam.nix
+        ./minecraft.nix
     ];
 }

modules/gui/kitty.nix

@@ -0,0 +1,78 @@
+{ config, lib, pkgs, ... }:
+with lib; let
+    cfg = config.modules.programs.kitty;
+    username = config.modules.other.system.username;
+in  {
+    options.modules.programs.kitty.enable = mkEnableOption "kitty";
+
+    config = mkIf cfg.enable {
+        home-manager.users.${username} = {
+            programs.kitty = {
+                enable = true; 
+                settings = {
+                    font_size = "13.0";
+                    mouse_hide_wait = -1;
+                    url_style = "curly";
+                    open_url_with = "default";
+                    background_opacity = "0.9";
+                    confirm_os_window_close = "0";
+                    font_family = "JetBrainsMono Nerd Font";
+
+                    cursor_text_color = "background";
+
+                    url_color = "#83a598";
+
+                    visual_bell_color = "#8ec07c";
+                    bell_border_color = "#8ec07c";
+
+                    active_border_color = "#d3869b";
+                    inactive_border_color = "#665c54";
+
+                    foreground = "#ebdbb2";
+                    background = "#282828";
+                    selection_foreground = "#928374";
+                    selection_background = "#ebdbb2";
+
+                    active_tab_foreground = "#fbf1c7";
+                    active_tab_background = "#665c54";
+                    inactive_tab_foreground = "#a89984";
+                    inactive_tab_background = "#3c3836";
+
+                    # black  (bg3/bg4)
+                    color0 = "#665c54";
+                    color8 = "#7c6f64";
+
+                    # red
+                    color1 = "#cc241d";
+                    color9 = "#fb4934";
+
+                    #: green
+                    color2 = "#98971a";
+                    color10 = "#b8bb26";
+
+                    # yellow
+                    color3 = "#d79921";
+                    color11 = "#fabd2f";
+
+                    # blue
+                    color4 = "#458588";
+                    color12 = "#83a598";
+
+                    # purple
+                    color5 = "#b16286";
+                    color13 = "#d3869b";
+
+                    # aqua
+                    color6 = "#689d6a";
+                    color14 = "#8ec07c";
+
+                    # white (fg4/fg3)
+                    color7 = "#a89984";
+                    color15 = "#bdae93"; 
+                };
+
+            };
+        };
+    };
+
+} 

modules/gui/minecraft.nix

@@ -0,0 +1,28 @@
+{ config, lib, inputs, pkgs, ... }:
+with lib; let
+  username = config.modules.other.system.username;
+  cfg = config.modules.programs.minecraft;
+in {
+  options.modules.programs.minecraft = {
+    enable = mkEnableOption "minecraft";
+    wayland = mkEnableOption "wayland";
+  };
+
+  config = mkIf cfg.enable {
+    # Set wayland environment flag
+    environment.variables = mkIf cfg.wayland {
+      __GL_THREADED_OPTIMIZATIONS=0;
+    };
+    # Install glfw-wayland-minecraft
+    environment.systemPackages = with pkgs; mkIf cfg.wayland [
+        glfw-wayland-minecraft # Use these parameters in the prism launcher: -Dfml.earlyprogresswindow=false -Dorg.lwjgl.glfw.libname=/nix/store/ypkdx5844pp1vdw2z2nmnf2nb9kgl0mp-glfw-wayland-minecraft-unstable-2023-06-01/lib/libglfw.so
+    ];
+
+    home-manager.users.${username} = {
+      # Install minecraft
+      home.packages = with pkgs; [
+        prismlauncher
+      ];
+    };
+  };
+}

modules/gui/vesktop.nix

@@ -33,8 +33,8 @@ in {
                 autoUpdate = false;
                 autoUpdateNotification = false;
                 useQuickCss = true;
-                themeLinks = [];
-                enabledThemes = ["Catppuccin.theme.css"];
+                themeLinks = ["https://github.com/Costeer/Gruvbox-Material-Themes/blob/main/Discord%20Theme/gruvboxmaterial.theme.css"];
+                enabledThemes = ["gruvboxmaterial.theme.css"];
                 enableReactDevtools = true;
                 frameless = false;
                 transparent = false;