From 1cdac1fd73df7a17b4d64cca41f03399796f9909 Mon Sep 17 00:00:00 2001 From: installer Date: Tue, 3 Jun 2025 22:33:36 +0200 Subject: [PATCH] =?UTF-8?q?Zaktualizuj=20flake.lock=20i=20przenie=C5=9B=20?= =?UTF-8?q?konfiguracj=C4=99=20VSCode=20do=20profili?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Uaktualniono zależności w `flake.lock` dla `auto-cpufreq`, `home-manager`, `nixpkgs`, `stylix` i `nur-expressions`. - Dodano pakiety `kdePackages.kdeconnect-kde` oraz `calyx-vpn` do listy klientów. - Oznaczono `codium.nix` komentarzem TODO do usunięcia po migracji. - Utworzono nową strukturę plików dla profili VSCode (`default`, `webdev-vue`, `python-django`, `rust-tauri`, `rust-bevy`). - Zarejestrowano nową konfigurację codium w `home.nix`. --- flake.lock | 30 +++++++++---------- .../garand-laptop/config/nixpkgs/clients.nix | 2 ++ hosts/garand-laptop/config/nixpkgs/codium.nix | 1 + hosts/garand-laptop/home.nix | 1 + hosts/garand-laptop/home/codium.nix | 19 ++++++++++++ hosts/garand-laptop/home/codium/default.nix | 8 +++++ .../home/codium/python-django.nix | 8 +++++ hosts/garand-laptop/home/codium/rust-bevy.nix | 8 +++++ .../garand-laptop/home/codium/rust-tauri.nix | 8 +++++ .../garand-laptop/home/codium/webdev-vue.nix | 8 +++++ 10 files changed, 78 insertions(+), 15 deletions(-) create mode 100644 hosts/garand-laptop/home/codium.nix create mode 100644 hosts/garand-laptop/home/codium/default.nix create mode 100644 hosts/garand-laptop/home/codium/python-django.nix create mode 100644 hosts/garand-laptop/home/codium/rust-bevy.nix create mode 100644 hosts/garand-laptop/home/codium/rust-tauri.nix create mode 100644 hosts/garand-laptop/home/codium/webdev-vue.nix diff --git a/flake.lock b/flake.lock index be12fca..21b81c2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746769778, - "narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=", + "lastModified": 1748372346, + "narHash": "sha256-7y7NZ6uW0GbT0h4gqfD2xvRuJj5IlPGw32oIc9Twga8=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "eaf8dd1bab1b11ec78ad173ee7ada9886bed92ad", + "rev": "becd5b89963fa54fef3566147f3fd2087f8a5842", "type": "github" }, "original": { @@ -95,11 +95,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1747800214, - "narHash": "sha256-4zStSk4O6GT0kZhN/zERhMHbcJnwFtYt3rM01t6gNhA=", + "lastModified": 1748664200, + "narHash": "sha256-D8sWEVVvxDBJsr8h26AGDfYjp56iKUIHCWaOKucDT2c=", "owner": "rycee", "repo": "nur-expressions", - "rev": "54be6f6687f510002f7a1e6c3583278d989f3833", + "rev": "b7d07ac2748936643abe8192065a2156f1a46d6e", "type": "gitlab" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1747875884, - "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=", + "lastModified": 1748668774, + "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b", + "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", "type": "github" }, "original": { @@ -265,11 +265,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747904607, - "narHash": "sha256-2JWxCVAb8qnssrn/4FeIgs+Gk0VZuAfDsF+rUBE7cZU=", + "lastModified": 1748621009, + "narHash": "sha256-X7SqoEEHVsR01GwL9WBs3tuSXdit7YdeBdIHrl+MlZQ=", "owner": "danth", "repo": "stylix", - "rev": "230705d5fb6c308402579b17e0261e9f15de6f46", + "rev": "b69e9b761ee682b722e2c9ce46637e767b50f6dc", "type": "github" }, "original": { diff --git a/hosts/garand-laptop/config/nixpkgs/clients.nix b/hosts/garand-laptop/config/nixpkgs/clients.nix index bc8b3af..b96fc5b 100644 --- a/hosts/garand-laptop/config/nixpkgs/clients.nix +++ b/hosts/garand-laptop/config/nixpkgs/clients.nix @@ -13,5 +13,7 @@ anki-bin onlyoffice-bin freetube + kdePackages.kdeconnect-kde + calyx-vpn ]; } diff --git a/hosts/garand-laptop/config/nixpkgs/codium.nix b/hosts/garand-laptop/config/nixpkgs/codium.nix index f782257..ea3ed62 100644 --- a/hosts/garand-laptop/config/nixpkgs/codium.nix +++ b/hosts/garand-laptop/config/nixpkgs/codium.nix @@ -1,3 +1,4 @@ +# TODO: Usunąć ten plik po przeniesieniu konfiguracji {pkgs, ...}: { environment = { systemPackages = with pkgs; [ diff --git a/hosts/garand-laptop/home.nix b/hosts/garand-laptop/home.nix index afe6469..7bb2e45 100644 --- a/hosts/garand-laptop/home.nix +++ b/hosts/garand-laptop/home.nix @@ -12,6 +12,7 @@ ../../config/wlogout.nix ../../config/fastfetch + ./home/codium.nix ./home/home.nix ./home/misc.nix ./home/programs.nix diff --git a/hosts/garand-laptop/home/codium.nix b/hosts/garand-laptop/home/codium.nix new file mode 100644 index 0000000..0ef2f55 --- /dev/null +++ b/hosts/garand-laptop/home/codium.nix @@ -0,0 +1,19 @@ +{pkgs, ...}: let + default = import ./codium/default.nix {inherit pkgs;}; + webdev = import ./codium/webdev-vue.nix.nix {inherit pkgs;}; + django = import ./codium/python-django.nix.nix {inherit pkgs;}; + tauri = import ./codium/rust-tauri.nix.nix {inherit pkgs;}; + bevy = import ./codium/rust-bevy.nix.nix {inherit pkgs;}; +in { + programs.vscode = { + enable = true; + package = pkgs.vscodium; + profiles = { + inherit (default.programs.vscode.profiles) default; + inherit (webdev.programs.vscode.profiles) webdev; + inherit (django.programs.vscode.profiles) django; + inherit (tauri.programs.vscode.profiles) tauri; + inherit (bevy.programs.vscode.profiles) bevy; + }; + }; +} diff --git a/hosts/garand-laptop/home/codium/default.nix b/hosts/garand-laptop/home/codium/default.nix new file mode 100644 index 0000000..8af7bc9 --- /dev/null +++ b/hosts/garand-laptop/home/codium/default.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + programs.vscode.profiles.default = { + extensions = with pkgs.vscode-extensions; [ + ]; + userSettings = { + }; + }; +} diff --git a/hosts/garand-laptop/home/codium/python-django.nix b/hosts/garand-laptop/home/codium/python-django.nix new file mode 100644 index 0000000..b167e32 --- /dev/null +++ b/hosts/garand-laptop/home/codium/python-django.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + programs.vscode.profiles.python-django = { + extensions = with pkgs.vscode-extensions; [ + ]; + userSettings = { + }; + }; +} diff --git a/hosts/garand-laptop/home/codium/rust-bevy.nix b/hosts/garand-laptop/home/codium/rust-bevy.nix new file mode 100644 index 0000000..39ff665 --- /dev/null +++ b/hosts/garand-laptop/home/codium/rust-bevy.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + programs.vscode.profiles.rust-bevy = { + extensions = with pkgs.vscode-extensions; [ + ]; + userSettings = { + }; + }; +} diff --git a/hosts/garand-laptop/home/codium/rust-tauri.nix b/hosts/garand-laptop/home/codium/rust-tauri.nix new file mode 100644 index 0000000..b2d1409 --- /dev/null +++ b/hosts/garand-laptop/home/codium/rust-tauri.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + programs.vscode.profiles.rust-tauri = { + extensions = with pkgs.vscode-extensions; [ + ]; + userSettings = { + }; + }; +} diff --git a/hosts/garand-laptop/home/codium/webdev-vue.nix b/hosts/garand-laptop/home/codium/webdev-vue.nix new file mode 100644 index 0000000..e168ab1 --- /dev/null +++ b/hosts/garand-laptop/home/codium/webdev-vue.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + programs.vscode.profiles.webdev-vue = { + extensions = with pkgs.vscode-extensions; [ + ]; + userSettings = { + }; + }; +}