Rozszerzenie konfiguracji Hyprland, aplikacji dex i środowiska developerskiego

- Dodano nowe reguły `windowrulev2` w Hyprlandzie dla aplikacji takich jak galculator, Anki, ONLYOFFICE, Lutris czy Bitwarden. - Zamieniono bindy: `slack` ↔ `screenshootin`, dodano `dex-messenger`. - Zainstalowano `dex` i skonfigurowano zestaw skryptów `dex-apps` do uruchamiania aplikacji webowych przez `dex`. - Rozszerzono listę pakietów: dodano `onlyoffice-bin` (zamiast libreoffice), `space-cadet-pinball`. - Zaktualizowano i uporządkowano rozszerzenia VSCode: usunięto zduplikowane wpisy, zaktualizowano wersje, dodano nowe rozszerzenia (np. `better-syntax`, `uv-toolkit`).
2025-04-20 14:37:48 +02:00
parent a464fbb408
commit 39bbdd94e1
8 changed files with 106 additions and 38 deletions
--- a/config/hyprland.nix
+++ b/config/hyprland.nix
@@ -74,6 +74,7 @@ in
            windowrulev2 = float, class:^(swayimg|vlc|Viewnior|pavucontrol)$
            windowrulev2 = float, class:^(nwg-look|qt5ct|mpv)$
            windowrulev2 = float, class:^(zoom)$
+            windowrulev2 = float, class:^(galculator)$
            windowrulev2 = stayfocused, title:^()$,class:^(steam)$
            windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$
            windowrulev2 = opacity 1 0.7, class:^(librewolf)$
@@ -85,6 +86,15 @@ in
            windowrulev2 = opacity 0.9 0.7, class:^(chrome-ppepjbbmpdbanediafpgploonglppmlk-Default)$
            windowrulev2 = opacity 0.9 0.7, class:^(tutanota-desktop)$
            windowrulev2 = opacity 0.9 0.7, class:^(discord)$
+            windowrulev2 = opacity 0.9 0.7, class:^(ONLYOFFICE)$
+            windowrulev2 = opacity 0.9 0.7, class:^(net.lutris.Lutris)$
+            windowrulev2 = opacity 0.9 0.7, class:^(chrome-nibpilkookahlimkjopijpmhgllidlok-Default)$
+            windowrulev2 = opacity 0.9 0.7, class:^(Anki)$
+            windowrulev2 = opacity 0.9 0.7, class:^(galculator)$
+            windowrulev2 = opacity 0.9 0.7, class:^(chrome-mcpclnpikkcgnjfknenfalelmlaccfcj-Default)$
+            windowrulev2 = opacity 0.9 0.7, class:^(chrome-dbipeoijaciefjfbfdkpfncmlbfinpge-Default)$
+            windowrulev2 = opacity 0.9 0.7, class:^(Bitwarden)$
+            windowrulev2 = opacity 0.9 0.7, class:^(chrome-akpamiohjfcnimfljfndmaldlcfphjmp-Default)$
            gestures {
              workspace_swipe = true
              workspace_swipe_fingers = 3
@@ -140,8 +150,8 @@ in
            bind = ${modifier}SHIFT,N,exec,swaync-client -rs
            bind = ${modifier},W,exec,${browser}
            bind = ${modifier},E,exec,emopicker9000
-            bind = ${modifier},S,exec,screenshootin
-            bind = ${modifier}SHIFT,S,exec,slack
+            bind = ${modifier}SHIFT,S,exec,screenshootin
+            bind = ${modifier},S,exec,slack
            bind = ${modifier},D,exec,discord
            bind = ${modifier},O,exec,obs
            bind = ${modifier},C,exec,hyprpicker -a
@@ -150,7 +160,7 @@ in
            bind = ${modifier},T,exec,thunar
            bind = ${modifier}SHIFT,T,exec,tutanota-desktop
            bind = ${modifier},M,exec,plexamp
-            bind = ${modifier}SHIFT,M,exec,chrome-bbdeiblfgdokhlblpgeaokenkfknecgl-Default
+            bind = ${modifier}SHIFT,M,exec,dex-messenger
            bind = ${modifier},Q,killactive,
            bind = ${modifier},P,pseudo,
            bind = ${modifier}SHIFT,I,togglesplit,
--- a/hosts/garand-laptop/config/nixpkgs/clients.nix
+++ b/hosts/garand-laptop/config/nixpkgs/clients.nix
@@ -11,5 +11,6 @@
    ungoogled-chromium
    docker-client
    anki-bin
+    onlyoffice-bin
  ];
 }
