I ffing give up for today...

homes/x86_64-linux/chris@manwe/default.nix

@@ -39,7 +39,7 @@
       onlyoffice.enable = true;
       signal.enable = true;
       steam.enable = true;
-      studio.enable = true;
+      # studio.enable = true;
       teamspeak.enable = true;
       thunderbird.enable = true;
       zen.enable = true;

modules/home/application/obs/default.nix

@@ -26,7 +26,5 @@ in
     #     options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
     #   '';
     # };
-
-    security.polkit.enable = true;
   };
 }

modules/home/application/steam/default.nix

@@ -17,20 +17,20 @@ in
     };
 
     programs = {
-      steam = {
+      # steam = {
-        enable = true;
+      #   enable = true;
-        package = pkgs.steam-small.override {
+      #   package = pkgs.steam-small.override {
-          extraEnv = {
+      #     extraEnv = {
-            DXVK_HUD = "compiler";
+      #       DXVK_HUD = "compiler";
-            MANGOHUD = true;
+      #       MANGOHUD = true;
-          };
+      #     };
-        };
+      #   };
 
-        gamescopeSession = {
+      #   gamescopeSession = {
-          enable = true;
+      #     enable = true;
-          args = ["--immediate-flips"];
+      #     args = ["--immediate-flips"];
-        };
+      #   };
-      };
+      # };
 
       # https://github.com/FeralInteractive/gamemode
       # gamemode = {

modules/home/application/thunderbird/default.nix

@@ -10,11 +10,11 @@ in
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ thunderbird ];
+    # home.packages = with pkgs; [ thunderbird ];
 
-    programs.thunderbird = {
+    # programs.thunderbird = {
-      enable = true;
+    #   enable = true;
-    };
+    # };
 
     accounts.email.accounts = {
       kruining = {

modules/home/application/zen/default.nix

@@ -10,9 +10,9 @@ in
   };
 
   config = mkIf cfg.enable {
-    home.packages = with inputs.zen.packages.${pkgs.system}.specific; [ zen ];
+    home.packages = [ inputs.zen-browser.packages.${pkgs.system}.specific ];
 
-    sessionVariables = {
+    home.sessionVariables = {
       MOZ_ENABLE_WAYLAND = "1";
     };
   };

modules/home/default.nix

@@ -42,6 +42,6 @@ in {
       BROWSER = cfg.browser;
     };
 
-    shell = pkgs.${cfg.shell};
+    # home.shell = pkgs.${cfg.shell};
   };
 }

modules/home/editor/nano/default.nix

@@ -2,29 +2,29 @@
 let
   inherit (lib) mkEnableOption mkIf;
 
-  cfg = config.${namespace}.editors.nano;
+  cfg = config.${namespace}.editor.nano;
 in
 {
-  options.${namespace}.editors.nano = {
+  options.${namespace}.editor.nano = {
     enable = mkEnableOption "nano";
   };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [ nano ];
 
-    programs.nano = {
+    # programs.nano = {
-      enable = true;
+    #   enable = true;
-      syntaxHighlight = true;
+    #   syntaxHighlight = true;
-      nanorc = ''
+    #   nanorc = ''
-        set autoindent
+    #     set autoindent
-        set jumpyscrolling
+    #     set jumpyscrolling
-        set linenumbers
+    #     set linenumbers
-        set mouse
+    #     set mouse
-        set saveonexit
+    #     set saveonexit
-        set smarthome
+    #     set smarthome
-        set tabstospaces
+    #     set tabstospaces
-        set tabsize 2
+    #     set tabsize 2
-      '';
+    #   '';
-    };
+    # };
   };
 }

modules/home/editor/nvim/default.nix

@@ -5,9 +5,9 @@ let
   cfg = config.${namespace}.editor.nvim;
 in
 {
-  imports = [
+  # imports = [
-    inputs.nvf.nixosModules.default
+  #   inputs.nvf.nixosModules.default
-  ];
+  # ];
 
   options.${namespace}.editor.nvim = {
     enable = mkEnableOption "enable nvim via nvf on user level";
@@ -18,30 +18,29 @@ in
       imagemagick
       editorconfig-core-c
       sqlite
-      deno
       pandoc
       nuspell
       hunspellDicts.nl_NL
       hunspellDicts.en_GB-ise
     ];
 
-    programs.nvf = {
+    # programs.nvf = {
-      enable = true;
+    #   enable = true;
-      settings.vim = {
+    #   settings.vim = {
-        statusline.lualine.enable = true;
+    #     statusline.lualine.enable = true;
-        telescope.enable = true;
+    #     telescope.enable = true;
-        autocomplete.nvim-cmp.enable = true;
+    #     autocomplete.nvim-cmp.enable = true;
 
-        lsp.enable = true;
+    #     lsp.enable = true;
 
-        languages = {
+    #     languages = {
-          enableTreesitter = true;
+    #       enableTreesitter = true;
 
-          nix.enable = true;
+    #       nix.enable = true;
-          ts.enable = true;
+    #       ts.enable = true;
-          rust.enable = true;
+    #       rust.enable = true;
-        };
+    #     };
-      };
+    #   };
-    };
+    # };
   };
 }

