next

- Usunięto `plex-media-player` z listy pakietów w konfiguracji NixOS.
- Przeniesiono `mtab` w konfiguracji rozszerzeń Librewolf.
- Dodano zakomentowaną konfigurację `MTAB_SAVE_FORMAT`.

.vscode/bookmarks.code-snippets

@@ -0,0 +1,83 @@
+{
+	// Place your zaneyos workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and 
+	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope 
+	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is 
+	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are: 
+	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. 
+	// Placeholders with the same ids are connected.
+	// Example:
+	// "Print to console": {
+	// 	"scope": "javascript,typescript",
+	// 	"prefix": "log",
+	// 	"body": [
+	// 		"console.log('$1');",
+	// 		"$2"
+	// 	],
+	// 	"description": "Log output to console"
+	// }
+	"bm-link": {
+		"scope": "nix",
+		"prefix": "bm-link",
+		"body": [
+      "{",
+      "  name = \"\";",
+      "  tags = [];",
+      "  keyword = \"@\";",
+      "  url = \"\";",
+      "}"
+		],
+		"description": "Home-manager Bookmark link"
+	},
+	"bm-folder": {
+		"scope": "nix",
+		"prefix": "bm-folder",
+		"body": [
+      "{",
+      "  name = \"\";",
+      "  toolbar = true;",
+      "  bookmarks = [];",
+      "}"
+		],
+		"description": "Home-manager Bookmark folder"
+	},
+	"search-engine": {
+		"scope": "nix",
+		"prefix": "search-engine",
+		"description": "Home-manager Search engine",
+		"body": [
+      "\"\" = {",
+			"  definedAliases = [];",
+			"  icon = \"\";",
+			"  urls = [",
+			"    {",
+			"      template = \"\";",
+			"      params = [",
+			"        {",
+			"          name = \"\";",
+			"          value = \"{searchTerms}\";",
+			"        }",
+			"      ];",
+			"    }",
+			"  ];",
+			"};"
+		]
+	},
+	"nix-config": {
+		"scope": "nix",
+		"prefix": "nix-config",
+		"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; [];",
+			"}",
+		]
+	}
+}

.vscode/settings.json

@@ -18,5 +18,10 @@
   },
   "editor.formatOnPaste": true,
   "editor.formatOnSave": true,
-  "editor.defaultFormatter": "jnoortheen.nix-ide"
+  "[nix]": {
+    "editor.defaultFormatter": "jnoortheen.nix-ide",
+  },
+  "[json]": {
+    "editor.defaultFormatter": "vscode.json-language-features"
+  }
 }

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739098586,
+        "lastModified": 1740813555,
-        "narHash": "sha256-08FW+tVGWQKdiPZqXk6FO1JNB/Zybi7IYSWSGpp8V0Y=",
+        "narHash": "sha256-GvkG6zoBsWgI7pbt92NZjGcOZMYC1C6pW8Lc4W1xMBU=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "e6bbd2c8335a33f25a3fcb3bd2376e790f460ba2",
+        "rev": "6be154724337fa74236ee811150872304db21d8b",
         "type": "github"
       },
       "original": {
@@ -87,14 +87,37 @@
         "type": "github"
       }
     },