--- a/hosts/garand-laptop/config/nixpkgs/codium.nix
+++ b/hosts/garand-laptop/config/nixpkgs/codium.nix
@@ -25,7 +25,7 @@
            ms-azuretools.vscode-docker
            ms-python.debugpy
            ms-python.flake8
-            # ms-python.python
+            ms-python.python
            ms-python.vscode-pylance
            njpwerner.autodocstring
            octref.vetur
@@ -40,14 +40,10 @@
            vue.volar
            wholroyd.jinja
            yoavbls.pretty-ts-errors
+            tamasfe.even-better-toml
+            ms-ceintl.vscode-language-pack-pl
          ]
          ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-            {
-              name = "python";
-              publisher = "ms-python";
-              version = "2025.3.2025030601";
-              hash = "sha256-xK9esQjcdDz8pNgGjB3HUKpwySSykNTXo3ubDW0nBR8=";
-            }
            {
              name = "goto-alias";
              publisher = "antfu";
@@ -79,10 +75,10 @@
              hash = "sha256-Aj87mxOGer24O24/4/bGQqgLpgoBvfwOCKQyJ8NLplU=";
            }
            {
-              name = "python-environment-manager";
-              publisher = "donjayamanne";
-              version = "1.2.7";
-              hash = "sha256-w3csu6rJm/Z6invC/TR7tx6Aq5DD77VM62nem8/QMlg=";
+              name = "vscode-python-envs";
+              publisher = "ms-python";
+              version = "0.3.11081010";
+              hash = "sha256-Vs9Rkz/DAhNcC9e8fI8mlD8TljsFdU8+z7ztNkZozz0=";
            }
            {
              name = "one-dark-pro-monokai-darker";
@@ -99,8 +95,8 @@
            {
              name = "bootstrap-intellisense";
              publisher = "hossaini";
-              version = "2.0.2";
-              hash = "sha256-io6mPkF19EYo1tVTnd87EWX1mH9zAz0Zzks6v5XN3UE=";
+              version = "3.0.2";
+              hash = "sha256-stZfbh42HncdRzFZ9ShumZ9Tuery9RF9c8rk3TD3P2g=";
            }
            {
              name = "tab-indent-space-align";
@@ -126,11 +122,17 @@
              version = "0.6.1";
              hash = "sha256-SbfsD28gaVHAmJskUuc1Q8kA47jrVa3OO5Ur7ULk3jI=";
            }
+            {
+              name = "better-syntax";
+              publisher = "jeff-hykin";
+              version = "2.1.0";
+              hash = "sha256-gvEItVs0IKn7N7vfnm5N/B79xeMxO8xkPwWLNPOs9zY=";
+            }
            {
              name = "vsc-python-indent";
              publisher = "kevinrose";
-              version = "1.19.0";
-              hash = "sha256-gX0L416RXIQ9S4kFguEJJ7u4GSo7WbpifXmL/mWCU08=";
+              version = "1.21.0";
+              hash = "sha256-SvJhVG8sofzV0PebZG4IIORX3AcfmErDQ00tRF9fk/4=";
            }
            {
              name = "json-to-ts";
@@ -144,23 +146,11 @@
              version = "0.2.6";
              hash = "sha256-VPEp4gtXH787iK0RxjfciIZO1cjkYacjNELzjzcs/FI=";
            }
-            {
-              name = "vscode-language-pack-pl";
-              publisher = "ms-ceintl";
-              version = "1.97.2025020509";
-              hash = "sha256-D2x745VgarYs6vRo6Eiyx7Zy4FHmFfF01xddbWlLmjM=";
-            }
            {
              name = "mdc";
              publisher = "nuxt";
-              version = "0.2.0";
-              hash = "sha256-M/29ZDg1sva9msGgRe6xqpCYDpW6X/BqKxmiJhzeVXQ=";
-            }
-            {
-              name = "nuxt-vscode-extentions";
-              publisher = "nuxtr";
-              version = "0.0.7";
-              hash = "sha256-LMShrm9fQHr0M8yXHSziq4NZWfK+n1azc5bjiM972O0=";
+              version = "0.3.1";
+              hash = "sha256-YJ+7gzDjA8kzxBwGLpEmfx0erJdgAntWc2OrK2zp9DM=";
            }
            {
              name = "nuxtr-vscode";
@@ -171,8 +161,8 @@
            {
              name = "bun-vscode";
              publisher = "oven";
-              version = "0.0.26";
-              hash = "sha256-klMkKAorWJj2o015FWbQQfpmYe4JM0UOM+WVh+YPtI4=";
+              version = "0.0.28";
+              hash = "sha256-WlGqqKbfrV0gqCCdVo/UFF+Gnxhq0TNJ4LuHwFaFYXA=";
            }
            {
              name = "csv-to-table";
@@ -231,8 +221,8 @@
            {
              name = "explorer";
              publisher = "vitest";
-              version = "1.12.1";
-              hash = "sha256-WG2/MWxU/XhSOjXuBoyszpD/HFb8mfrt525povSEES4=";
+              version = "1.17.0";
+              hash = "sha256-7OePMFsWIyrPkAW/+SRiOoowluLMEszEjWmBsW0LPpc=";
            }
            {
              name = "prettify-json";
@@ -240,6 +230,12 @@
              version = "0.0.3";
              hash = "sha256-lvds+lFDzt1s6RikhrnAKJipRHU+Dk85ZO49d1sA8uo=";
            }
+            {
+              name = "uv-toolkit";
+              publisher = "the0807";
+              version = "0.0.2";
+              hash = "sha256-OXHUwynWm4RqJYjcv5qXt5DyjFDxtNjZFNpnd22gUgg=";
+            }
          ];
      })
    ];
