rozbicie na mniejsze pliki

.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; [];",
+			"}",
+		]
 	}
 }

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

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
-    ];
   };
 }

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
+  ];
+}

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
+  ];
+}

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
+  ];
+}

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
+  ];
+}

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
+  ];
+}

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
+  ];
+}