feat: improve vim setup

hosts/MONSTER/default.nix

@@ -37,7 +37,10 @@
     supportedFilesystems = [ "ntfs" ];
   };
 
-  desktops.hyprland.enable = true;
+  desktops = {
+    hyprland.enable = true;
+    # gamescope.enable = true;
+  };
   locale.preset.theaninova.enable = true;
 
   hardware = {
@@ -118,6 +121,8 @@
     # system-wide wine
     lutris
     wine-staging
+    winetricks
+    protontricks
     # docker
     docker-compose
   ];

modules/home-manager/programs/nixvim/default.nix

@@ -254,17 +254,12 @@ in
       '';
     };
 
-    lint = {
+    none-ls = {
       enable = true;
-      lintersByFt = {
+      sources = {
-        javascript = [ "eslint" ];
+        diagnostics.stylelint.enable = true;
-        typescript = [ "eslint" ];
+        formatting.stylelint.enable = true;
-        css = [ "stylelint" ];
-        scss = [ "stylelint" ];
-        less = [ "stylelint" ];
-        bash = [ "shellcheck" ];
       };
-      autoCmd.event = "TextChanged";
     };
 
     lsp = {
@@ -323,6 +318,9 @@ in
         cssls.enable = true;
         svelte.enable = true;
         tsserver.enable = true;
+        eslint.enable = true;
+
+        dockerls.enable = true;
 
         yamlls.enable = true;
         jsonls.enable = true;
@@ -419,6 +417,7 @@ in
           h = "Diagnostics";
           a = "Code Actions";
           f = "Auto Formatting";
+          x = "LSP Format";
         };
         "<leader>x" = {
           name = "Trouble";

modules/home-manager/programs/nixvim/keymaps.nix

@@ -71,6 +71,13 @@
     options.silent = true;
     action = "<cmd>:ConformToggle<CR>";
   }
+  {
+    key = "<leader>sx";
+    mode = "n";
+    options.silent = true;
+    lua = true;
+    action = "vim.lsp.buf.format";
+  }
   # Trouble
   {
     key = "<leader>xx";

modules/nixos/default.nix

@@ -4,6 +4,7 @@
     ./boot/quiet.nix
 
     ./desktops/hyprland.nix
+    ./desktops/gamescope.nix
 
     ./fonts/fira-code.nix
     ./fonts/noto-sans.nix

modules/nixos/desktops/gamescope.nix

@@ -0,0 +1,70 @@
+{
+  config,
+  lib,
+  pkgs,
+  username,
+  ...
+}:
+
+with lib;
+
+let
+  cfg = config.desktops.gamescope;
+in
+{
+  options.desktops.gamescope.enable = mkEnableOption "Enable the SteamOS Compositor as a desktop environment";
+
+  config = mkIf cfg.enable {
+    programs.steam = {
+      enable = true;
+      gamescopeSession = {
+        enable = true;
+        args = [
+          "--hide-cursor-delay"
+          "3000"
+          "--fadee-out-duration"
+          "200"
+          "--xwayland-count"
+          "2"
+          "-W"
+          (placeholder "SCREEN_WIDTH")
+          "-H"
+          (placeholder "SCREEN_HEIGHT")
+        ];
+      };
+    };
+
+    /*
+      services = {
+        greetd = {
+          enable = true;
+          settings = rec {
+            initial_session = {
+              command = "${pkgs.hyprland}/bin/Hyprland &> /dev/null";
+              user = username;
+            };
+            default_session = "${pkgs.greetd.tuigreet}/bin/tuigreet";
+          };
+        };
+
+        dbus.enable = true;
+
+        pcscd.enable = true;
+
+        # nautilus on non-gnome
+        gvfs.enable = true;
+        # fix pinentry on non-gnome
+        dbus.packages = with pkgs; [ gcr ];
+        gnome.gnome-online-accounts.enable = true;
+        gnome.evolution-data-server.enable = true;
+      };
+
+      programs = {
+        hyprland.enable = true;
+        kdeconnect.enable = true;
+      };
+
+      environment.sessionVariables.NIXOS_OZONE_WL = "1";
+    */
+  };
+}

modules/nixos/desktops/hyprland.nix

@@ -33,7 +33,10 @@ in
             command = "${pkgs.hyprland}/bin/Hyprland &> /dev/null";
             user = username;
           };
-          default_session = initial_session;
+          default_session = {
+            command = "${pkgs.greetd.tuigreet}/bin/tuigreet --asterisks --sessions ${config.services.xserver.displayManager.sessionData.desktops}";
+            user = username;
+          };
         };
       };
 

modules/nixos/hardware/fv43u.nix

@@ -19,5 +19,16 @@ in
     fonts.fontconfig.subpixel.rgba = "bgr";
     hardware.gbmonctl.enable = true;
     boot.kernelParams = [ "video=3840x2160@144" ];
+
+    programs.steam.gamescopeSession = {
+      env = {
+        SCREEN_WIDTH = "3840";
+        SCREEN_HEIGHT = "2160";
+      };
+      args = [
+        "--hdr-enabled"
+        "--hdr-itm-enable"
+      ];
+    };
   };
 }