From 780922cfb5bcef318548f4f4ae632871b2785489 Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 13 Aug 2024 20:19:30 +0900 Subject: [PATCH] Manual Flake update. HM: Firefox and Plasma updates --- flake.lock | 120 ++++++++--------- .../desktops/plasma6/plasma-manager.nix | 2 - home-manager/common/software/gui/firefox.nix | 124 +++++++++++------- nixos/common/desktops/plasma6/default.nix | 3 + 4 files changed, 141 insertions(+), 108 deletions(-) diff --git a/flake.lock b/flake.lock index f3dad849..67db0bc1 100644 --- a/flake.lock +++ b/flake.lock @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1723080788, - "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", + "lastModified": 1723426710, + "narHash": "sha256-yrS9al6l3fYfFfvovnyBWnyELDQOdfKyai4K/jKgoBw=", "owner": "nix-community", "repo": "disko", - "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", + "rev": "0d510fe40b56ed74907a021d7e1ffd0042592914", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1722857853, - "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=", + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", "type": "github" }, "original": { @@ -568,11 +568,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1723211096, - "narHash": "sha256-zQaXLlVCLhT9gP31+wXDT3akOnazm26sVrCxCx4YQ/E=", + "lastModified": 1723367191, + "narHash": "sha256-noi5tre7BLtxImN38jEHeVOtOG1Xu37sJFwHKSAPHjo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3b711ac1a2cf4d0bb4cb6630250e1af283227434", + "rev": "91178062f365b64eece94c5dff93e09b07e87d9d", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1722773431, - "narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=", + "lastModified": 1723378259, + "narHash": "sha256-8JZVHJAoDgbAk9nn7blBB+wnQbgCq1lIxBsyT7qgeI8=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "04a4b4d84e02590715e753da3d35fb03cddc6425", + "rev": "8834c9b308bf4d9d448dd73be5f9782f4635d4ca", "type": "github" }, "original": { @@ -654,11 +654,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721505437, - "narHash": "sha256-sZpyyf9EiRVyEA9vUVWNxu8yI9MU0nhlEuPBL3hvC60=", + "lastModified": 1723372011, + "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "2e522fb78d7613cecaf683875ab27b6c90e8a84f", + "rev": "8802412b8747633e9d80639897e4d58fa6290909", "type": "github" }, "original": { @@ -734,11 +734,11 @@ ] }, "locked": { - "lastModified": 1723078345, - "narHash": "sha256-HSxOQEKNZXiJe9aWnckTTCThOhcRCabwHa32IduDKLk=", + "lastModified": 1723444610, + "narHash": "sha256-WzhuUR2ZwafNzBh0VAbk3+320xd2sNWdZdjZa0S9ydY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d6c5d29f58acc10ea82afff1de2b28f038f572bd", + "rev": "a220fc3a6e144f12f0c3dc3e4d01d44c2e6b0b85", "type": "github" }, "original": { @@ -781,11 +781,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1722732880, - "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", + "lastModified": 1723337705, + "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", + "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a", "type": "github" }, "original": { @@ -828,11 +828,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723362943, + "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "a58bc8ad779655e790115244571758e8de055e3d", "type": "github" }, "original": { @@ -849,11 +849,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1723306957, - "narHash": "sha256-fuXCd2b3H+cnmkWSPc5VacpS+3QvZnU3fx2HOpAfH0g=", + "lastModified": 1723533457, + "narHash": "sha256-87miOcnZMq3xrObLiJNLHSlVQf4B/aEbd7PjEbujbxw=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "797dc6fb81746869b72537de50a2f3eee4d4a555", + "rev": "0578986bd58e39becdfccf32742e8323bba17f16", "type": "github" }, "original": { @@ -864,11 +864,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722987190, - "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", + "lastModified": 1723400035, + "narHash": "sha256-WoKZDlBEdMhP+hjquBAh0BhUJbcH2+U8g2mHOr1mv8I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", + "rev": "a731b45590a5169542990c36ffcde6cebd9a3356", "type": "github" }, "original": { @@ -879,11 +879,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1720781449, - "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "type": "github" }, "original": { @@ -895,11 +895,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723362943, + "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "a58bc8ad779655e790115244571758e8de055e3d", "type": "github" }, "original": { @@ -911,11 +911,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722791413, - "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", + "lastModified": 1723282977, + "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", + "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "type": "github" }, "original": { @@ -969,11 +969,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1722925293, - "narHash": "sha256-saXm5dd/e3PMsYTEcp1Qbzifm3KsZtNFkrWjmLhXHGE=", + "lastModified": 1723536338, + "narHash": "sha256-1bSEOtZBsAeCkg5vdDbDgOT3z91K8L/KE2s7J9hLYHw=", "owner": "nix-community", "repo": "nixvim", - "rev": "170df9814c3e41d5a4d6e3339e611801b1f02ce2", + "rev": "0b6aa80acbcb8387f2a4affb3dd22960ac2899aa", "type": "github" }, "original": { @@ -985,11 +985,11 @@ }, "nur": { "locked": { - "lastModified": 1723333488, - "narHash": "sha256-doh2p9FBCa6ZKn1b6huobhL4JIj6WbpmljMt7s+XV9I=", + "lastModified": 1723542335, + "narHash": "sha256-+aeSdvjQqZ9ofKrxQs4zz/VyyAf5WGJmBWG1BsORadQ=", "owner": "nix-community", "repo": "NUR", - "rev": "6fa6d1546dfc0b15f8ba384b80b8f03c81d9471a", + "rev": "7df50126eb1153c563673fdde8433f807ff8613c", "type": "github" }, "original": { @@ -1006,11 +1006,11 @@ ] }, "locked": { - "lastModified": 1723232379, - "narHash": "sha256-F4Y3f9305aHGWKqAd3s2GyNRONdpDBuNuK4TCSdaHz8=", + "lastModified": 1723483411, + "narHash": "sha256-h6F9JK9PrrTmt5WgsZChLCn7ECk+G/cYJL2CuQVY/Cc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "22bea90404c5ff6457913a03c1a54a3caa5b1c57", + "rev": "b3b9d4ce20d75319c20a7faada08ad9135a1f008", "type": "github" }, "original": { @@ -1092,11 +1092,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1722897572, - "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { @@ -1173,11 +1173,11 @@ ] }, "locked": { - "lastModified": 1720930114, - "narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=", + "lastModified": 1723303070, + "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "b92afa1501ac73f1d745526adc4f89b527595f14", + "rev": "14c092e0326de759e16b37535161b3cb9770cea3", "type": "github" }, "original": { @@ -1194,11 +1194,11 @@ ] }, "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", + "lastModified": 1723454642, + "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", + "rev": "349de7bc435bdff37785c2466f054ed1766173be", "type": "github" }, "original": { diff --git a/home-manager/common/desktops/plasma6/plasma-manager.nix b/home-manager/common/desktops/plasma6/plasma-manager.nix index 33b0f576..8bb8c2b5 100644 --- a/home-manager/common/desktops/plasma6/plasma-manager.nix +++ b/home-manager/common/desktops/plasma6/plasma-manager.nix @@ -84,8 +84,6 @@ "applications:bitwarden.desktop" "applications:org.kde.konsole.desktop" "applications:steam.desktop" - "applications:net.lutris.Lutris.desktop" - "applications:org.darktable.darktable.desktop" ]; }; } diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix index fab91aa3..7b8b384f 100644 --- a/home-manager/common/software/gui/firefox.nix +++ b/home-manager/common/software/gui/firefox.nix @@ -8,6 +8,7 @@ profiles.default = { isDefault = true; name = "default"; + extraConfig = builtins.readFile ./firefox/arkenfox-user.js; # userChrome = ''@import "firefox-gnome-theme/userChrome.css";''; # userContent = ''@import "firefox-gnome-theme/userContent.css";''; @@ -31,58 +32,89 @@ rycee.firefox-addons.sponsorblock ]; - search.default = "Ecosia"; - search.force = true; - search.order = [ "Ecosia" ]; - search.engines = { - "Ecosia" = { - urls = [{ - template = "https://www.ecosia.org/search"; - params = [ - { name = "method"; value = "index"; } - { name = "q"; value = "{searchTerms}"; } - ]; - }]; - definedAliases = [ "@ec" ]; + containersForce = true; + containers = { + "Personal" = { + color = "toolbar"; + icon = "circle"; + id = 0; }; - "Nix Packages" = { - urls = [{ - template = "https://search.nixos.org/packages"; - params = [ - { name = "type"; value = "packages"; } - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; + "Google" = { + color = "blue"; + icon = "fingerprint"; + id = 1; }; - - "NixOS Options" = { - urls = [{ - template = "https://search.nixos.org/options"; - params = [ - { name = "type"; value = "options"; } - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@no" ]; + "Amazon" = { + color = "yellow"; + icon = "cart"; + id = 2; }; - - "NixOS Wiki" = { - urls = [{ template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; }]; - iconUpdateURL = "https://wiki.nixos.org/favicon.png"; - updateInterval = 24 * 60 * 60 * 1000; # every day - definedAliases = [ "@nw" ]; + "Shopping" = { + color = "pink"; + icon = "cart"; + id = 3; }; - - "Home Manager Options" = { - urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=master"; }]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@hm" ]; + "Banking" = { + color = "red"; + icon = "dollar"; + id = 4; + }; + }; + + search = { + default = "Ecosia"; + privateDefault = "Ecosia"; + force = true; + order = [ "Ecosia" ]; + engines = { + "Ecosia" = { + urls = [{ + template = "https://www.ecosia.org/search"; + params = [ + { name = "method"; value = "index"; } + { name = "q"; value = "{searchTerms}"; } + ]; + }]; + definedAliases = [ "@ec" ]; + }; + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages"; + params = [ + { name = "type"; value = "packages"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@np" ]; + }; + + "NixOS Options" = { + urls = [{ + template = "https://search.nixos.org/options"; + params = [ + { name = "type"; value = "options"; } + { name = "query"; value = "{searchTerms}"; } + ]; + }]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@no" ]; + }; + + "NixOS Wiki" = { + urls = [{ template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; }]; + iconUpdateURL = "https://wiki.nixos.org/favicon.png"; + updateInterval = 24 * 60 * 60 * 1000; # every day + definedAliases = [ "@nw" ]; + }; + + "Home Manager Options" = { + urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=master"; }]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@hm" ]; + }; }; }; - extraConfig = builtins.readFile ./firefox/arkenfox-user.js; }; }; } diff --git a/nixos/common/desktops/plasma6/default.nix b/nixos/common/desktops/plasma6/default.nix index 57d33533..4392e8ed 100644 --- a/nixos/common/desktops/plasma6/default.nix +++ b/nixos/common/desktops/plasma6/default.nix @@ -25,6 +25,9 @@ arc-kde-theme arc-theme kdePackages.plasma-browser-integration + kdePackages.kleopatra # GPG GUI + kdePackages.krdc # K Remote Desktop + kdePackages.kasts # Podcast player # Audio button workaround # plasma-pa