+    "firefox-addons": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "pkgs/firefox-addons",
+        "lastModified": 1741379467,
+        "narHash": "sha256-f314Ke28BGoVh4TK8FCzlPZgOl+oV7PvLyPF++ln9M4=",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "rev": "0b95936d94ea2a3ce66538f299351cf0b491aa15",
+        "type": "gitlab"
+      },
+      "original": {
+        "dir": "pkgs/firefox-addons",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "type": "gitlab"
+      }
+    },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1736899990,
+        "lastModified": 1739223196,
-        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
+        "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
+        "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
         "type": "github"
       },
       "original": {
@@ -104,7 +127,6 @@
       }
     },
     "flake-compat": {
-      "flake": false,
       "locked": {
         "lastModified": 1733328505,
         "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@@ -119,7 +141,44 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
+      "locked": {
+        "lastModified": 1629284811,
+        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "inputs": {
         "systems": [
           "stylix",
@@ -169,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735882644,
+        "lastModified": 1737465171,
-        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
+        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
         "type": "github"
       },
       "original": {
@@ -228,11 +287,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739470101,
+        "lastModified": 1741378606,
-        "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=",
+        "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5031c6d2978109336637977c165f82aa49fa16a7",
+        "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2",
         "type": "github"
       },
       "original": {
@@ -244,11 +303,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739214665,
+        "lastModified": 1741246872,
-        "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
+        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
+        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
         "type": "github"
       },
       "original": {
@@ -258,9 +317,33 @@
         "type": "github"
       }
     },
+    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1740408283,
+        "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "496a4a11162bdffb9a7b258942de138873f019f7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "auto-cpufreq": "auto-cpufreq",
+        "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "stylix": "stylix"
@@ -274,7 +357,7 @@
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
         "home-manager": [
@@ -283,6 +366,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "nur": "nur",
         "systems": "systems",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
@@ -291,11 +375,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1739375014,
+        "lastModified": 1741381249,
-        "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=",
+        "narHash": "sha256-lr62m73oNjkSX0ar7tPalTSTzaqCsuZCEYyK8mPbXPU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777",
+        "rev": "4891f1471b682af073574dc51fa4810f1470ef8f",
         "type": "github"
       },
       "original": {
@@ -356,11 +440,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1737565458,
+        "lastModified": 1740351358,
-        "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=",
+        "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9",
+        "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184",
         "type": "github"
       },
       "original": {
@@ -372,11 +456,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1735737224,
+        "lastModified": 1740272597,
-        "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=",
+        "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64",
+        "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0",
         "type": "github"
       },
       "original": {
@@ -400,6 +484,28 @@
         "repo": "base16-zed",
         "type": "github"
       }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -18,6 +18,10 @@
       url = "github:AdnanHodzic/auto-cpufreq";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    firefox-addons = {
+      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -25,7 +29,7 @@
     home-manager,
     ...
   } @ inputs: let
-    system = "aarch64-linux";
+    system = "x86_64-linux";
     host = "garand-laptop";
     username = "garand_plg";
   in {
@@ -44,11 +48,12 @@
           home-manager.nixosModules.home-manager
           {
             home-manager.extraSpecialArgs = {
-              inherit username;
+              inherit system;
               inherit inputs;
+              inherit username;
               inherit host;
             };
-            home-manager.useGlobalPkgs = true;
+            home-manager.useGlobalPkgs = false;
             home-manager.useUserPackages = true;
             home-manager.backupFileExtension = "backup";
             home-manager.users.${username} = import ./hosts/${host}/home.nix;

hosts/garand-laptop/config.nix

@@ -8,8 +8,16 @@
     ./config/hardware.nix
     ./config/localization.nix
     ./config/networking.nix
+
     ./config/nixpkgs.nix
-    ./config/nixpkgs.codium.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,97 +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
-      plex-media-player
-      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
-    ];
   };
 }

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/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
@@ -42,6 +42,12 @@
             yoavbls.pretty-ts-errors
           ]
           ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+            {
+              name = "python";
+              publisher = "ms-python";
+              version = "2025.3.2025030601";
+              hash = "sha256-xK9esQjcdDz8pNgGjB3HUKpwySSykNTXo3ubDW0nBR8=";
+            }
             {
               name = "goto-alias";
               publisher = "antfu";
@@ -78,12 +84,6 @@
               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";
@@ -234,6 +234,12 @@
               version = "1.12.1";
               hash = "sha256-WG2/MWxU/XhSOjXuBoyszpD/HFb8mfrt525povSEES4=";
             }
+            {
+              name = "prettify-json";
+              publisher = "mohsen1";
+              version = "0.0.3";
+              hash = "sha256-lvds+lFDzt1s6RikhrnAKJipRHU+Dk85ZO49d1sA8uo=";
+            }
           ];
       })
     ];

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 @@
+# Aplikacje terminalowe
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    gambit-chess
+    tty-solitaire
+    bastet
+    nsnake
+    cmatrix
+    lolcat
+    cowsay
+    sl
+    figlet
+    fortune
+    wtf
+    pipes
+    cava
+    ookla-speedtest
+  ];
+}

hosts/garand-laptop/home/programs.nix

@@ -72,6 +72,7 @@ in {
         os-up-hm = "sudo nix flake update --update-input home-manager";
         os-up-sx = "sudo nix flake update --update-input stylix";
         os-up-af = "sudo nix flake update --update-input auto-cpufreq";
+        os-up-fa = "sudo nix flake update --update-input firefox-addons";
         fr = "nh os switch --hostname ${host} /home/${username}/zaneyos";
         fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos";
         hypr-cli = "hyprctl clients";
@@ -103,7 +104,7 @@ in {
           hide_cursor = true;
           no_fade_in = false;
         };
-        background = lib.mkDefault [
+        background = lib.mkForce [
           {
             path = "/home/${username}/Pictures/Wallpapers/attack-on-titan-mikasa-ackerman.jpg";
             blur_passes = 3;