From bff6ccf55cb6ce587de4d04c6768c28eb0b6bf40 Mon Sep 17 00:00:00 2001 From: installer Date: Mon, 10 Mar 2025 10:52:38 +0100 Subject: [PATCH] rozbicie na mniejsze pliki --- .vscode/bookmarks.code-snippets | 12 ++- hosts/garand-laptop/config.nix | 8 ++ hosts/garand-laptop/config/nixpkgs.nix | 94 ------------------- .../garand-laptop/config/nixpkgs/clients.nix | 14 +++ .../config/nixpkgs/fundamentals.nix | 40 ++++++++ hosts/garand-laptop/config/nixpkgs/gaming.nix | 8 ++ .../config/nixpkgs/multimedia.nix | 17 ++++ hosts/garand-laptop/config/nixpkgs/tools.nix | 17 ++++ hosts/garand-laptop/config/nixpkgs/tty.nix | 19 ++++ .../garand-laptop/home/programs.librewolf.nix | 2 +- 10 files changed, 135 insertions(+), 96 deletions(-) create mode 100644 hosts/garand-laptop/config/nixpkgs/clients.nix create mode 100644 hosts/garand-laptop/config/nixpkgs/fundamentals.nix create mode 100644 hosts/garand-laptop/config/nixpkgs/gaming.nix create mode 100644 hosts/garand-laptop/config/nixpkgs/multimedia.nix create mode 100644 hosts/garand-laptop/config/nixpkgs/tools.nix create mode 100644 hosts/garand-laptop/config/nixpkgs/tty.nix diff --git a/.vscode/bookmarks.code-snippets b/.vscode/bookmarks.code-snippets index 5409f1f..9db4641 100644 --- a/.vscode/bookmarks.code-snippets +++ b/.vscode/bookmarks.code-snippets @@ -65,9 +65,19 @@ "nix-config": { "scope": "nix", "prefix": "nix-config", - "description": "Config do pluku .nix", + "description": "Config do pliku .nix", "body": [ "{pkgs, ...}: {}" ] + }, + "nix-config=nixpkgs": { + "scope": "nix", + "prefix": "nix-config-nixpkgs", + "description": "Config do pliku .nix z nixpkgs", + "body": [ + "{pkgs, ... }: {", + " environment.systemPackages = with pkgs; [];", + "}", + ] } } \ No newline at end of file diff --git a/hosts/garand-laptop/config.nix b/hosts/garand-laptop/config.nix index 8c85ff4..af516ea 100644 --- a/hosts/garand-laptop/config.nix +++ b/hosts/garand-laptop/config.nix @@ -8,8 +8,16 @@ ./config/hardware.nix ./config/localization.nix ./config/networking.nix + ./config/nixpkgs.nix + ./config/nixpkgs/clients.nix ./config/nixpkgs/codium.nix + ./config/nixpkgs/fundamentals.nix + ./config/nixpkgs/gaming.nix + ./config/nixpkgs/multimedia.nix + ./config/nixpkgs/tools.nix + ./config/nixpkgs/tty.nix + ./config/programs.nix ./config/security.nix ./config/services.nix diff --git a/hosts/garand-laptop/config/nixpkgs.nix b/hosts/garand-laptop/config/nixpkgs.nix index 8469474..dcb4818 100644 --- a/hosts/garand-laptop/config/nixpkgs.nix +++ b/hosts/garand-laptop/config/nixpkgs.nix @@ -48,99 +48,5 @@ ZANEYOS_VERSION = "2.2"; ZANEYOS = "true"; }; - - systemPackages = with pkgs; [ - wget - killall - eza - git - cmatrix - lolcat - libvirt - lxqt.lxqt-policykit - lm_sensors - unzip - unrar - libnotify - v4l-utils - ydotool - duf - ncdu - wl-clipboard - pciutils - ffmpeg - socat - cowsay - ripgrep - lshw - bat - pkg-config - meson - hyprpicker - ninja - brightnessctl - virt-viewer - swappy - appimage-run - networkmanagerapplet - yad - inxi - playerctl - nh - nixfmt-rfc-style - discord - libvirt - swww - grim - slurp - file-roller - swaynotificationcenter - imv - mpv - gimp - pavucontrol - tree - greetd.tuigreet - protonup - plexamp - bitwarden-desktop - vlc - nixd - ungoogled-chromium - slack - alejandra - tutanota-desktop - ookla-speedtest - # rustdesk - bun - docker - docker-compose - docker-slim - sl - nodejs - kdePackages.kdenlive - galculator - obs-studio - thefuck - cifs-utils - libreoffice - bastet - nsnake - exiftool - python3 - figlet - fortune - wtf - pipes - cava - wineWowPackages.waylandFull # wine64 - lazydocker - lazygit - lutris - gambit-chess - firefoxpwa - tty-solitaire - nextcloud-client - ]; }; } diff --git a/hosts/garand-laptop/config/nixpkgs/clients.nix b/hosts/garand-laptop/config/nixpkgs/clients.nix new file mode 100644 index 0000000..7827c3e --- /dev/null +++ b/hosts/garand-laptop/config/nixpkgs/clients.nix @@ -0,0 +1,14 @@ +# Klienty +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + # rustdesk + nextcloud-client + plexamp + bitwarden-desktop + tutanota-desktop + discord + slack + ungoogled-chromium + # firefoxpwa + ]; +} diff --git a/hosts/garand-laptop/config/nixpkgs/fundamentals.nix b/hosts/garand-laptop/config/nixpkgs/fundamentals.nix new file mode 100644 index 0000000..af3dd1f --- /dev/null +++ b/hosts/garand-laptop/config/nixpkgs/fundamentals.nix @@ -0,0 +1,40 @@ +# Fundamentalne programy dla systemu +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + wget + killall + eza + git + libnotify + v4l-utils + ydotool + duf + ncdu + wl-clipboard + pciutils + ffmpeg + socat + ripgrep + lshw + bat + pkg-config + meson + ninja + brightnessctl + swappy + appimage-run + networkmanagerapplet + yad + inxi + playerctl + nh + nixfmt-rfc-style + file-roller + tree + nixd + alejandra + docker + docker-compose + cifs-utils + ]; +} diff --git a/hosts/garand-laptop/config/nixpkgs/gaming.nix b/hosts/garand-laptop/config/nixpkgs/gaming.nix new file mode 100644 index 0000000..27cf9b9 --- /dev/null +++ b/hosts/garand-laptop/config/nixpkgs/gaming.nix @@ -0,0 +1,8 @@ +# Narzędzia do gier +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + protonup + wineWowPackages.waylandFull # wine64 + lutris + ]; +} diff --git a/hosts/garand-laptop/config/nixpkgs/multimedia.nix b/hosts/garand-laptop/config/nixpkgs/multimedia.nix new file mode 100644 index 0000000..ed6dcfa --- /dev/null +++ b/hosts/garand-laptop/config/nixpkgs/multimedia.nix @@ -0,0 +1,17 @@ +# Programy multimedialne +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + swww + grim + slurp + swaynotificationcenter + imv + mpv + gimp + pavucontrol + vlc + kdePackages.kdenlive + obs-studio + libreoffice + ]; +} diff --git a/hosts/garand-laptop/config/nixpkgs/tools.nix b/hosts/garand-laptop/config/nixpkgs/tools.nix new file mode 100644 index 0000000..78923b1 --- /dev/null +++ b/hosts/garand-laptop/config/nixpkgs/tools.nix @@ -0,0 +1,17 @@ +# Narzędzia systemowe +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + lm_sensors + unzip + unrar + hyprpicker + virt-viewer + libvirt + greetd.tuigreet + galculator + thefuck + lazydocker + lazygit + docker-slim + ]; +} diff --git a/hosts/garand-laptop/config/nixpkgs/tty.nix b/hosts/garand-laptop/config/nixpkgs/tty.nix new file mode 100644 index 0000000..85fc2d8 --- /dev/null +++ b/hosts/garand-laptop/config/nixpkgs/tty.nix @@ -0,0 +1,19 @@ +# Gry w terminalu +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + gambit-chess + tty-solitaire + bastet + nsnake + cmatrix + lolcat + cowsay + sl + figlet + fortune + wtf + pipes + cava + ookla-speedtest + ]; +} diff --git a/hosts/garand-laptop/home/programs.librewolf.nix b/hosts/garand-laptop/home/programs.librewolf.nix index 6588968..7665f75 100644 --- a/hosts/garand-laptop/home/programs.librewolf.nix +++ b/hosts/garand-laptop/home/programs.librewolf.nix @@ -263,7 +263,7 @@ hoppscotch return-youtube-dislikes sponsorblock - pwas-for-firefox + # pwas-for-firefox mtab # MTAB_SAVE_FORMAT_JTIyJTdCJTVDJTIyb3B0aW9ucyU1QyUyMiUzQSU3QiU1QyUyMnNob3dPcHRpb25zQnV0dG9uJTVDJTIyJTNBdHJ1ZSU3RCUyQyU1QyUyMnVzZXIlNUMlMjIlM0ElN0IlNUMlMjJuYW1lJTVDJTIyJTNBJTVDJTIyR2FyYW5kX1BMRyU1QyUyMiU3RCUyQyU1QyUyMnRpdGxlJTVDJTIyJTNBJTdCJTVDJTIyZGVmYXVsdFRpdGxlJTVDJTIyJTNBJTVDJTIyTm93YSUyMHphayVDNSU4MmFka2ElNUMlMjIlMkMlNUMlMjJkeW5hbWljJTVDJTIyJTNBJTdCJTVDJTIyZW5hYmxlZCU1QyUyMiUzQXRydWUlN0QlMkMlNUMlMjJmYXZpY29uVHlwZSU1QyUyMiUzQSU1QyUyMmN1c3RvbSU1QyUyMiU3RCUyQyU1QyUyMm1lc3NhZ2UlNUMlMjIlM0ElN0IlNUMlMjJlbmFibGVkJTVDJTIyJTNBZmFsc2UlMkMlNUMlMjJmb250JTVDJTIyJTNBJTdCJTVDJTIydHlwZSU1QyUyMiUzQSU1QyUyMmRlZmF1bHQlNUMlMjIlMkMlNUMlMjJjdXN0b20lNUMlMjIlM0ElNUMlMjIlNUMlMjIlN0QlMkMlNUMlMjJ0ZXh0Q29sb3IlNUMlMjIlM0ElNUMlMjIlMjNmZmZmZmYlNUMlMjIlMkMlNUMlMjJ0ZXh0U2l6ZSU1QyUyMiUzQTMuNzUlMkMlNUMlMjJ0eXBlJTVDJTIyJTNBJTVDJTIydGltZS0yNCU1QyUyMiUyQyU1QyUyMmN1c3RvbVRleHQlNUMlMjIlM0ElNUMlMjJ5b3VyJTIwY3VzdG9tJTIwdGV4dCU1QyUyMiUyQyU1QyUyMndlYXRoZXIlNUMlMjIlM0ElN0IlNUMlMjJ1bml0c1R5cGUlNUMlMjIlM0ElNUMlMjJmJTVDJTIyJTdEJTdEJTJDJTVDJTIyd2FsbHBhcGVyJTVDJTIyJTNBJTdCJTVDJTIydHlwZSU1QyUyMiUzQSU1QyUyMmZpbGVVcGxvYWQlNUMlMjIlMkMlNUMlMjJlbmFibGVkJTVDJTIyJTNBdHJ1ZSUyQyU1QyUyMnVybCU1QyUyMiUzQSU1QyUyMi4lMkZ3YWxscGFwZXJzJTJGYmctMS5wbmclNUMlMjIlMkMlNUMlMjJyZXNpemUlNUMlMjIlM0ElN0IlNUMlMjJ3JTVDJTIyJTNBMTkyMCUyQyU1QyUyMmglNUMlMjIlM0ExMDgwJTdEJTdEJTJDJTVDJTIydWklNUMlMjIlM0ElN0IlNUMlMjJzdHlsZSU1QyUyMiUzQSU1QyUyMmdsYXNzJTVDJTIyJTJDJTVDJTIyZ2xhc3NDb2xvciU1QyUyMiUzQSU1QyUyMiUyM2ZmZmZmZjIwJTVDJTIyJTJDJTVDJTIyYmx1clN0cmVuZ3RoJTVDJTIyJTNBJTVDJTIyMzJweCU1QyUyMiUyQyU1QyUyMmZvcmVncm91bmRDb2xvciU1QyUyMiUzQSU1QyUyMiUyMzI2MjYyNiU1QyUyMiUyQyU1QyUyMmJhY2tncm91bmRDb2xvciU1QyUyMiUzQSU1QyUyMiUyMzE3MTcxNyU1QyUyMiUyQyU1QyUyMmhpZ2hsaWdodENvbG9yJTVDJTIyJTNBJTVDJTIyJTIzZmZmZmZmMjAlNUMlMjIlMkMlNUMlMjJjb3JuZXJTdHlsZSU1QyUyMiUzQSU1QyUyMnJvdW5kJTVDJTIyJTJDJTVDJTIyY3VzdG9tQ1NTJTVDJTIyJTNBJTVDJTIyJTJGKiUyMGlucHV0JTIwY3VzdG9tJTIwY3NzLi4uJTIwKiUyRiU1QyUyMiU3RCUyQyU1QyUyMmFuaW1hdGlvbnMlNUMlMjIlM0ElN0IlNUMlMjJlbmFibGVkJTVDJTIyJTNBdHJ1ZSUyQyU1QyUyMmJvb2ttYXJrVGltaW5nJTVDJTIyJTNBJTVDJTIybGVmdCU1QyUyMiUyQyU1QyUyMmluaXRpYWxUeXBlJTVDJTIyJTNBJTVDJTIyYW5pbWF0ZS1kb3duLWZhbGwlNUMlMjIlMkMlNUMlMjJzZWFyY2hUeXBlJTVDJTIyJTNBJTVDJTIyYW5pbWF0ZS1wYWdlLXNocmluayU1QyUyMiUyQyU1QyUyMmJvb2ttYXJrVHlwZSU1QyUyMiUzQSU1QyUyMmFuaW1hdGUtcGFnZS11cCU1QyUyMiU3RCUyQyU1QyUyMnNlYXJjaCU1QyUyMiUzQSU3QiU1QyUyMmVuYWJsZWQlNUMlMjIlM0F0cnVlJTJDJTVDJTIyZm9udCU1QyUyMiUzQSU3QiU1QyUyMnR5cGUlNUMlMjIlM0ElNUMlMjJkZWZhdWx0JTVDJTIyJTJDJTVDJTIyY3VzdG9tJTVDJTIyJTNBJTVDJTIyJTVDJTIyJTdEJTJDJTVDJTIydGV4dENvbG9yJTVDJTIyJTNBJTVDJTIyJTIzMDAwMDAwJTVDJTIyJTJDJTVDJTIycGxhY2Vob2xkZXJUZXh0JTVDJTIyJTNBJTVDJTIyU3p1a2FqLi4uJTVDJTIyJTJDJTVDJTIyYm9va21hcmtQbGFjZWhvbGRlclRleHQlNUMlMjIlM0ElNUMlMjJaYWslQzUlODIlQzQlODVka2kuLi4lNUMlMjIlMkMlNUMlMjJwbGFjZWhvbGRlclRleHRDb2xvciU1QyUyMiUzQSU1QyUyMiUyMzAxMDEwMCU1QyUyMiUyQyU1QyUyMnNlYXJjaEljb25Db2xvciU1QyUyMiUzQSU1QyUyMiUyMzE0YjhhNiU1QyUyMiUyQyU1QyUyMmJvb2ttYXJrSWNvbkNvbG9yJTVDJTIyJTNBJTVDJTIyJTIzM2I4MmY2JTVDJTIyJTJDJTVDJTIyc2VsZWN0SWNvbkNvbG9yJTVDJTIyJTNBJTVDJTIyJTIzZjU5ZTBiJTVDJTIyJTJDJTVDJTIyZW5naW5lJTVDJTIyJTNBJTVDJTIyZHVja2R1Y2tnbyU1QyUyMiUyQyU1QyUyMnVzZUN1c3RvbUVuZ2luZSU1QyUyMiUzQXRydWUlMkMlNUMlMjJjdXN0b21FbmdpbmVVUkwlNUMlMjIlM0ElNUMlMjJodHRwcyUzQSUyRiUyRnNlYXJjaC5nYXJhbmRwbGcuY29tJTJGc2VhcmNoJTNGcSUzRCU3QiU3RCU1QyUyMiUyQyU1QyUyMmZvY3VzZWRCb3JkZXJDb2xvciU1QyUyMiUzQSU1QyUyMiUyMzBlYTVlOSU1QyUyMiUyQyU1QyUyMmFzc2lzdCU1QyUyMiUzQSU3QiU1QyUyMmRhdGUlNUMlMjIlM0F0cnVlJTJDJTVDJTIybWF0aCU1QyUyMiUzQXRydWUlMkMlNUMlMjJkZWZpbml0aW9ucyU1QyUyMiUzQXRydWUlMkMlNUMlMjJjb252ZXJzaW9ucyU1QyUyMiUzQXRydWUlN0QlN0QlMkMlNUMlMjJob3RrZXlzJTVDJTIyJTNBJTdCJTVDJTIyZW5hYmxlZCU1QyUyMiUzQWZhbHNlJTJDJTVDJTIyYWN0aXZhdGlvbktleSU1QyUyMiUzQSU1QyUyMiUyMCU1QyUyMiUyQyU1QyUyMmNsb3NlUGFnZUtleSU1QyUyMiUzQSU1QyUyMnglNUMlMjIlMkMlNUMlMjJzZWFyY2hCb29rbWFya3NLZXklNUMlMjIlM0ElNUMlMjJiJTVDJTIyJTdEJTJDJTVDJTIyYm9va21hcmtzJTVDJTIyJTNBJTdCJTVDJTIydHlwZSU1QyUyMiUzQSU1QyUyMmRlZmF1bHQtYmxvY2t5JTVDJTIyJTJDJTVDJTIybnVtYmVyS2V5cyU1QyUyMiUzQWZhbHNlJTJDJTVDJTIydXNlckRlZmluZWRDb2xzJTVDJTIyJTNBbnVsbCUyQyU1QyUyMmxpbmVPcmllbnRhdGlvbiU1QyUyMiUzQSU1QyUyMnRvcCU1QyUyMiUyQyU1QyUyMnVzZXJEZWZpbmVkJTVDJTIyJTNBJTVCJTdCJTVDJTIydHlwZSU1QyUyMiUzQSU1QyUyMmJvb2ttYXJrJTVDJTIyJTJDJTVDJTIybmFtZSU1QyUyMiUzQSU1QyUyMmdpdGh1YiU1QyUyMiUyQyU1QyUyMnVybCU1QyUyMiUzQSU1QyUyMmh0dHBzJTNBJTJGJTJGZ2l0aHViLmNvbSU1QyUyMiUyQyU1QyUyMmNvbG9yJTVDJTIyJTNBJTVDJTIyJTIzNjM2NmYxJTVDJTIyJTJDJTVDJTIyaWNvblR5cGUlNUMlMjIlM0ElNUMlMjJyaS1naXRodWItZmlsbCU1QyUyMiUyQyU1QyUyMmljb25Db2xvciU1QyUyMiUzQSU1QyUyMiUyM2ZmZmZmZiU1QyUyMiUyQyU1QyUyMmZpbGwlNUMlMjIlM0ElNUMlMjIlNUMlMjIlN0QlMkMlN0IlNUMlMjJ0eXBlJTVDJTIyJTNBJTVDJTIyYm9va21hcmslNUMlMjIlMkMlNUMlMjJuYW1lJTVDJTIyJTNBJTVDJTIyeW91dHViZSU1QyUyMiUyQyU1QyUyMnVybCU1QyUyMiUzQSU1QyUyMmh0dHBzJTNBJTJGJTJGeW91dHViZS5jb20lNUMlMjIlMkMlNUMlMjJjb2xvciU1QyUyMiUzQSU1QyUyMiUyM2Y0M2Y1ZSU1QyUyMiUyQyU1QyUyMmljb25UeXBlJTVDJTIyJTNBJTVDJTIycmkteW91dHViZS1maWxsJTVDJTIyJTJDJTVDJTIyaWNvbkNvbG9yJTVDJTIyJTNBJTVDJTIyJTIzZmZmZmZmJTVDJTIyJTJDJTVDJTIyZmlsbCU1QyUyMiUzQSU1QyUyMiU1QyUyMiU3RCUyQyU3QiU1QyUyMnR5cGUlNUMlMjIlM0ElNUMlMjJib29rbWFyayU1QyUyMiUyQyU1QyUyMm5hbWUlNUMlMjIlM0ElNUMlMjJyZWRkaXQlNUMlMjIlMkMlNUMlMjJ1cmwlNUMlMjIlM0ElNUMlMjJodHRwcyUzQSUyRiUyRnd3dy5yZWRkaXQuY29tJTVDJTIyJTJDJTVDJTIyY29sb3IlNUMlMjIlM0ElNUMlMjIlMjNmOTczMTYlNUMlMjIlMkMlNUMlMjJpY29uVHlwZSU1QyUyMiUzQSU1QyUyMnJpLXJlZGRpdC1maWxsJTVDJTIyJTJDJTVDJTIyaWNvbkNvbG9yJTVDJTIyJTNBJTVDJTIyJTIzZmZmZmZmJTVDJTIyJTJDJTVDJTIyZmlsbCU1QyUyMiUzQSU1QyUyMiU1QyUyMiU3RCUyQyU3QiU1QyUyMnR5cGUlNUMlMjIlM0ElNUMlMjJib29rbWFyayU1QyUyMiUyQyU1QyUyMm5hbWUlNUMlMjIlM0ElNUMlMjJsb2NhbGhvc3QlNUMlMjIlMkMlNUMlMjJ1cmwlNUMlMjIlM0ElNUMlMjJodHRwJTNBJTJGJTJGbG9jYWxob3N0JTNBMzAwMCU1QyUyMiUyQyU1QyUyMmNvbG9yJTVDJTIyJTNBJTVDJTIyJTIzMTRiOGE2JTVDJTIyJTJDJTVDJTIyaWNvblR5cGUlNUMlMjIlM0ElNUMlMjJyaS1nbG9iYWwtZmlsbCU1QyUyMiUyQyU1QyUyMmljb25Db2xvciU1QyUyMiUzQSU1QyUyMiUyM2ZmZmZmZiU1QyUyMiUyQyU1QyUyMmZpbGwlNUMlMjIlM0ElNUMlMjIlNUMlMjIlN0QlNUQlMkMlNUMlMjJkZWZhdWx0QmxvY2t5Q29scyU1QyUyMiUzQTUlMkMlNUMlMjJkZWZhdWx0QmxvY2t5Q29sb3JUeXBlJTVDJTIyJTNBJTVDJTIycmFuZG9tJTVDJTIyJTJDJTVDJTIyZGVmYXVsdEJsb2NreUNvbG9yJTVDJTIyJTNBJTVDJTIyJTIzZmZmZmZmJTVDJTIyJTJDJTVDJTIyZGVmYXVsdEZhdmljb25Tb3VyY2UlNUMlMjIlM0ElNUMlMjJkdWNrZHVja2dvJTVDJTIyJTJDJTVDJTIyc2hvd0Jvb2ttYXJrTmFtZXMlNUMlMjIlM0F0cnVlJTJDJTVDJTIyYm9va21hcmtzTG9jYXRpb25GaXJlZm94JTVDJTIyJTNBJTVDJTIydG9vbGJhciU1QyUyMiU3RCUyQyU1QyUyMmV4dHJhcyU1QyUyMiUzQSU3QiU1QyUyMnNub3clNUMlMjIlM0ElN0IlNUMlMjJlbmFibGVkJTVDJTIyJTNBJTVDJTIyb2ZmJTVDJTIyJTdEJTdEJTdEJTIy ];