modules/home/editor/zed/default.nix

@@ -1,9 +1,9 @@
 { config, lib, pkgs, namespace, ... }: let
   inherit (lib) mkIf mkEnableOption;
 
-  cfg = config.${namespace}.editors.zed;
+  cfg = config.${namespace}.editor.zed;
 in {
-  options.${namespace}.editors.zed = {
+  options.${namespace}.editor.zed = {
     enable = mkEnableOption "zed";
   };
 

modules/home/shell/default.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, namespace, ... }:
 let
-  inherit (lib) attrValues mkIf mkMerge mkOption mkEnableOption mkDefault;
+  inherit (lib) mkIf mkMerge mkEnableOption mkDefault;
-  inherit (lib.types) nullOr enum;
 
   cfg = config.${namespace}.shell;
 in

modules/home/shell/toolset/fzf/default.nix

@@ -3,7 +3,6 @@ let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.${namespace}.shell.toolset.fzf;
-  defShell = config.${namespace}.shell.default;
 in
 {
   options.${namespace}.shell.toolset.fzf = {
@@ -16,8 +15,8 @@ in
     programs.fzf = {
       enable = true;
       enableBashIntegration = true;
-      enableZshIntegration = defShell == "zsh";
+      enableZshIntegration = true;
-      enableFishIntegration = defShell == "fish";
+      enableFishIntegration = true;
 
       tmux.enableShellIntegration = true;
       tmux.shellIntegrationOptions = ["-d 40%"];

modules/home/terminal/ghostty/default.nix

@@ -10,7 +10,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    rograms.ghostty = {
+    programs.ghostty = {
       enable = true;
       settings = {
         background-blur-radius = 20;

modules/nixos/application/steam/default.nix

@@ -0,0 +1,55 @@
+{ inputs, config, lib, pkgs, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.application.steam;
+in
+{
+  options.${namespace}.application.steam = {
+    enable = mkEnableOption "enable steam";
+  };
+
+  config = mkIf cfg.enable {
+    # home.packages = with pkgs; [ protonup ];
+
+    # home.sessionVariables = {
+    #   STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
+    # };
+
+    programs = {
+      steam = {
+        enable = true;
+        package = pkgs.steam-small.override {
+          extraEnv = {
+            DXVK_HUD = "compiler";
+            MANGOHUD = true;
+          };
+        };
+
+        gamescopeSession = {
+          enable = true;
+          args = ["--immediate-flips"];
+        };
+      };
+
+      # https://github.com/FeralInteractive/gamemode
+      gamemode = {
+        enable = true;
+        enableRenice = true;
+        settings = {};
+      };
+
+      # gamescope = {
+      #   enable = true;
+      #   capSysNice = true;
+      #   env = {
+      #     DXVK_HDR = "1";
+      #     ENABLE_GAMESCOPE_WSI = "1";
+      #     WINE_FULLSCREEN_FSR = "1";
+      #     WLR_RENDERER = "vulkan";
+      #   };
+      #   args = ["--hdr-enabled"];
+      # };
+    };
+  };
+}

modules/nixos/application/studio/default.nix

@@ -1,4 +1,4 @@
-{ inputs, config, lib, pkgs, namespace, ... }:
+{ config, lib, pkgs, namespace, ... }:
 let
   inherit (lib) mkIf mkEnableOption;
 
@@ -10,6 +10,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ studio ];
+    environment.systemPackages = with pkgs; [ studio ];
   };
 }

modules/nixos/application/thunderbird/default.nix

@@ -0,0 +1,17 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.application.thunderbird;
+in
+{
+  options.${namespace}.application.thunderbird = {
+    enable = mkEnableOption "enable thunderbird";
+  };
+
+  config = mkIf cfg.enable {
+    programs.thunderbird = {
+      enable = true;
+    };
+  };
+}

modules/nixos/editor/nano/default.nix

@@ -0,0 +1,28 @@
+{ config, options, lib, pkgs, namespace, ... }:
+let
+  inherit (lib) mkEnableOption mkIf;
+
+  cfg = config.${namespace}.editor.nano;
+in
+{
+  options.${namespace}.editor.nano = {
+    enable = mkEnableOption "nano";
+  };
+
+  config = mkIf cfg.enable {
+    programs.nano = {
+      enable = true;
+      syntaxHighlight = true;
+      nanorc = ''
+        set autoindent
+        set jumpyscrolling
+        set linenumbers
+        set mouse
+        set saveonexit
+        set smarthome
+        set tabstospaces
+        set tabsize 2
+      '';
+    };
+  };
+}

modules/nixos/hardware/gpu/nvidia/default.nix

@@ -0,0 +1,49 @@
+{ pkgs, lib, namespace, config, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.hardware.has.gpu;
+in
+{
+  options.${namespace}.hardware.has.gpu.nvidia = mkEnableOption "Enable NVidia gpu configuration";
+
+  config = mkIf cfg.nvidia {
+    services.xserver.videoDrivers = [ "nvidia" ];
+
+    hardware = {
+      graphics = {
+        enable = true;
+        enable32Bit = true;
+      };
+
+      nvidia = {
+        modesetting.enable = true;
+        open = false;
+        nvidiaSettings = true;
+
+        powerManagement = {
+          enable = true;
+          finegrained = false;
+        };
+
+        # package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta;
+
+        # package = let
+        #   rcu_patch = pkgs.fetchpatch {
+        #     url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
+        #     hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
+        #   };
+        # in config.boot.kernelPackages.nvidiaPackages.mkDriver {
+        #   version = "550.40.07";
+        #   sha256_64bit = "sha256-KYk2xye37v7ZW7h+uNJM/u8fNf7KyGTZjiaU03dJpK0=";
+        #   sha256_aarch64 = "sha256-AV7KgRXYaQGBFl7zuRcfnTGr8rS5n13nGUIe3mJTXb4=";
+        #   openSha256 = "sha256-mRUTEWVsbjq+psVe+kAT6MjyZuLkG2yRDxCMvDJRL1I=";
+        #   settingsSha256 = "sha256-c30AQa4g4a1EHmaEu1yc05oqY01y+IusbBuq+P6rMCs=";
+        #   persistencedSha256 = "sha256-11tLSY8uUIl4X/roNnxf5yS2PQvHvoNjnd2CB67e870=";
+
+        #   patches = [ rcu_patch ];
+        # };
+      };
+    };
+  };
+}

systems/x86_64-linux/mandos/default.nix

@@ -17,6 +17,14 @@
     };
 
     desktop.use = "gamescope";
+
+    application = {
+      steam.enable = true;
+    };
+
+    editor = {
+      nano.enable = true;
+    };
   };
 
   system.stateVersion = "23.11";

systems/x86_64-linux/manwe/default.nix

@@ -18,6 +18,16 @@
     };
 
     desktop.use = "plasma";
+
+    application = {
+      steam.enable = true;
+      thunderbird.enable = true;
+      studio.enable = true;
+    };
+
+    editor = {
+      nano.enable = true;
+    };
   };
 
   system.stateVersion = "23.11";

systems/x86_64-linux/orome/default.nix

@@ -1,6 +1,4 @@
 { ... }:
-let
-in
 {
   imports = [
     ./disks.nix
@@ -12,6 +10,14 @@ in
       bluetooth = true;
       audio = true;
     };
+
+    application = {
+      steam.enable = true;
+    };
+
+    editor = {
+      nano.enable = true;
+    };
   };
 
   system.stateVersion = "23.11";

systems/x86_64-linux/tulkas/default.nix

@@ -18,6 +18,14 @@
     };
 
     desktop.use = "gamescope";
+
+    application = {
+      steam.enable = true;
+    };
+
+    editor = {
+      nano.enable = true;
+    };
   };
 
   system.stateVersion = "23.11";

systems/x86_64-linux/ulmo/default.nix

@@ -1,6 +1,4 @@
 { ... }:
-let
-in
 {
   imports = [
     ./disks.nix
@@ -12,6 +10,10 @@ in
       networking.ssh.enable = true;
       media.enable = true;
     };
+
+    editor = {
+      nano.enable = true;
+    };
   };
 
   system.stateVersion = "23.11";