From febb421800859886e53c4ee534fc067b680e25e0 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Fri, 16 Aug 2024 13:40:52 +0200
Subject: [PATCH] modules: change some settings, move steam options

---
 modules/gui/default.nix                       |  3 +--
 modules/gui/foot.nix                          |  4 ++--
 modules/gui/kitty.nix                         | 24 -------------------
 .../{schizofox/default.nix => schizofox.nix}  |  0
 modules/gui/spicetify.nix                     | 14 +++++------
 modules/gui/steam.nix                         |  9 ++-----
 modules/gui/vivado.nix                        |  2 +-
 modules/gui/zathura.nix                       | 10 --------
 modules/options/system/programs/default.nix   |  1 +
 9 files changed, 14 insertions(+), 53 deletions(-)
 delete mode 100644 modules/gui/kitty.nix
 rename modules/gui/{schizofox/default.nix => schizofox.nix} (100%)

diff --git a/modules/gui/default.nix b/modules/gui/default.nix
index aa9fabb..f29ee79 100644
--- a/modules/gui/default.nix
+++ b/modules/gui/default.nix
@@ -5,10 +5,9 @@ _: {
     ./mpv.nix
     ./zathura.nix
     ./spicetify.nix
-    ./kitty.nix
     ./steam.nix
     ./waybar.nix
-    ./schizofox
+    ./schizofox.nix
     ./minecraft.nix
   ];
 }
diff --git a/modules/gui/foot.nix b/modules/gui/foot.nix
index ac2339d..e5c4c84 100644
--- a/modules/gui/foot.nix
+++ b/modules/gui/foot.nix
@@ -11,8 +11,8 @@
   inherit (lib) mkIf;
 in {
   config = mkIf cfg.enable {
-    environment.sessionVariables = {TERM = "foot";};
     home-manager.users.${username} = {
+      home.sessionVariables.TERM = "foot";
       programs.foot = {
         enable = true;
         package = inputs'.nixpkgs-wayland.packages.foot;
@@ -71,7 +71,7 @@ in {
           };
 
           mouse = {
-            hide-when-typing = "yes";
+            hide-when-typing = "yes"; # not really needed since we already enable this in Hyprland
             alternate-scroll-mode = "yes";
           };
 
diff --git a/modules/gui/kitty.nix b/modules/gui/kitty.nix
deleted file mode 100644
index 5367313..0000000
--- a/modules/gui/kitty.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.modules.system.programs.terminals.kitty;
-  inherit (config.modules.other.system) username;
-in {
-  config = mkIf cfg.enable {
-    home-manager.users.${username} = {
-      programs.kitty = {
-        enable = true;
-        settings = {
-          mouse_hide_wait = -1;
-          allow_remote_control = true;
-          url_style = "curly";
-          open_url_with = "default";
-          confirm_os_window_close = "0";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/gui/schizofox/default.nix b/modules/gui/schizofox.nix
similarity index 100%
rename from modules/gui/schizofox/default.nix
rename to modules/gui/schizofox.nix
diff --git a/modules/gui/spicetify.nix b/modules/gui/spicetify.nix
index 956b45c..3e725dd 100644
--- a/modules/gui/spicetify.nix
+++ b/modules/gui/spicetify.nix
@@ -18,13 +18,13 @@ in {
         spotifyPackage = pkgs.spotify;
         theme = spicePkgs.themes.catppuccin;
         colorScheme = "mocha";
-        # enabledExtensions = with spicePkgs.extensions; [
-        #   shuffle
-        #   popupLyrics
-        #   adblock
-        #   betterGenres
-        #   playlistIcons
-        # ];
+        enabledExtensions = with spicePkgs.extensions; [
+          #   shuffle
+          #   popupLyrics
+          adblock
+          #   betterGenres
+          #   playlistIcons
+        ];
       };
     };
   };
diff --git a/modules/gui/steam.nix b/modules/gui/steam.nix
index 9c4b3b6..348ff87 100644
--- a/modules/gui/steam.nix
+++ b/modules/gui/steam.nix
@@ -5,17 +5,12 @@
   ...
 }:
 with lib; let
-  cfg = config.modules.programs.steam;
+  cfg = config.modules.system.programs.steam;
 in {
-  options.modules.programs.steam = {
-    enable = mkEnableOption "steam";
-    gamescope = mkEnableOption "gamescope";
-  };
-
   config = mkIf cfg.enable {
     programs.steam = {
       enable = true;
-      gamescopeSession.enable = mkIf cfg.gamescope true;
+      gamescopeSession.enable = true;
       extraCompatPackages = with pkgs; [proton-ge-bin];
     };
     # See
diff --git a/modules/gui/vivado.nix b/modules/gui/vivado.nix
index 71a9a6e..392689b 100644
--- a/modules/gui/vivado.nix
+++ b/modules/gui/vivado.nix
@@ -5,7 +5,7 @@
     exec = "${pkgs.nur.repos.Nick1296.vivado-2019-2}/bin/vivado";
   };
 in {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = [
     # this propietary software is huge, but I need it for
     # university
     pkgs.nur.repos.Nick1296.vivado-2019-2
diff --git a/modules/gui/zathura.nix b/modules/gui/zathura.nix
index 088012d..213ade0 100644
--- a/modules/gui/zathura.nix
+++ b/modules/gui/zathura.nix
@@ -7,21 +7,11 @@
 with lib; let
   cfg = config.modules.system.programs.zathura;
   inherit (config.modules.other.system) username;
-  catppuccin = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "zathura";
-    rev = "4eb02fd206de63b2423f6deb58242d352545b52f";
-    hash = "sha256-/vD/hOi6KcaGyAp6Az7jL5/tQSGRzIrf0oHjAJf4QbI=";
-  };
 in {
   config = mkIf cfg.enable {
     home-manager.users.${username} = {
-      xdg.configFile."zathura/catppuccin-mocha".source = "${catppuccin}/src/catppuccin-mocha";
       programs.zathura = {
         enable = true;
-        extraConfig = ''
-          include catppuccin-mocha
-        '';
         options = {
           selection-clipboard = "clipboard";
           adjust-open = "best-fit";
diff --git a/modules/options/system/programs/default.nix b/modules/options/system/programs/default.nix
index 82e2520..37290f0 100644
--- a/modules/options/system/programs/default.nix
+++ b/modules/options/system/programs/default.nix
@@ -15,6 +15,7 @@ in {
     nextcloud.enable = mkEnableOption "Nextcloud sync client";
     firefox.enable = mkEnableOption "Firefox web browser";
     zellij.enable = mkEnableOption "Zellij terminal multiplexer";
+    steam.enable = mkEnableOption "Steam games platform";
 
     terminals = {
       foot.enable = mkEnableOption "Foot terminal emulator";