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

modules/gui/default.nix

@@ -14,5 +14,6 @@ _: {
         ./WM
         ./alacritty.nix
 	    ./firefox.nix
+        ./steam.nix
     ];
 }

modules/gui/firefox.nix

@@ -18,7 +18,7 @@ in {
         enable = true;
 
 	policies = {
-	DisableTelemetry = true;
+	    DisableTelemetry = true;
         DisableFirefoxStudies = true;
         EnableTrackingProtection = {
           Value= true;
@@ -36,28 +36,30 @@ in {
         DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab"
         DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
         SearchBar = "unified"; # alternative: "separate"
-	FirefoxSuggest = {
-	  WebSuggestions = true;
-	  ImproveSuggest = true;
-	  Locked = true;
-	};
-	SearchSuggestEnabled = true;
-	theme = {
-	  colors = {
-	    background-darker = "181825";
-	    background = "1e1e2e";
-	    foreground = "cdd6f4";
-	  };
-	};
+        FirefoxSuggest = {
+          WebSuggestions = true;
+          ImproveSuggest = true;
+          Locked = true;
+        };
+        SearchSuggestEnabled = true;
+        theme = {
+          colors = {
+            background-darker = "181825";
+            background = "1e1e2e";
+            foreground = "cdd6f4";
+          };
+        };
 
-	  font = "Lexend";
-	  ExtensionSettings = lib.mkMerge [{
-	    "uBlock0@raymondhill.net" = {
-              install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
-              installation_mode = "force_installed";
-            };
-	  } cfg.extensions];
-	};
+        OfferToSaveLogins = false;
+
+          font = "Lexend";
+          ExtensionSettings = lib.mkMerge [{
+            "uBlock0@raymondhill.net" = {
+                  install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+                  installation_mode = "force_installed";
+                };
+          } cfg.extensions];
+        };
       };
     };
   };

modules/gui/steam.nix

@@ -0,0 +1,22 @@
+
+{ config, lib, inputs, pkgs, ... }:
+with lib; let
+  username = config.modules.other.system.username;
+  cfg = config.modules.programs.steam;
+in {
+  options.modules.programs.steam = {
+      enable = mkEnableOption "steam";
+      gamescope = mkEnableOption "gamescope";
+  };
+
+  config = mkIf cfg.enable {
+    programs.steam = {
+        enable = true;
+        remotePlay.openFirewall = true;
+        dedicatedServer.openFirewall = true;
+        gamescopeSession.enable = mkIf cfg.gamescope true;
+    };
+    home-manager.users.${username} = {
+    };
+  };
+}

modules/tui/neovim.nix

@@ -82,6 +82,7 @@ in {
                             java-language-server.enable = true;
                             #pylyzer.enable = true;
                             rnix-lsp.enable = true;
+			                pyright.enable = true;
                         };
                         #onAttach = ''
                         #    vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
@@ -159,11 +160,36 @@ in {
                         enable = true;
                         settings.theme = "dark";
                     };
+
                 };
 
                 extraPlugins = with pkgs.vimPlugins; [
                     zen-mode-nvim
+                    lazygit-nvim
                 ];
+
+		keymaps = [
+		    {
+		        mode = "n";
+			    key = "<leader>pv";
+    			action = "<cmd>Explore<CR>";
+		    }
+            {
+                mode = "n";
+                key = "<leader>w";
+                action = "<cmd>w<CR>";
+            }
+            {
+                mode = "n";
+                key = "<leader>qw";
+                action = "<cmd>q<CR>";
+            }
+            {
+                mode = "n";
+                key = "<leader>gg";
+                action = "<cmd>LazyGit<CR>";
+            }
+		];
             };
         };
     };