diff --git a/.vscode/settings.json b/.vscode/settings.json index 87ad5db..455a475 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -154,6 +154,7 @@ "noecho", "nonsponsored", "Noto", + "nprt", "nvme", "OCSP", "oderwat", diff --git a/flake.lock b/flake.lock index d584322..c53d0e6 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1738382607, - "narHash": "sha256-ppR81tMrcQk/wHm8MmKtp3mrtYmMTgF2lxLLXYwRsOM=", + "lastModified": 1739396257, + "narHash": "sha256-E+xGh25fyBLNo2FYxP4uHkTh4yh1C0AIyYpcVdW3CL0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "dc86c8feffa328d9050e039a1286e175af6d76d8", + "rev": "f61927ae7c2b28ee9d426114a06f185f4dea4301", "type": "gitlab" }, "original": { @@ -23,22 +23,6 @@ "type": "gitlab" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1629284811, @@ -79,11 +63,11 @@ ] }, "locked": { - "lastModified": 1738415006, - "narHash": "sha256-ZlLTnqIQQ8OE6AtT+fluB642j2R9tnvxHHtpnmLjSxQ=", + "lastModified": 1739381933, + "narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8544cd092047a7e92d0dce011108a563de7fc0f2", + "rev": "15b59d4191b993ebdfcb1f61b834fced217882ba", "type": "github" }, "original": { @@ -114,35 +98,13 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1738343111, - "narHash": "sha256-y9st4Y0p5ry+6QdlIGeqxAA6rbEIOO1uXdAc5jxV2Bc=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "51b9cce097da369550f45ac07879274dc8be81e4", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1738391520, - "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -154,11 +116,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -170,11 +132,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1738422722, - "narHash": "sha256-Q4vhtbLYWBUnjWD4iQb003Lt+N5PuURDad1BngGKdUs=", + "lastModified": 1739399097, + "narHash": "sha256-5U1YLh8bENPGtC6j6493qs3lK0PrzZw4omMvJUFOhEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "102a39bfee444533e6b4e8611d7e92aa39b7bec1", + "rev": "154a2c1abcea99a98f8b9344dfaba019a28162bd", "type": "github" }, "original": { @@ -185,22 +147,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1738163270, - "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1735563628, "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", @@ -248,11 +194,10 @@ "inputs": { "firefox-addons": "firefox-addons", "home-manager": "home-manager", - "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", "system_tools": "system_tools", "systems": "systems_3" @@ -265,11 +210,11 @@ ] }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": { @@ -287,11 +232,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1738431375, - "narHash": "sha256-jk6JrgqNe0dEPxV2xX/pBVsrPDfWaa033LKcyERkHJw=", + "lastModified": 1738434563, + "narHash": "sha256-RE+6AgQ/Q/yFBYDPlN+jSrhEKtZLBF8xlIsz2T78K68=", "owner": "RichieCahill", "repo": "system_tools", - "rev": "36764189680c9be26192ee94da1a3f33f890ff0d", + "rev": "7cff86220ce86a1083466e2fc8b947551ab577a3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ef3daee..3e173bb 100644 --- a/flake.nix +++ b/flake.nix @@ -38,11 +38,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -55,7 +50,6 @@ nixpkgs, home-manager, systems, - nixos-cosmic, sops-nix, ... }@inputs: diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix index e3f1d80..bb766fe 100644 --- a/systems/rhapsody-in-green/default.nix +++ b/systems/rhapsody-in-green/default.nix @@ -13,7 +13,6 @@ ./hardware.nix ./syncthing.nix inputs.nixos-hardware.nixosModules.framework-13-7040-amd - inputs.nixos-cosmic.nixosModules.default ]; networking = { @@ -25,8 +24,6 @@ services = { openssh.ports = [ 922 ]; - - desktopManager.cosmic.enable = true; }; system.stateVersion = "24.05"; diff --git a/users/richie/home/gui/firefox/search_engines.nix b/users/richie/home/gui/firefox/search_engines.nix index 898ee80..119751d 100644 --- a/users/richie/home/gui/firefox/search_engines.nix +++ b/users/richie/home/gui/firefox/search_engines.nix @@ -47,6 +47,21 @@ icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; definedAliases = [ "@n" ]; }; + "Nix Packages pr-tracker" = { + urls = [ + { + template = "https://nixpk.gs/pr-tracker.html?"; + params = [ + { + name = "pr"; + value = "{searchTerms}"; + } + ]; + } + ]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@nprt" ]; + }; "kagi" = { urls = [ {