Usunięcie plex-media-player i poprawki w Librewolf

- Usunięto `plex-media-player` z listy pakietów w konfiguracji NixOS. - Przeniesiono `mtab` w konfiguracji rozszerzeń Librewolf. - Dodano zakomentowaną konfigurację `MTAB_SAVE_FORMAT`.
ustawienie useGlobalPkgs na false
2025-02-20 01:36:55 +01:00 · 2025-02-19 15:40:25 +01:00 · 2025-02-19 15:28:45 +01:00 · 2025-02-19 01:52:49 +01:00 · 2025-02-19 01:38:41 +01:00 · 2025-02-17 23:23:53 +01:00
8 changed files with 941 additions and 25 deletions
--- a/.vscode/bookmarks.code-snippets
+++ b/.vscode/bookmarks.code-snippets
@@ -0,0 +1,65 @@
+{
+	// 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}\";",
+			"        }",
+			"      ];",
+			"    }",
+			"  ];",
+			"};"
+		]
+	}
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -18,5 +18,8 @@
  },
  "editor.formatOnPaste": true,
  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "jnoortheen.nix-ide"
+  "editor.defaultFormatter": "jnoortheen.nix-ide",
+  "[json]": {
+    "editor.defaultFormatter": "vscode.json-language-features"
+  }
 }
--- a/flake.lock
+++ b/flake.lock
@@ -87,14 +87,37 @@
        "type": "github"
      }
    },
+    "firefox-addons": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "pkgs/firefox-addons",
+        "lastModified": 1739909849,
+        "narHash": "sha256-BdW/c3AaLtjkF9tisUY4a7YWvKhj4qszwOnvUGXSN4Y=",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "rev": "5d1218489601a269098a180203f4f6d4db3746b9",
+        "type": "gitlab"
+      },
+      "original": {
+        "dir": "pkgs/firefox-addons",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "type": "gitlab"
+      }
+    },
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1736899990,
-        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
+        "lastModified": 1739223196,
+        "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
+        "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
        "type": "github"
      },
      "original": {
@@ -120,6 +143,21 @@
      }
    },
    "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",
@@ -228,11 +266,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739470101,
-        "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=",
+        "lastModified": 1739913864,
+        "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5031c6d2978109336637977c165f82aa49fa16a7",
+        "rev": "97ac0801d187b2911e8caa45316399de12f6f199",
        "type": "github"
      },
      "original": {
@@ -244,11 +282,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1739214665,
-        "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
+        "lastModified": 1739736696,
+        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
+        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
        "type": "github"
      },
      "original": {
@@ -261,6 +299,7 @@
    "root": {
      "inputs": {
        "auto-cpufreq": "auto-cpufreq",
+        "firefox-addons": "firefox-addons",
        "home-manager": "home-manager",
        "nixpkgs": "nixpkgs",
        "stylix": "stylix"
@@ -274,7 +313,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": [
@@ -291,11 +330,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1739375014,
-        "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=",
+        "lastModified": 1739909171,
+        "narHash": "sha256-GmuW8XkOF6lSEQBeXzUCyr6tetbbxX8wpNJlwFqT/9E=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777",
+        "rev": "aeb550add3bfa1ce3ce249c3b3dad71ebb018318",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/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;
--- a/hosts/garand-laptop/config/nixpkgs.codium.nix
+++ b/hosts/garand-laptop/config/nixpkgs.codium.nix
@@ -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=";
+            }
          ];
      })
    ];
--- a/hosts/garand-laptop/config/nixpkgs.nix
+++ b/hosts/garand-laptop/config/nixpkgs.nix
@@ -102,7 +102,6 @@
      tree
      greetd.tuigreet
      protonup
-      plex-media-player
      plexamp
      bitwarden-desktop
      vlc
@@ -139,6 +138,7 @@
      lazygit
      lutris
      gambit-chess
+      firefoxpwa
    ];
  };
 }
--- a/hosts/garand-laptop/home/programs.librewolf.nix
+++ b/hosts/garand-laptop/home/programs.librewolf.nix
--- a/hosts/garand-laptop/home/programs.nix
+++ b/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";
Author	SHA1	Message	Date
installer	c3cadbcb29	Usunięcie plex-media-player i poprawki w Librewolf - Usunięto `plex-media-player` z listy pakietów w konfiguracji NixOS. - Przeniesiono `mtab` w konfiguracji rozszerzeń Librewolf. - Dodano zakomentowaną konfigurację `MTAB_SAVE_FORMAT`.	2025-02-20 01:36:55 +01:00
installer	973dcd58a7	ustawienie useGlobalPkgs na false	2025-02-19 15:40:25 +01:00
installer	7cd4ab4e3d	aktualizacja flake, dodanie bookmarków i nowych searchenginów do librewolf	2025-02-19 15:28:45 +01:00
installer	da6e9496a3	dodanie pwa do librewolf	2025-02-19 01:52:49 +01:00
installer	d10f1b6191	Dodanie formatowania JSON i rozszerzeń dla Librewolf oraz Codium - Dodano domyślny format JSON w pliku `.vscode/settings.json` dla `vscode.json-language-features`. - Dodano rozszerzenie `prettify-json` do konfiguracji Codium. - Wprowadzono zmianę `extensions.autoDisableScopes = 0` w ustawieniach Librewolf. - Przebudowano strukturę konfiguracji rozszerzeń w `programs.librewolf.nix`, dodając sekcję `packages`.	2025-02-19 01:38:41 +01:00
installer	3c99fff890	Dodanie obsługi dodatków do Firefoksa - Dodano nowy input `firefox-addons` w `flake.nix` - Zaktualizowano `flake.lock` o nową zależność oraz nowsze wersje istniejących pakietów - Zmieniono konfigurację `programs.librewolf.nix`: - Dodano obsługę systemu `x86_64-linux` - Zmieniono ustawienia prywatności i sesji przeglądarki - Dodano obsługę DNS-over-HTTPS z Mullvad - Rozszerzono listę wyszukiwarek o YouTube, Wikipedia (PL), StackOverflow i Nix Wiki - Dodano listę preinstalowanych rozszerzeń (np. Bitwarden, uBlock Origin, SponsorBlock) - Dodano alias `os-up-fa` do aktualizacji `firefox-addons`	2025-02-17 23:23:53 +01:00
GarandPLG	b1a56e9614	Merge pull request 'test_split_home' (#2 ) from test_split_home into main Reviewed-on: #2	2025-02-17 20:41:55 +00:00