From bb18b467d7b2f5755b150bf6b394ec8944aa25c7 Mon Sep 17 00:00:00 2001 From: installer Date: Tue, 11 Feb 2025 18:16:26 +0100 Subject: [PATCH] Zamiana Visual Studio Code na VSCodium MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dokonano zmian w konfiguracji systemu, zastępując Visual Studio Code jego otwartą alternatywą – VSCodium. - Zmieniono komendę uruchamiania `code` na `codium` w plikach konfiguracyjnych Hyprland. - Usunięto `vscode` z listy instalowanych pakietów i dodano `vscodium` z obsługą rozszerzeń. - Zaktualizowano skróty klawiszowe oraz listę aplikacji systemowych. - Dodano nową aliasową komendę `hypr-cli` w konfiguracji powłoki. --- config/hyprland.nix | 5 +- hosts/default/config.nix | 16 ++- hosts/default/home.nix | 1 + hosts/garand-laptop/config.nix | 237 ++++++++++++++++++++++++++++++++- hosts/garand-laptop/home.nix | 1 + scripts/list-hypr-bindings.nix | 2 +- 6 files changed, 253 insertions(+), 9 deletions(-) diff --git a/config/hyprland.nix b/config/hyprland.nix index 039c14f..01ac294 100644 --- a/config/hyprland.nix +++ b/config/hyprland.nix @@ -79,8 +79,7 @@ in windowrulev2 = opacity 1 0.7, class:^(librewolf)$ windowrulev2 = opacity 0.9 0.7, class:^(thunar)$ windowrulev2 = opacity 0.9 0.7, class:^(steam)$ - windowrulev2 = opacity 0.9 0.7, class:^(code)$ - windowrulev2 = opacity 0.9 0.7, class:^(code-url-handler)$ + windowrulev2 = opacity 0.9 0.7, class:^(codium)$ windowrulev2 = opacity 0.9 0.7, class:^(Plexamp)$ windowrulev2 = opacity 0.9 0.7, class:^(chrome-bbdeiblfgdokhlblpgeaokenkfknecgl-Default)$ windowrulev2 = opacity 0.9 0.7, class:^(chrome-ppepjbbmpdbanediafpgploonglppmlk-Default)$ @@ -136,7 +135,7 @@ in bind = ${modifier},Return,exec,${terminal} bind = ${modifier}SHIFT,Return,exec,rofi-launcher bind = ${modifier}SHIFT,W,exec,web-search - bind = ${modifier},V,exec,code + bind = ${modifier},V,exec,codium bind = ${modifier}ALT,W,exec,wallsetter bind = ${modifier}SHIFT,N,exec,swaync-client -rs bind = ${modifier},W,exec,${browser} diff --git a/hosts/default/config.nix b/hosts/default/config.nix index 5ba91b7..b3e4bd8 100644 --- a/hosts/default/config.nix +++ b/hosts/default/config.nix @@ -268,7 +268,6 @@ in { git cmatrix lolcat - htop libvirt lxqt.lxqt-policykit lm_sensors @@ -319,7 +318,6 @@ in { plex-media-player plexamp bitwarden-desktop - vscode vlc nixd ungoogled-chromium @@ -342,7 +340,19 @@ in { bastet nsnake exiftool - # auto-cpufreq + (vscode-with-extensions.override { + vscode = vscodium; + vscodeExtensions = with vscode-extensions; + [] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + # { + # name = "[nazwa rozszerzenia]"; + # publisher = "[autor]"; + # version = "[wersja]"; + # hash = "[hash. przebuduj system bez odkomentowania tej opcji, a poda ci poprawny hash]"; + # } + ]; + }) ]; fonts = { diff --git a/hosts/default/home.nix b/hosts/default/home.nix index c45a784..a6290b2 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -194,6 +194,7 @@ in { os-up-sx = "sudo nix flake update --update-input stylix"; fr = "nh os switch --hostname ${host} /home/${username}/zaneyos"; fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos"; + hypr-cli = "hyprctl clients"; zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)"; ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; n = "nano"; diff --git a/hosts/garand-laptop/config.nix b/hosts/garand-laptop/config.nix index c30928b..6a5fcaf 100644 --- a/hosts/garand-laptop/config.nix +++ b/hosts/garand-laptop/config.nix @@ -268,7 +268,6 @@ in { git cmatrix lolcat - htop libvirt lxqt.lxqt-policykit lm_sensors @@ -319,7 +318,6 @@ in { plex-media-player plexamp bitwarden-desktop - vscode vlc nixd ungoogled-chromium @@ -353,6 +351,241 @@ in { lazydocker lazygit lutris + (vscode-with-extensions.override { + vscode = vscodium; + vscodeExtensions = with vscode-extensions; + [ + batisteo.vscode-django + bradlc.vscode-tailwindcss + christian-kohler.npm-intellisense + christian-kohler.path-intellisense + continue.continue + davidanson.vscode-markdownlint + dbaeumer.vscode-eslint + donjayamanne.githistory + esbenp.prettier-vscode + ethansk.restore-terminals + formulahendry.auto-close-tag + formulahendry.auto-rename-tag + grapecity.gc-excelviewer + gruntfuggly.todo-tree + hediet.vscode-drawio + jnoortheen.nix-ide + mechatroner.rainbow-csv + ms-azuretools.vscode-docker + ms-python.debugpy + ms-python.flake8 + ms-python.python + ms-python.vscode-pylance + njpwerner.autodocstring + octref.vetur + oderwat.indent-rainbow + shd101wyy.markdown-preview-enhanced + streetsidesoftware.code-spell-checker + supermaven.supermaven + tomoki1207.pdf + visualstudioexptteam.intellicode-api-usage-examples + visualstudioexptteam.vscodeintellicode + vscode-icons-team.vscode-icons + vue.volar + wholroyd.jinja + yoavbls.pretty-ts-errors + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "goto-alias"; + publisher = "antfu"; + version = "0.2.1"; + hash = "sha256-BJBJVG/zW2BW6K0UqQ4EE12VVIxW3g+z5CecZXRPIrM="; + } + { + name = "vite"; + publisher = "antfu"; + version = "0.2.5"; + hash = "sha256-F3uaqoaLXLE7M8OPzNIIUSraTBeRMwtjxrbgQyMIyZE="; + } + { + name = "django-html"; + publisher = "bibhasdn"; + version = "1.3.0"; + hash = "sha256-7xVJVcjmwl6917lqkTa0KFwMLkAvHkNT2wVML14gVCk="; + } + { + name = "django"; + publisher = "bigonesystems"; + version = "1.0.2"; + hash = "sha256-UBmvaCiNQ84qpAObDWyFL18TVFBn0z/6SBDKWeAIzTc="; + } + { + name = "align-imports"; + publisher = "danielcanada"; + version = "0.1.0"; + hash = "sha256-Aj87mxOGer24O24/4/bGQqgLpgoBvfwOCKQyJ8NLplU="; + } + { + name = "python-environment-manager"; + publisher = "donjayamanne"; + version = "1.2.7"; + hash = "sha256-w3csu6rJm/Z6invC/TR7tx6Aq5DD77VM62nem8/QMlg="; + } + { + name = "python-extension-pack"; + publisher = "donjayamanne"; + version = "1.7.0"; + hash = "sha256-ewOw6nMVzNSYddLcCBGKVNvllztFwhEtncE2RFeFcOc="; + } + { + name = "one-dark-pro-monokai-darker"; + publisher = "eserozvataf"; + version = "1.1.0"; + hash = "sha256-jUjBiy0CD7jw2WBMvM3h8bEC2ySEuj7532dC3v9lpyI="; + } + { + name = "imports-sorter"; + publisher = "glhrmoura"; + version = "0.1.6"; + hash = "sha256-M+SWEJAwn8wPJJ+abi2mN0ziK7P6Sjt0iRAKSyTWvkg="; + } + { + name = "bootstrap-intellisense"; + publisher = "hossaini"; + version = "2.0.2"; + hash = "sha256-io6mPkF19EYo1tVTnd87EWX1mH9zAz0Zzks6v5XN3UE="; + } + { + name = "tab-indent-space-align"; + publisher = "j-zeppenfeld"; + version = "0.0.3"; + hash = "sha256-+WEdYJOVWW7YumfzLkvZmrnpUiC85oLsG1BKMwL1NHc="; + } + { + name = "bun-lockb"; + publisher = "jaaxxx"; + version = "0.0.7"; + hash = "sha256-CkdH/luVTFycRn4Td6ovFnEQep+tVEIXsyUjhfJwfN4="; + } + { + name = "search-node-modules"; + publisher = "jasonnutter"; + version = "1.3.0"; + hash = "sha256-X2CkCVF46McnXDlASlRHKixlAzR+hU4ys8A8JsbpfYI="; + } + { + name = "polacode-2019"; + publisher = "jeff-hykin"; + version = "0.6.1"; + hash = "sha256-SbfsD28gaVHAmJskUuc1Q8kA47jrVa3OO5Ur7ULk3jI="; + } + { + name = "vsc-python-indent"; + publisher = "kevinrose"; + version = "1.19.0"; + hash = "sha256-gX0L416RXIQ9S4kFguEJJ7u4GSo7WbpifXmL/mWCU08="; + } + { + name = "json-to-ts"; + publisher = "mariusalchimavicius"; + version = "1.8.0"; + hash = "sha256-WoSycVtUAkVXv7BDuh+jFbnaU1IdVLvVjOYuIuUp79M="; + } + { + name = "inline-fold"; + publisher = "moalamri"; + 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="; + } + { + name = "nuxtr-vscode"; + publisher = "nuxtr"; + version = "0.2.16"; + hash = "sha256-DVoq8zdlJ2ch8PCG34f1PRkILym9XdclUHQ9s2B5OME="; + } + { + name = "bun-vscode"; + publisher = "oven"; + version = "0.0.26"; + hash = "sha256-klMkKAorWJj2o015FWbQQfpmYe4JM0UOM+WVh+YPtI4="; + } + { + name = "csv-to-table"; + publisher = "phplasma"; + version = "1.4.1"; + hash = "sha256-npe7cQ4lAZr8HCyQSJmVsCDUJcOhGhL6y1QtUtqUY50="; + } + { + name = "nuxt-snippets"; + publisher = "praburangki"; + version = "1.8.0"; + hash = "sha256-qrWrrDO/Ie/mdygw18C0mrPzNQzZLsd+fapUyTVhc14="; + } + { + name = "bash-debug"; + publisher = "rogalmic"; + version = "0.3.9"; + hash = "sha256-f8FUZCvz/PonqQP9RCNbyQLZPnN5Oce0Eezm/hD19Fg="; + } + { + name = "vs-code-prettier-eslint"; + publisher = "rvest"; + version = "6.0.0"; + hash = "sha256-PogNeKhIlcGxUKrW5gHvFhNluUelWDGHCdg5K+xGXJY="; + } + { + name = "vscode-preview-docs"; + publisher = "selemondev"; + version = "0.1.7"; + hash = "sha256-Q9bEIb2m6cqHtdVjOaNivfYvbc5/VVdabM2NVTwBOFA="; + } + { + name = "svg-preview"; + publisher = "simonsiefke"; + version = "2.8.3"; + hash = "sha256-hIVe1MmkyuHoDa56ZQUsSAGMlKWABoQ0FBOfgZZDbCw="; + } + { + name = "autoimport"; + publisher = "steoates"; + version = "1.5.4"; + hash = "sha256-7iIwJJsoNbtTopc+BQ+195aSCLqdNAaGtMoxShyhBWY="; + } + { + name = "code-spell-checker-polish"; + publisher = "streetsidesoftware"; + version = "2.1.3"; + hash = "sha256-MZeTvK9dO4Kj6hK+afJPWGmnKBtlLrrnoqtUd5s2te0="; + } + { + name = "vscode-pets"; + publisher = "tonybaloney"; + version = "1.30.0"; + hash = "sha256-RxOA6xQ29JuB0NzEqMDkF9W1U+AsvgAOzGbtIUw0WyM="; + } + { + name = "explorer"; + publisher = "vitest"; + version = "1.12.1"; + hash = "sha256-WG2/MWxU/XhSOjXuBoyszpD/HFb8mfrt525povSEES4="; + } + ]; + }) ]; fonts = { diff --git a/hosts/garand-laptop/home.nix b/hosts/garand-laptop/home.nix index 7abd237..2c04f74 100644 --- a/hosts/garand-laptop/home.nix +++ b/hosts/garand-laptop/home.nix @@ -196,6 +196,7 @@ in { os-up-af = "sudo nix flake update --update-input auto-cpufreq"; fr = "nh os switch --hostname ${host} /home/${username}/zaneyos"; fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos"; + hypr-cli = "hyprctl clients"; zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)"; ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; n = "nano"; diff --git a/scripts/list-hypr-bindings.nix b/scripts/list-hypr-bindings.nix index db6b8b2..5a583e8 100755 --- a/scripts/list-hypr-bindings.nix +++ b/scripts/list-hypr-bindings.nix @@ -20,7 +20,7 @@ in " = Windows/Super/CAPS LOCK" "Klawisz modyfikatora, używany do skrótów klawiszowych" "Nie wykonuje niczego samodzielnie." \ " + ENTER" "Otwórz terminal" "${terminal}" \ " + SHIFT + ENTER" "Uruchom launcher aplikacji" "rofi" \ - " + V" "Uruchom Visual Studio Code" "code" \ + " + V" "Uruchom Visual Studio Codium" "codium" \ " + ALT + W" "Zmień tapetę" "wallsetter" \ " + Q" "Zamknij aktywne okno" "killactive" \ " + SHIFT + W" "Szukaj w internecie" "web-search" \