can't remember

2024-10-21 21:48:03 +02:00
parent f41f2f11ed
commit 1bff2c067d
14 changed files with 279 additions and 200 deletions
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -13,6 +13,8 @@
        ./home/devtools/vscode

        ./home/gaming/steam
+        ./home/gaming/mangohud
+        ./home/gaming/lutris

        ./home/cli/alacritty
        ./home/cli/bash
--- a/modules/home/devtools/helix/default.nix
+++ b/modules/home/devtools/helix/default.nix
@@ -35,7 +35,7 @@ in {
            normal = "block";
            select = "underline";
          };
-          indent-guides.render = false;
+          indent-guides.render = true;
          inline-diagnostics = {
            cursor-line = "hint";
            other-lines = "error";
--- a/modules/home/gaming/lutris/default.nix
+++ b/modules/home/gaming/lutris/default.nix
@@ -17,7 +17,7 @@ in {
          p.wineWowPackages.staging
          p.pixman
          p.libjpeg
-          p.gnome.zenity
+          p.zenity
        ];
      })
    ];
--- a/modules/home/userd/gtk/default.nix
+++ b/modules/home/userd/gtk/default.nix
@@ -1,91 +1,100 @@
 {
  pkgs,
  config,
+  lib,
  ...
-}: {
-  home = {
-    packages = [pkgs.glib]; # gsettings
-    pointerCursor = {
-      # package = pkgs.catppuccin-cursors.latteDark;
-      # name = "catppuccin-latte-dark-cursors";
-      package = pkgs.adwaita-icon-theme;
-      name = "Adwaita";
-      size = 28;
-      gtk.enable = true;
-      x11.enable = true;
-    };
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.home.userd.gtk;
+in {
+  options = {
+    home.userd.gtk.enable = mkEnableOption "Enables miscellaneous GTK elements";
  };
-  gtk = {
-    enable = true;
-    theme = {
-      package = pkgs.orchis-theme;
-      name = "Orchis-Grey-Dark-Compact";
-    };
-    iconTheme = {
-      package = pkgs.adwaita-icon-theme;
-      name = "Adwaita";
-    };
-    font = {
-      name = "Input Sans Narrow Light";
-      size = 10;
-    };
-    cursorTheme = {
-      # package = pkgs.catppuccin-cursors.latteDark;
-      # name = "catppuccin-latte-dark-cursors";
-      package = pkgs.adwaita-icon-theme;
-      name = "Adwaita";
-      size = 28;
+  config = mkIf cfg.enable {
+    home = {
+      packages = [pkgs.glib]; # gsettings
+      pointerCursor = {
+        # package = pkgs.catppuccin-cursors.latteDark;
+        # name = "catppuccin-latte-dark-cursors";
+        package = pkgs.adwaita-icon-theme;
+        name = "Adwaita";
+        size = 28;
+        gtk.enable = true;
+        x11.enable = true;
+      };
    };
+    gtk = {
+      enable = true;
+      theme = {
+        package = pkgs.orchis-theme;
+        name = "Orchis-Grey-Dark-Compact";
+      };
+      iconTheme = {
+        package = pkgs.adwaita-icon-theme;
+        name = "Adwaita";
+      };
+      font = {
+        name = "Input Sans Narrow Light";
+        size = 10;
+      };
+      cursorTheme = {
+        # package = pkgs.catppuccin-cursors.latteDark;
+        # name = "catppuccin-latte-dark-cursors";
+        package = pkgs.adwaita-icon-theme;
+        name = "Adwaita";
+        size = 28;
+      };

-    gtk2 = {
-      configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
-      extraConfig = ''
-        gtk-xft-antialias=1
-        gtk-xft-hinting=1
-        gtk-xft-hintstyle="hintslight"
-        gtk-xft-rgba="rgb"
-      '';
-    };
+      gtk2 = {
+        configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+        extraConfig = ''
+          gtk-xft-antialias=1
+          gtk-xft-hinting=1
+          gtk-xft-hintstyle="hintslight"
+          gtk-xft-rgba="rgb"
+        '';
+      };

-    gtk3.extraConfig = {
-      # Lets be easy on the eyes. This should be easy to make dependent on
-      # the "variant" of the theme, but I never use a light theme anyway.
-      gtk-application-prefer-dark-theme = true;
+      gtk3.extraConfig = {
+        # Lets be easy on the eyes. This should be easy to make dependent on
+        # the "variant" of the theme, but I never use a light theme anyway.
+        gtk-application-prefer-dark-theme = true;

-      # Decorations
-      gtk-decoration-layout = "appmenu:none";
-      gtk-toolbar-style = "GTK_TOOLBAR_BOTH";
-      gtk-toolbar-icon-size = "GTK_ICON_SIZE_LARGE_TOOLBAR";
-      gtk-button-images = 1;
-      gtk-menu-images = 1;
+        # Decorations
+        gtk-decoration-layout = "appmenu:none";
+        gtk-toolbar-style = "GTK_TOOLBAR_BOTH";
+        gtk-toolbar-icon-size = "GTK_ICON_SIZE_LARGE_TOOLBAR";
+        gtk-button-images = 1;
+        gtk-menu-images = 1;

-      # Silence bells and whistles, quite literally.
-      gtk-error-bell = 0;
-      gtk-enable-event-sounds = 0;
-      gtk-enable-input-feedback-sounds = 0;
+        # Silence bells and whistles, quite literally.
+        gtk-error-bell = 0;
+        gtk-enable-event-sounds = 0;
+        gtk-enable-input-feedback-sounds = 0;

-      # Fonts
-      gtk-xft-antialias = 1;
-      gtk-xft-hinting = 1;
-      gtk-xft-hintstyle = "hintslight";
-    };
+        # Fonts
+        gtk-xft-antialias = 1;
+        gtk-xft-hinting = 1;
+        gtk-xft-hintstyle = "hintslight";
+      };

-    gtk4.extraConfig = {
-      # Prefer dark theme.
-      gtk-application-prefer-dark-theme = true;
+      gtk4.extraConfig = {
+        # Prefer dark theme.
+        gtk-application-prefer-dark-theme = true;

-      # Decorations.
-      gtk-decoration-layout = "appmenu:none";
+        # Decorations.
+        gtk-decoration-layout = "appmenu:none";

-      # Sounds, again.
-      gtk-error-bell = 0;
-      gtk-enable-event-sounds = 0;
-      gtk-enable-input-feedback-sounds = 0;
+        # Sounds, again.
+        gtk-error-bell = 0;
+        gtk-enable-event-sounds = 0;
+        gtk-enable-input-feedback-sounds = 0;

-      # Fonts, you know the drill.
-      gtk-xft-antialias = 1;
-      gtk-xft-hinting = 1;
-      gtk-xft-hintstyle = "hintslight";
+        # Fonts, you know the drill.
+        gtk-xft-antialias = 1;
+        gtk-xft-hinting = 1;
+        gtk-xft-hintstyle = "hintslight";
+      };
    };
  };
 }
--- a/modules/home/userd/polkit/default.nix
+++ b/modules/home/userd/polkit/default.nix
@@ -1,19 +1,32 @@
-{pkgs, ...}: {
-  systemd.user.services.polkit-gnome-authentication-agent-1 = {
-    Unit.Description = "polkit-gnome-authentication-agent-1";
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.home.userd.polkit;
+in {
+  options = {
+    home.userd.polkit.enable = mkEnableOption "Enables polkit";
+  };
+  config = mkIf cfg.enable {
+    systemd.user.services.polkit-gnome-authentication-agent-1 = {
+      Unit.Description = "polkit-gnome-authentication-agent-1";

-    Install = {
-      WantedBy = ["graphical-session.target"];
-      Wants = ["graphical-session.target"];
-      After = ["graphical-session.target"];
-    };
+      Install = {
+        WantedBy = ["graphical-session.target"];
+        Wants = ["graphical-session.target"];
+        After = ["graphical-session.target"];
+      };

-    Service = {
-      Type = "simple";
-      ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-      Restart = "on-failure";
-      RestartSec = 1;
-      TimeoutStopSec = 10;
+      Service = {
+        Type = "simple";
+        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+        Restart = "on-failure";
+        RestartSec = 1;
+        TimeoutStopSec = 10;
+      };
    };
  };
 }
--- a/modules/home/userd/xdg/default.nix
+++ b/modules/home/userd/xdg/default.nix
@@ -1,16 +1,28 @@
-{config, ...}: {
-  xdg = {
-    userDirs = {
-      enable = true;
-      createDirectories = true;
-      desktop = "${config.home.homeDirectory}/desktop";
-      documents = "${config.home.homeDirectory}/documents";
-      download = "${config.home.homeDirectory}/downloads";
-      music = "${config.home.homeDirectory}/media/music";
-      pictures = "${config.home.homeDirectory}/media/images";
-      publicShare = "${config.home.homeDirectory}/documents/share";
-      templates = "${config.home.homeDirectory}/documents/templates";
-      videos = "${config.home.homeDirectory}/media/videos";
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.home.userd.xdg;
+in {
+  options = {
+    home.userd.xdg.enable = mkEnableOption "Enables XDG settings";
+  };
+  config = mkIf cfg.enable {
+    xdg = {
+      userDirs = {
+        enable = true;
+        createDirectories = true;
+        desktop = "${config.home.homeDirectory}/desktop";
+        documents = "${config.home.homeDirectory}/documents";
+        download = "${config.home.homeDirectory}/downloads";
+        music = "${config.home.homeDirectory}/media/music";
+        pictures = "${config.home.homeDirectory}/media/images";
+        publicShare = "${config.home.homeDirectory}/documents/share";
+        templates = "${config.home.homeDirectory}/documents/templates";
+        videos = "${config.home.homeDirectory}/media/videos";
+      };
    };
  };
 }
--- a/modules/system/hardware/graphics/amd/default.nix
+++ b/modules/system/hardware/graphics/amd/default.nix
@@ -16,15 +16,15 @@ in {
        enable = true;
        enable32Bit = true;
        # extraPackages = with pkgs; [
-        # libva
-        # vaapiVdpau
-        # libvdpau-va-gl
-        # amdvlk
-        # vulkan-tools
+        #   libva
+        #   vaapiVdpau
+        #   libvdpau-va-gl
+        #   amdvlk
+        #   vulkan-tools
        # ];
        # extraPackages32 = with pkgs.pkgsi686Linux; [
-        # vaapiVdpau
-        # libvdpau-va-gl
+        #   vaapiVdpau
+        #   libvdpau-va-gl
        # ];
      };
    };
--- a/modules/system/utils/chaotic/default.nix
+++ b/modules/system/utils/chaotic/default.nix
@@ -30,6 +30,7 @@ in {
          enable = true;
          extraPackages = with pkgs; [
            libva
+            libvdpau-va-gl
            vaapiVdpau
            libdrm_git
            latencyflex-vulkan
@@ -48,10 +49,12 @@ in {
            vulkanPackages_latest.vulkan-validation-layers
            vulkanPackages_latest.vulkan-volk
          ];
-          extraPackages32 = with pkgs; [
-            mesa32_git
+          extraPackages32 = with pkgs.pkgsi686Linux; [
+            pkgs.mesa32_git
+            pkgs.mesa32_git.opencl
            libdrm32_git
            libva
+            libvdpau-va-gl
            vaapiVdpau
          ];
        };
--- a/modules/system/utils/misc/default.nix
+++ b/modules/system/utils/misc/default.nix
@@ -27,7 +27,6 @@ in {
      (mkIf cfg.desktop.enable [
        pkgs.protonup
        pkgs.winetricks
-        pkgs.tor-browser
      ])
    ];
  };