--- a/hosts/garand-laptop/config/nixpkgs/gaming.nix
+++ b/hosts/garand-laptop/config/nixpkgs/gaming.nix
@@ -4,5 +4,6 @@
    protonup
    wineWowPackages.waylandFull # wine64
    lutris
+    space-cadet-pinball
  ];
 }
--- a/hosts/garand-laptop/config/nixpkgs/multimedia.nix
+++ b/hosts/garand-laptop/config/nixpkgs/multimedia.nix
@@ -12,6 +12,6 @@
    vlc
    kdePackages.kdenlive
    obs-studio
-    libreoffice
+    # libreoffice
  ];
 }
--- a/hosts/garand-laptop/config/nixpkgs/tools.nix
+++ b/hosts/garand-laptop/config/nixpkgs/tools.nix
@@ -12,5 +12,6 @@
    lazydocker
    # lazygit
    docker-slim
+    dex
  ];
 }
--- a/hosts/garand-laptop/home/home.nix
+++ b/hosts/garand-laptop/home/home.nix
@@ -3,7 +3,9 @@
  username,
  host,
  ...
-}: {
+}: let
+  dexApps = import ../../../scripts/dex-apps.nix {inherit pkgs;};
+in {
  # Home Manager Settings
  home = {
    username = "${username}";
@@ -47,6 +49,17 @@
        inherit pkgs;
        inherit host;
      })
+
+      # Dodajemy wszystkie skrypty dex-apps
+      dexApps.dex-messenger
+      dexApps.dex-instagram
+      dexApps.dex-chatgpt
+      dexApps.dex-portainer
+      dexApps.dex-claude
+      dexApps.dex-beszel
+      dexApps.dex-mastodon
+      dexApps.dex-nextcloud
+      dexApps.dex-dailydev
    ];
  };
 }
--- a/scripts/dex-apps.nix
+++ b/scripts/dex-apps.nix
@@ -0,0 +1,46 @@
+{pkgs}: {
+  dex-messenger = pkgs.writeShellScriptBin "dex-messenger" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-bbdeiblfgdokhlblpgeaokenkfknecgl-Default.desktop
+  '';
+
+  dex-instagram = pkgs.writeShellScriptBin "dex-instagram" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-akpamiohjfcnimfljfndmaldlcfphjmp-Default.desktop
+  '';
+
+  dex-chatgpt = pkgs.writeShellScriptBin "dex-chatgpt" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-cadlkienfkclaiaibeoongdcgmdikeeg-Default.desktop
+  '';
+
+  dex-portainer = pkgs.writeShellScriptBin "dex-portainer" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-dbipeoijaciefjfbfdkpfncmlbfinpge-Default.desktop
+  '';
+
+  dex-claude = pkgs.writeShellScriptBin "dex-claude" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-fmpnliohjhemenmnlpbfagaolkdacoja-Default.desktop
+  '';
+
+  dex-beszel = pkgs.writeShellScriptBin "dex-beszel" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-gppdefkeejighoejcenjnohhijfbcbkj-Default.desktop
+  '';
+
+  dex-mastodon = pkgs.writeShellScriptBin "dex-mastodon" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-mcpclnpikkcgnjfknenfalelmlaccfcj-Default.desktop
+  '';
+
+  dex-nextcloud = pkgs.writeShellScriptBin "dex-nextcloud" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-nibpilkookahlimkjopijpmhgllidlok-Default.desktop
+  '';
+
+  dex-dailydev = pkgs.writeShellScriptBin "dex-dailydev" ''
+    #!/usr/bin/env bash
+    dex ~/.local/share/applications/chrome-ppepjbbmpdbanediafpgploonglppmlk-Default.desktop
+  '';
+}