From f35891bd676e3e114f48578cf099b6895c36ee97 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 25 Jun 2024 17:10:27 +0200 Subject: [PATCH 001/395] Update flake lock and setting the 32 bit libraries in shodan --- flake.lock | 108 +++++++++++++-------------- nixos/hosts/shodan/configuration.nix | 2 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index 4c5c137..fa609b8 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718420836, - "narHash": "sha256-yQA+E+KpX2TwkF2t+XHuhm0TH6auIznJsaiZUiRGTyk=", + "lastModified": 1718887932, + "narHash": "sha256-eo1B6mUPNlRMCe9dgt1bzXinUlD+cD1DdVFj1fxwZnU=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "2af260ab2b0f0ad4271fa5c987906fa324655425", + "rev": "411df4e53fdc58cfca2e473e54c1bed9cf17740d", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1718339789, - "narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=", + "lastModified": 1719311390, + "narHash": "sha256-eP+SydN7alV3ln7a1BrGhDoLVTBa6RaHxYZ9bTHAQIA=", "owner": "catppuccin", "repo": "nix", - "rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a", + "rev": "1adbfeb44a54be0ae79eca751ba948a6faa3bb0f", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1718590227, - "narHash": "sha256-IFtAtsGx0kPg8ONpV742SToDZ1IkuAHS1TOO0Sny1vw=", + "lastModified": 1719159653, + "narHash": "sha256-nLl9hKldeNuViMK/fvf2YEirlbcWeQrZXhUQORWt16w=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8affdc43a677cf51f04dc16a36978e5adde12fb3", + "rev": "6f9d7b5667c9d4ae62712d4c8e6622c97bcf93c8", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1718846788, - "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", + "lastModified": 1719236180, + "narHash": "sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM=", "owner": "nix-community", "repo": "disko", - "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", + "rev": "dd4d1663ccf7fbdb32361b9afe9e71206584cd4c", "type": "github" }, "original": { @@ -897,11 +897,11 @@ ] }, "locked": { - "lastModified": 1718983978, - "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=", + "lastModified": 1719180626, + "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902", + "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "type": "github" }, "original": { @@ -917,11 +917,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1718977552, - "narHash": "sha256-kyilmbeCDdHFxup6L0UKvxyZ9T2lhy2vRNv0yeqh5j4=", + "lastModified": 1719292813, + "narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a7a9774538612c75324f785ab1300e67abc039d3", + "rev": "d6222e7818aa5528f8369afe84bc53556a57c329", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1718507237, - "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", + "lastModified": 1719111455, + "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", + "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "type": "github" }, "original": { @@ -1133,11 +1133,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718987887, - "narHash": "sha256-zVoDb0GkhdfrRtJbJm3QIwFAyZEv9ZBo23vfPa5cfjk=", + "lastModified": 1719145664, + "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc634b69c8312c4e88469d3c7e8fb5ecc72e7dc6", + "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719005338, - "narHash": "sha256-aIf2t5Y3/jeoZrpPYt+Zd/4b0l1k1MY9/fTstoduiw8=", + "lastModified": 1719313272, + "narHash": "sha256-0YOLZ8BslZZVfpWw/fOE/zn/QKeKOdS87UjuGzI4ciQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "69802c3649709bf4c464daa89471ea32036f55d8", + "rev": "736555406c2a59499046a31827a1470b6c29402d", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1718478900, - "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", + "lastModified": 1719099622, + "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c884223af91820615a6146af1ae1fea25c107005", + "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1718276985, - "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", + "lastModified": 1718983919, + "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f84a279f1a6290ce154c5531378acc827836fbb", + "rev": "90338afd6177fc683a04d934199d693708c85a3b", "type": "github" }, "original": { @@ -1323,11 +1323,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1718742829, - "narHash": "sha256-+H7PnuwEDDDxUMa3ItAcSRDK5+jfMJap/zHiuACyIfc=", + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "37a45fb6993f14555f50b18fbcf4945b82a35707", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1718956312, - "narHash": "sha256-iH+ilQbskYuwoOgN1w3sTgkEcVuuFPIJZ1HCGdgeh70=", + "lastModified": 1719302143, + "narHash": "sha256-PMtSsKvbgfoI5+rb7UBIBfIwQ4Zvjt1iChWwQL+BkGo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "6f182700ad78f13f367fdfff2b0a4062e70eeea8", + "rev": "a3b881f62eb3aabb97e4fc68041ef34e8029e186", "type": "github" }, "original": { @@ -1707,11 +1707,11 @@ ] }, "locked": { - "lastModified": 1718849885, - "narHash": "sha256-Qfc5HKpQvGhWXox0WJVzLqrAcFm3uy6xtWRvVmrkLYc=", + "lastModified": 1719109180, + "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bc1a236757cd5f6622f73838e551fb2035afa44a", + "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", "type": "github" }, "original": { @@ -1748,11 +1748,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1718506969, - "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", + "lastModified": 1719268571, + "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", + "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "type": "github" }, "original": { @@ -1895,11 +1895,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1718908642, - "narHash": "sha256-BmPjWXBc5lZKOlyo5unG5BgS2f97O6+nVnu/yZESPIs=", + "lastModified": 1719140798, + "narHash": "sha256-3Zo8kD/NQhHTkeVSRCSXYX86fnZyk/EJ15pH365tZY0=", "owner": "dj95", "repo": "zjstatus", - "rev": "5dea90349c6366383ecda9a1b9bf3e321824a5c6", + "rev": "2f0a24cb31ce94be568e4f57051d98a9318049b9", "type": "github" }, "original": { diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 34818db..2ebcef8 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -110,7 +110,7 @@ dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server extest.enable = true; }; - hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses + hardware.graphics.enable32Bit = true; # Enables support for 32bit libs that steam uses # Enable the X11 windowing system. services.xserver.enable = true; From bc7c3f803a2b8928ff63f2f1d80b89a5f6353492 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 26 Jun 2024 15:26:00 +0200 Subject: [PATCH 002/395] Queen has been fixed! (also flake lock update, and some small tweaks to reduce errors) --- flake.lock | 48 ++++++++++++++++++++-------------------- flake.nix | 15 +------------ nixos/shared/default.nix | 14 ++++++++++-- 3 files changed, 37 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index fa609b8..b280618 100644 --- a/flake.lock +++ b/flake.lock @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1719236180, - "narHash": "sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM=", + "lastModified": 1719401812, + "narHash": "sha256-QONBQ/arBsKZNJuSd3sMIkSYFlBoRJpvf1jGlMfcOuI=", "owner": "nix-community", "repo": "disko", - "rev": "dd4d1663ccf7fbdb32361b9afe9e71206584cd4c", + "rev": "b6a1262796b2990ec3cc60bb2ec23583f35b2f43", "type": "github" }, "original": { @@ -897,11 +897,11 @@ ] }, "locked": { - "lastModified": 1719180626, - "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", + "lastModified": 1719385710, + "narHash": "sha256-0yb5D0wCEtXoTi4ssNZxwvLTrahTwlHYPtx252FZ1MU=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", + "rev": "92a26bf6df1f00cbbed16a99d2547531ff4b3a83", "type": "github" }, "original": { @@ -917,11 +917,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719292813, - "narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=", + "lastModified": 1719380852, + "narHash": "sha256-Li7zNOomyu0FVtm3TyyeUUCZex6L8QpGAJtiFQKGZGw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d6222e7818aa5528f8369afe84bc53556a57c329", + "rev": "fd232b7d5d328619b21b867199b31ce799ae29f3", "type": "github" }, "original": { @@ -1133,11 +1133,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719145664, - "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", + "lastModified": 1719391814, + "narHash": "sha256-zlRvpIUQrxMSOi+1lVFuJNvIJt9LB93c05tYQ1KSdRg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", + "rev": "aab67495e34365045f9dfbe58725cc6fa03607b7", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719313272, - "narHash": "sha256-0YOLZ8BslZZVfpWw/fOE/zn/QKeKOdS87UjuGzI4ciQ=", + "lastModified": 1719407708, + "narHash": "sha256-EipdX6SC6uVY/5kdNnDbYQiKoJoeFZHKEet8c34IWsc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "736555406c2a59499046a31827a1470b6c29402d", + "rev": "aaa950d4f20622b00dbab53bf7b26c3d9a34939a", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1719302143, - "narHash": "sha256-PMtSsKvbgfoI5+rb7UBIBfIwQ4Zvjt1iChWwQL+BkGo=", + "lastModified": 1719340029, + "narHash": "sha256-j++6RRMNvw+aYwI9qC2svfRwNj/2EEnaty552VIAFX0=", "owner": "pjones", "repo": "plasma-manager", - "rev": "a3b881f62eb3aabb97e4fc68041ef34e8029e186", + "rev": "004923027388062be53d5b489be51c59c114d857", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 065ea9a..40ddf08 100644 --- a/flake.nix +++ b/flake.nix @@ -79,24 +79,11 @@ # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; }; - nixConfig = { - extra-substituters = [ - "https://nix-community.cachix.org" - "https://nixpkgs-unfree.cachix.org" - "https://0uptime.cachix.org" - "https://cache.lix.systems" - ]; - extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" - "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" - "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" - ]; - }; outputs = { self, nixpkgs, + flake-utils, nixpkgs-edge, nixos-generators, catppuccin, diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 702add4..1ad4cf2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -34,8 +34,18 @@ experimental-features = "nix-command flakes"; # Deduplicate and optimize nix store auto-optimise-store = true; - extra-substituters = ["https://cache.lix.systems"]; - trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="]; + extra-substituters = [ + "https://cache.lix.systems" + "https://nix-community.cachix.org" + "https://nixpkgs-unfree.cachix.org" + "https://0uptime.cachix.org" + ]; + trusted-public-keys = [ + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + ]; }; }; From 67cdc3600ea98cb81e392e625d5b83f812a50e63 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 28 Jun 2024 23:18:11 +0200 Subject: [PATCH 003/395] Let's see if this makes auto-mount work now --- nixos/hosts/shodan/auto-mount.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- pkgs/auto-mount/default.nix | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 664322d..f1e7387 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -16,7 +16,7 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount steam]; + path = with pkgs; [udisks bash auto-mount steam]; enable = true; serviceConfig = { ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 2ebcef8..b35973b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -25,7 +25,7 @@ ../../../disko/shodan - # ./auto-mount.nix + ./auto-mount.nix ]; boot.tmp.cleanOnBoot = true; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 37a8ef2..7872cb4 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -3,11 +3,6 @@ stdenv, system, pkgs, - jq, - coreutils, - udisks, - toybox, - util-linux, writeShellApplication, }: writeShellApplication @@ -16,7 +11,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest]; + runtimeInputs = [pkgs.steam]; text = '' set -euo pipefail @@ -76,7 +71,7 @@ writeShellApplication # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt - systemd-run -M 1000@ --user --collect --wait sh -c "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi From 62c771d94796b73623353d4127da7a90fcd46896 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 28 Jun 2024 23:20:37 +0200 Subject: [PATCH 004/395] Need to add that package --- nixos/hosts/shodan/configuration.nix | 2 +- pkgs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b35973b..8acd75b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -49,7 +49,7 @@ environment.systemPackages = with pkgs; [ # Custom tools - # auto-mount + auto-mount #System: btrfs-progs diff --git a/pkgs/default.nix b/pkgs/default.nix index 51823f9..464322b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,6 +12,6 @@ pkgs: { upgrade = pkgs.callPackage ./upgrade {}; restart = pkgs.callPackage ./restart {}; phanpy = pkgs.callPackage ./phanpy {}; - # auto-mount = pkgs.callPackage ./auto-mount {}; + auto-mount = pkgs.callPackage ./auto-mount {}; simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {}; } From 569a253534ded5987f6ffc19604625e0ed04e7f5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 28 Jun 2024 23:26:41 +0200 Subject: [PATCH 005/395] Need util-linux for flock --- nixos/hosts/shodan/auto-mount.nix | 2 +- pkgs/auto-mount/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index f1e7387..1465c4e 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -16,7 +16,7 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [udisks bash auto-mount steam]; + path = with pkgs; [util-linux udisks bash auto-mount steam]; enable = true; serviceConfig = { ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 7872cb4..ac7a6a2 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -3,6 +3,7 @@ stdenv, system, pkgs, + util-linux, writeShellApplication, }: writeShellApplication From 2a95e688c090c5adf4fcf23209fca335e429c1a5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 28 Jun 2024 23:29:19 +0200 Subject: [PATCH 006/395] Need jq as well --- nixos/hosts/shodan/auto-mount.nix | 2 +- pkgs/auto-mount/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 1465c4e..1c4a376 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -16,7 +16,7 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [util-linux udisks bash auto-mount steam]; + path = with pkgs; [util-linux udisks bash auto-mount steam jq]; enable = true; serviceConfig = { ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index ac7a6a2..3a27c32 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -4,6 +4,7 @@ system, pkgs, util-linux, + jq, writeShellApplication, }: writeShellApplication From 7bc03653c39acbd9d4c94f0961c8e7187b17233d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 30 Jun 2024 23:13:59 +0200 Subject: [PATCH 007/395] Add ffz plugin --- nixos/desktop/package-configs/firefox/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 9324703..394788b 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -118,6 +118,10 @@ install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi"; installation_mode = "force_installed"; }; + "frankerfacez@frankerfacez.com" = { + install_url = "https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"; + installation_mode = "force_installed"; + }; }; FirefoxHome = { Search = true; From 3f149efae6c9e2863735a9a2ea24926c7a976c7d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Jul 2024 11:26:00 +0200 Subject: [PATCH 008/395] update flake lock --- flake.lock | 120 ++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index b280618..0401a74 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718887932, - "narHash": "sha256-eo1B6mUPNlRMCe9dgt1bzXinUlD+cD1DdVFj1fxwZnU=", + "lastModified": 1719676503, + "narHash": "sha256-5ER4843mn9Am8FKsUovaPFzwBIc2LOFvmcd+iUr8P9g=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "411df4e53fdc58cfca2e473e54c1bed9cf17740d", + "rev": "755788e2d6065ac35e680a23c48125a5cd63f7b7", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719311390, - "narHash": "sha256-eP+SydN7alV3ln7a1BrGhDoLVTBa6RaHxYZ9bTHAQIA=", + "lastModified": 1719758387, + "narHash": "sha256-bMaI1jJNzIZar4TP/hhoPQROqqcbD6zT6O+sqIJdp8c=", "owner": "catppuccin", "repo": "nix", - "rev": "1adbfeb44a54be0ae79eca751ba948a6faa3bb0f", + "rev": "9eb0610d48dd0e1fecf772bbdacf9050d7b82d7c", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1719159653, - "narHash": "sha256-nLl9hKldeNuViMK/fvf2YEirlbcWeQrZXhUQORWt16w=", + "lastModified": 1719876904, + "narHash": "sha256-rPzc2Wpkvaq/N1U0FNvUmQdzLHOJ/dLb3sQ6+04+0GI=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6f9d7b5667c9d4ae62712d4c8e6622c97bcf93c8", + "rev": "20aab1792be1b637bee4e268a7bd8d163321fb63", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1719401812, - "narHash": "sha256-QONBQ/arBsKZNJuSd3sMIkSYFlBoRJpvf1jGlMfcOuI=", + "lastModified": 1719864345, + "narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=", "owner": "nix-community", "repo": "disko", - "rev": "b6a1262796b2990ec3cc60bb2ec23583f35b2f43", + "rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533", "type": "github" }, "original": { @@ -653,11 +653,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -897,11 +897,11 @@ ] }, "locked": { - "lastModified": 1719385710, - "narHash": "sha256-0yb5D0wCEtXoTi4ssNZxwvLTrahTwlHYPtx252FZ1MU=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "92a26bf6df1f00cbbed16a99d2547531ff4b3a83", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -917,11 +917,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719380852, - "narHash": "sha256-Li7zNOomyu0FVtm3TyyeUUCZex6L8QpGAJtiFQKGZGw=", + "lastModified": 1719631702, + "narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fd232b7d5d328619b21b867199b31ce799ae29f3", + "rev": "2f9668e19aff06550cd154c87c0af120735a56a4", "type": "github" }, "original": { @@ -941,11 +941,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718782018, - "narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", + "lastModified": 1719818887, + "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", + "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1719111455, - "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", + "lastModified": 1719832725, + "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", + "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", "type": "github" }, "original": { @@ -1097,11 +1097,11 @@ }, "nixlib": { "locked": { - "lastModified": 1712450863, - "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", + "lastModified": 1719708727, + "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", + "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", "type": "github" }, "original": { @@ -1118,11 +1118,11 @@ ] }, "locked": { - "lastModified": 1718025593, - "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", + "lastModified": 1719841141, + "narHash": "sha256-WOyohxFJJdfDvEB7N3eTcX44lNU2rZes1inHsyHL7mM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", + "rev": "140dcc2b9a0eb87ba5e9011076a1a7af19179ab1", "type": "github" }, "original": { @@ -1133,11 +1133,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719391814, - "narHash": "sha256-zlRvpIUQrxMSOi+1lVFuJNvIJt9LB93c05tYQ1KSdRg=", + "lastModified": 1719895800, + "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "aab67495e34365045f9dfbe58725cc6fa03607b7", + "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719407708, - "narHash": "sha256-EipdX6SC6uVY/5kdNnDbYQiKoJoeFZHKEet8c34IWsc=", + "lastModified": 1719909084, + "narHash": "sha256-GxoaFEsoQZhP7YDzLhilmlUlX2vLnzsizM6ACQlbd8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aaa950d4f20622b00dbab53bf7b26c3d9a34939a", + "rev": "e689d1116660575bac669cbbe1cc05999bbd2f0f", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1719099622, - "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", + "lastModified": 1719663039, + "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", + "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1718983919, - "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", + "lastModified": 1719468428, + "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90338afd6177fc683a04d934199d693708c85a3b", + "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1719340029, - "narHash": "sha256-j++6RRMNvw+aYwI9qC2svfRwNj/2EEnaty552VIAFX0=", + "lastModified": 1719875930, + "narHash": "sha256-jQmdWLxRP6BzOxRF8hQEhDD7UKw7UrnYbmaAPOSaXWY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "004923027388062be53d5b489be51c59c114d857", + "rev": "7e062fcd669e261fb06cf54fe0ef2e46c3db8e83", "type": "github" }, "original": { @@ -1748,11 +1748,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1719268571, - "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", + "lastModified": 1719873517, + "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", + "rev": "a11224af8d824935f363928074b4717ca2e280db", "type": "github" }, "original": { @@ -1895,11 +1895,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1719140798, - "narHash": "sha256-3Zo8kD/NQhHTkeVSRCSXYX86fnZyk/EJ15pH365tZY0=", + "lastModified": 1719650330, + "narHash": "sha256-spoLPg8Ty7LvypwM4JpuWA06B/TUcIzyjs+N1nzGha4=", "owner": "dj95", "repo": "zjstatus", - "rev": "2f0a24cb31ce94be568e4f57051d98a9318049b9", + "rev": "f5fd92d8ebd3152b0db4c85c6ff7b638c6f52d14", "type": "github" }, "original": { From 237f66d10e1280636136039135f645fa578a59b8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Jul 2024 16:44:54 +0200 Subject: [PATCH 009/395] update flake lock --- flake.lock | 293 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 193 insertions(+), 100 deletions(-) diff --git a/flake.lock b/flake.lock index 0401a74..2cf787d 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "lastModified": 1717279440, + "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=", "owner": "zhaofengli", "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "rev": "717cc95983cdc357bc347d70be20ced21f935843", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1717420532, - "narHash": "sha256-OCCmI69EMaA4BcxRKrXJsx5Ozua2f/PKEy4aJbE7ziM=", + "lastModified": 1719923519, + "narHash": "sha256-7Rhljj2fsklFRsu+eq7N683Z9qukmreMEj5C1GqCrSA=", "owner": "cachix", "repo": "cachix", - "rev": "5727f0676f08a4b41ed13d403ec64dcce989f6e5", + "rev": "4e9e71f78b9500fa6210cf1eaa4d75bdbab777c3", "type": "github" }, "original": { @@ -111,13 +111,49 @@ "type": "github" } }, + "cachix_2": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "catppuccin": { "locked": { - "lastModified": 1719758387, - "narHash": "sha256-bMaI1jJNzIZar4TP/hhoPQROqqcbD6zT6O+sqIJdp8c=", + "lastModified": 1719915848, + "narHash": "sha256-zq+CMkdT8A9z74HonwspXp8HsX4OvP4uaVdD98AO6as=", "owner": "catppuccin", "repo": "nix", - "rev": "9eb0610d48dd0e1fecf772bbdacf9050d7b82d7c", + "rev": "9345073d27d91ab66c1b6ab65df322906992aa59", "type": "github" }, "original": { @@ -146,11 +182,11 @@ "complement_2": { "flake": false, "locked": { - "lastModified": 1715700731, - "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", + "lastModified": 1719903368, + "narHash": "sha256-PPzgxM4Bir+Zh9FUV/v+RBxEYeJxYVmi/BYo3uqt268=", "owner": "matrix-org", "repo": "complement", - "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", + "rev": "bc97f1ddc1cd7485faf80c8935ee2641f3e1b57c", "type": "github" }, "original": { @@ -192,7 +228,7 @@ "crane": "crane_5", "fenix": "fenix_3", "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "liburing": "liburing", "nix-filter": "nix-filter_2", "nixpkgs": [ @@ -201,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1719876904, - "narHash": "sha256-rPzc2Wpkvaq/N1U0FNvUmQdzLHOJ/dLb3sQ6+04+0GI=", + "lastModified": 1720072522, + "narHash": "sha256-ZHYStZaFXB28CjKmk3bHtLTMXFj0OVs84GpFJJIzggs=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "20aab1792be1b637bee4e268a7bd8d163321fb63", + "rev": "9a0ffd55da7ebc530040be6f0cc2b64c70447bfa", "type": "github" }, "original": { @@ -288,11 +324,11 @@ ] }, "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", "owner": "ipetkov", "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", "type": "github" }, "original": { @@ -367,17 +403,55 @@ }, "devenv": { "inputs": { + "cachix": "cachix_2", "flake-compat": [ "conduwuit", "cachix", "flake-compat" ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1719759336, + "narHash": "sha256-3a34VL/QnHprl5gMy9xlx6d8J+iNp+W88Ex8smkgH9M=", + "owner": "cachix", + "repo": "devenv", + "rev": "bb32aa986f2f695385e54428d0eaf7d05b31466e", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], "nix": "nix", "nixpkgs": "nixpkgs_4", "poetry2nix": "poetry2nix", "pre-commit-hooks": [ "conduwuit", "cachix", + "devenv", + "cachix", "pre-commit-hooks" ] }, @@ -403,11 +477,11 @@ ] }, "locked": { - "lastModified": 1719864345, - "narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=", + "lastModified": 1720056646, + "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=", "owner": "nix-community", "repo": "disko", - "rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533", + "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e", "type": "github" }, "original": { @@ -653,11 +727,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -768,6 +842,7 @@ }, "original": { "owner": "numtide", + "ref": "main", "repo": "flake-utils", "type": "github" } @@ -786,7 +861,6 @@ }, "original": { "owner": "numtide", - "ref": "main", "repo": "flake-utils", "type": "github" } @@ -827,24 +901,6 @@ "type": "github" } }, - "flake-utils_9": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -897,11 +953,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1720045378, + "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", "type": "github" }, "original": { @@ -917,11 +973,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719631702, - "narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", + "lastModified": 1720025282, + "narHash": "sha256-I70ARXPm1YjGJ0efykd5zsapUZtmVZ/sIgwJ0F0j17w=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2f9668e19aff06550cd154c87c0af120735a56a4", + "rev": "8dd0f8383bd60b8ed66cd27c1b49cdbf7be4ad9d", "type": "github" }, "original": { @@ -935,7 +991,7 @@ "crane": "crane_6", "flake-compat": "flake-compat_9", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" @@ -957,11 +1013,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1716565485, - "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=", + "lastModified": 1719025212, + "narHash": "sha256-kD0yhjNStqC6uFqC1AxBwUpc/HlSFtiKrV+gwDyroDc=", "owner": "axboe", "repo": "liburing", - "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e", + "rev": "7b3245583069bd481190c9da18f22e9fc8c3a805", "type": "github" }, "original": { @@ -978,16 +1034,18 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1708577783, - "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -1035,6 +1093,8 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "poetry2nix", "nixpkgs" ] @@ -1095,6 +1155,37 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1719708727, @@ -1118,11 +1209,11 @@ ] }, "locked": { - "lastModified": 1719841141, - "narHash": "sha256-WOyohxFJJdfDvEB7N3eTcX44lNU2rZes1inHsyHL7mM=", + "lastModified": 1720055043, + "narHash": "sha256-SKizewU4UeYrkZWPUjur8EoxscGoNb0pGcrNL4YzAIg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "140dcc2b9a0eb87ba5e9011076a1a7af19179ab1", + "rev": "168b220231a70e47cc1f0919048fa5914415fb18", "type": "github" }, "original": { @@ -1180,11 +1271,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719909084, - "narHash": "sha256-GxoaFEsoQZhP7YDzLhilmlUlX2vLnzsizM6ACQlbd8A=", + "lastModified": 1720104015, + "narHash": "sha256-jOP2BID6nd4prNl5AXwEX97WIB9TqvcE/+scdKVfNug=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e689d1116660575bac669cbbe1cc05999bbd2f0f", + "rev": "30a4d0f448db4f73897abdb32fcdc6092a050bd0", "type": "github" }, "original": { @@ -1209,6 +1300,22 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1711460390, @@ -1243,11 +1350,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718811006, + "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "type": "github" }, "original": { @@ -1291,11 +1398,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -1387,11 +1494,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -1435,11 +1542,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -1495,6 +1602,8 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ] }, @@ -1515,7 +1624,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_5", "gitignore": "gitignore", "nixpkgs": [ "conduwuit", @@ -1525,11 +1633,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1715609711, - "narHash": "sha256-/5u29K0c+4jyQ8x7dUIEUWlz2BoTSZWUP2quPwFCE7M=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c182c876690380f8d3b9557c4609472ebfa1b141", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -1585,16 +1693,16 @@ "rocksdb_2": { "flake": false, "locked": { - "lastModified": 1716773462, - "narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=", + "lastModified": 1719949653, + "narHash": "sha256-DYx7XHH2GEh17GukKhXs6laM6l+eugCmRkF0adpi9wk=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc", + "rev": "a935c0273e1ba44eacf88ce3685a9b9831486155", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.2.1", + "ref": "v9.3.1", "repo": "rocksdb", "type": "github" } @@ -1607,7 +1715,7 @@ "conduwuit": "conduwuit", "disko": "disko", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", @@ -1851,21 +1959,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1890,7 +1983,7 @@ "zjstatus": { "inputs": { "crane": "crane_7", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_2" }, From 8dd1285c8fb771fe40e4cb507bcee924fe294f2c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jul 2024 16:02:20 +0200 Subject: [PATCH 010/395] Flake update & temporarily allow youtube-dl insecurely --- flake.lock | 140 +++++++++++++++++++-------------------- nixos/shared/default.nix | 4 ++ 2 files changed, 74 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 2cf787d..8f626dc 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719676503, - "narHash": "sha256-5ER4843mn9Am8FKsUovaPFzwBIc2LOFvmcd+iUr8P9g=", + "lastModified": 1720185405, + "narHash": "sha256-Ze9X79OXynWUHolo8xFv3BJwndqXsdvBWdwL3N+3yM0=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "755788e2d6065ac35e680a23c48125a5cd63f7b7", + "rev": "8b06995115a8ade5e0b154311b771279ff97317f", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719915848, - "narHash": "sha256-zq+CMkdT8A9z74HonwspXp8HsX4OvP4uaVdD98AO6as=", + "lastModified": 1720472194, + "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=", "owner": "catppuccin", "repo": "nix", - "rev": "9345073d27d91ab66c1b6ab65df322906992aa59", + "rev": "d75d5803852fb0833767dc969a4581ac13204e22", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1720072522, - "narHash": "sha256-ZHYStZaFXB28CjKmk3bHtLTMXFj0OVs84GpFJJIzggs=", + "lastModified": 1720663246, + "narHash": "sha256-7h/Tnl5X27g2XayLjXjOUkjaKsfTDuOYcgoAmQshzBM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "9a0ffd55da7ebc530040be6f0cc2b64c70447bfa", + "rev": "b5d4a1c1b0c1e5cd8e399caa01744d46a8e34ff4", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1716569590, - "narHash": "sha256-5eDbq8TuXFGGO3mqJFzhUbt5zHVTf5zilQoyW5jnJwo=", + "lastModified": 1720226507, + "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "109987da061a1bf452f435f1653c47511587d919", + "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1718730147, - "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", + "lastModified": 1720226507, + "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", + "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1720056646, - "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=", + "lastModified": 1720661479, + "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", "owner": "nix-community", "repo": "disko", - "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e", + "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", "type": "github" }, "original": { @@ -544,11 +544,11 @@ "rust-analyzer-src": "rust-analyzer-src_3" }, "locked": { - "lastModified": 1716359173, - "narHash": "sha256-pYcjP6Gy7i6jPWrjiWAVV0BCQp+DdmGaI/k65lBb/kM=", + "lastModified": 1720420198, + "narHash": "sha256-OIuDb6pHDyGpo7YMFyuRzMLcHm7mRvlYOz0Ht7ps2sU=", "owner": "nix-community", "repo": "fenix", - "rev": "b6fc5035b28e36a98370d0eac44f4ef3fd323df6", + "rev": "abc0549e3560189462a7d394cc9d50af4608d103", "type": "github" }, "original": { @@ -953,11 +953,11 @@ ] }, "locked": { - "lastModified": 1720045378, - "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", + "lastModified": 1720646128, + "narHash": "sha256-BivO5yIQukDlJL+1875Sqf3GuOPxZDdA48dYDi3PkL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", + "rev": "c085b984ff2808bf322f375b10fea5a415a9c43d", "type": "github" }, "original": { @@ -973,11 +973,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1720025282, - "narHash": "sha256-I70ARXPm1YjGJ0efykd5zsapUZtmVZ/sIgwJ0F0j17w=", + "lastModified": 1720697445, + "narHash": "sha256-IvFFc57vljkR1eP4VeNMuXJTS/POClq+ytFAadigSY0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8dd0f8383bd60b8ed66cd27c1b49cdbf7be4ad9d", + "rev": "bba994424596df09228f5437bcf8ef7fde1fe56e", "type": "github" }, "original": { @@ -1142,11 +1142,11 @@ ] }, "locked": { - "lastModified": 1719832725, - "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", + "lastModified": 1720334033, + "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", + "rev": "685e40e1348007d2cf76747a201bab43d86b38cb", "type": "github" }, "original": { @@ -1224,11 +1224,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719895800, - "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", + "lastModified": 1720515935, + "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", + "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", "type": "github" }, "original": { @@ -1271,11 +1271,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1720104015, - "narHash": "sha256-jOP2BID6nd4prNl5AXwEX97WIB9TqvcE/+scdKVfNug=", + "lastModified": 1720705017, + "narHash": "sha256-eDbw6fazdrsvoQaiTLRHaJgJm2H/HO9uu31dzOf8C5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a4d0f448db4f73897abdb32fcdc6092a050bd0", + "rev": "bed9309adc836ddea35a5923fdca425d23002abf", "type": "github" }, "original": { @@ -1382,27 +1382,27 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1719663039, - "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "lastModified": 1720282526, + "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", + "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -1414,11 +1414,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1719468428, - "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", + "lastModified": 1720181791, + "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", + "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", "type": "github" }, "original": { @@ -1430,11 +1430,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1720181791, + "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", "type": "github" }, "original": { @@ -1510,11 +1510,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -1542,11 +1542,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -1581,11 +1581,11 @@ ] }, "locked": { - "lastModified": 1719875930, - "narHash": "sha256-jQmdWLxRP6BzOxRF8hQEhDD7UKw7UrnYbmaAPOSaXWY=", + "lastModified": 1720603727, + "narHash": "sha256-A5qYbCT3rHvVi95u8Zy12cRmW5OPT7yFl1LrTDSejyE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "7e062fcd669e261fb06cf54fe0ef2e46c3db8e83", + "rev": "f0691e1a9fff4684ce399c345c3a941d2ef0fe78", "type": "github" }, "original": { @@ -1768,11 +1768,11 @@ "rust-analyzer-src_3": { "flake": false, "locked": { - "lastModified": 1716107283, - "narHash": "sha256-NJgrwLiLGHDrCia5AeIvZUHUY7xYGVryee0/9D3Ir1I=", + "lastModified": 1720344064, + "narHash": "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "21ec8f523812b88418b2bfc64240c62b3dd967bd", + "rev": "a5b21ea0aa644dffd7cf958b43f11f221d53404e", "type": "github" }, "original": { @@ -1815,11 +1815,11 @@ ] }, "locked": { - "lastModified": 1719109180, - "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", + "lastModified": 1720232258, + "narHash": "sha256-eR5glZHS2bLpzUgTDhWGm04j+j5KMYKoDsY5DXAiuKQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", + "rev": "05ccbe21233d4e9110fc6428d2c3d74b430c3c69", "type": "github" }, "original": { @@ -1856,11 +1856,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1719873517, - "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", + "lastModified": 1720479166, + "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a11224af8d824935f363928074b4717ca2e280db", + "rev": "67035a355b1d52d2d238501f8cc1a18706979760", "type": "github" }, "original": { @@ -1988,11 +1988,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1719650330, - "narHash": "sha256-spoLPg8Ty7LvypwM4JpuWA06B/TUcIzyjs+N1nzGha4=", + "lastModified": 1720291207, + "narHash": "sha256-0az2z890pvKAxn2LJaHxWPgpSvbx0DlNbBIZlYyP7Y4=", "owner": "dj95", "repo": "zjstatus", - "rev": "f5fd92d8ebd3152b0db4c85c6ff7b638c6f52d14", + "rev": "af66be8031cbccf484363fc3efe6c020cd602b1e", "type": "github" }, "original": { diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1ad4cf2..20a22ec 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -14,6 +14,10 @@ sops.age.keyFile = ../../../../../../var/secrets/keys.txt; sops.secrets."lillian-password".neededForUsers = true; + #TODO: remove this when unneeded for freetube + nixpkgs.config.permittedInsecurePackages = [ + "python3.12-youtube-dl-2021.12.17" + ]; nix = { package = pkgs.lix; gc = { From c94191d60ad1e415bb283d4437a35572210d5a65 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jul 2024 16:07:20 +0200 Subject: [PATCH 011/395] Plugins not available anymore --- home-manager/desktop/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 088d5ca..43c1a80 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -152,8 +152,6 @@ ms-toolsai.jupyter ms-pyright.pyright ms-python.black-formatter - ms-python.vscode-pylance - ms-vscode-remote.remote-ssh oderwat.indent-rainbow rust-lang.rust-analyzer yzhang.markdown-all-in-one From d87f842ad5b518c9e820fa2973693bce83b27a24 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jul 2024 22:33:42 +0200 Subject: [PATCH 012/395] Add protonup-qt to shodan for junk-store --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 8acd75b..190cbae 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -65,6 +65,7 @@ util-linux waypipe python3 + protonup-qt #KDE: krunner-translator From 8f624841129c8d19d418c34d9a9ccd7819353d8e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Jul 2024 22:49:08 +0200 Subject: [PATCH 013/395] Add protontricks too --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 190cbae..5eff55f 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -83,6 +83,7 @@ #Gaming: heroic legendary-gl + protontricks rare ]; From 142b9c79502eb145b06450dfbf06fd0a9202fb73 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jul 2024 13:58:21 +0200 Subject: [PATCH 014/395] error said this option does nothing anymore --- nixos/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 791cdaf..d867eab 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -144,7 +144,6 @@ services.fwupd.enable = true; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { From f5475e17523cf9ed027bca4f640982bcfe45a64d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jul 2024 14:45:34 +0200 Subject: [PATCH 015/395] also remove the sound option for shodan --- nixos/hosts/shodan/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 5eff55f..9f586a6 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -166,7 +166,6 @@ services.fwupd.enable = true; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { From b6d43632fe5cc3aad75372e32b2594a8549374fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Jul 2024 14:47:57 +0200 Subject: [PATCH 016/395] update flake lock --- flake.lock | 158 ++++++++++++++++++++++++++--------------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/flake.lock b/flake.lock index 8f626dc..c40cdbf 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717279440, - "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=", + "lastModified": 1720542474, + "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", "owner": "zhaofengli", "repo": "attic", - "rev": "717cc95983cdc357bc347d70be20ced21f935843", + "rev": "6139576a3ce6bb992e0f6c3022528ec233e45f00", "type": "github" }, "original": { @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1720185405, - "narHash": "sha256-Ze9X79OXynWUHolo8xFv3BJwndqXsdvBWdwL3N+3yM0=", + "lastModified": 1721350094, + "narHash": "sha256-JbiL5dMpHEKs044XVJEnT3l+ny369auBjchR8DiESao=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "8b06995115a8ade5e0b154311b771279ff97317f", + "rev": "60ff4f2f3c3da34746f0993d4e6f1de79979f580", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "complement_2": { "flake": false, "locked": { - "lastModified": 1719903368, - "narHash": "sha256-PPzgxM4Bir+Zh9FUV/v+RBxEYeJxYVmi/BYo3uqt268=", + "lastModified": 1720637557, + "narHash": "sha256-oZz6nCmFmdJZpC+K1iOG2KkzTI6rlAmndxANPDVU7X0=", "owner": "matrix-org", "repo": "complement", - "rev": "bc97f1ddc1cd7485faf80c8935ee2641f3e1b57c", + "rev": "0d14432e010482ea9e13a6f7c47c1533c0c9d62f", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1720663246, - "narHash": "sha256-7h/Tnl5X27g2XayLjXjOUkjaKsfTDuOYcgoAmQshzBM=", + "lastModified": 1721267279, + "narHash": "sha256-99utYoUwaX10XMjZiqe1YqhtWg4kUFBXnQikFkWTGtY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "b5d4a1c1b0c1e5cd8e399caa01744d46a8e34ff4", + "rev": "06531993f69b8cefd5d67d3589791ca9cd6785c2", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1720226507, - "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", + "lastModified": 1720546058, + "narHash": "sha256-iU2yVaPIZm5vMGdlT0+57vdB/aPq/V5oZFBRwYw+HBM=", "owner": "ipetkov", "repo": "crane", - "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", + "rev": "2d83156f23c43598cf44e152c33a59d3892f8b29", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1720226507, - "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", + "lastModified": 1720975002, + "narHash": "sha256-1i521ecK2MFg+lxSk9oRx/C0SsdlI6GS6eYT79nA6TA=", "owner": "ipetkov", "repo": "crane", - "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", + "rev": "1791a5b98d2c1bf143ad85469abcfa2426f3f087", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1720661479, - "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", + "lastModified": 1721266288, + "narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=", "owner": "nix-community", "repo": "disko", - "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", + "rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47", "type": "github" }, "original": { @@ -544,11 +544,11 @@ "rust-analyzer-src": "rust-analyzer-src_3" }, "locked": { - "lastModified": 1720420198, - "narHash": "sha256-OIuDb6pHDyGpo7YMFyuRzMLcHm7mRvlYOz0Ht7ps2sU=", + "lastModified": 1720852044, + "narHash": "sha256-3NBYz8VuXuKU+8ONd9NFafCNjPEGHIZQ2Mdoam1a4mY=", "owner": "nix-community", "repo": "fenix", - "rev": "abc0549e3560189462a7d394cc9d50af4608d103", + "rev": "5087b12a595ee73131a944d922f24d81dae05725", "type": "github" }, "original": { @@ -953,11 +953,11 @@ ] }, "locked": { - "lastModified": 1720646128, - "narHash": "sha256-BivO5yIQukDlJL+1875Sqf3GuOPxZDdA48dYDi3PkL8=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c085b984ff2808bf322f375b10fea5a415a9c43d", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { @@ -973,11 +973,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1720697445, - "narHash": "sha256-IvFFc57vljkR1eP4VeNMuXJTS/POClq+ytFAadigSY0=", + "lastModified": 1721226562, + "narHash": "sha256-KfdwusX12hhkzXKBmu2HhaU9EhaxVeWLDQw1Ll2A03o=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bba994424596df09228f5437bcf8ef7fde1fe56e", + "rev": "927eea31915468e06b94bedf678261dc7cf048c8", "type": "github" }, "original": { @@ -1013,11 +1013,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1719025212, - "narHash": "sha256-kD0yhjNStqC6uFqC1AxBwUpc/HlSFtiKrV+gwDyroDc=", + "lastModified": 1720798442, + "narHash": "sha256-gtPppAoksMLW4GuruQ36nf4EAqIA1Bs6V9Xcx8dBxrQ=", "owner": "axboe", "repo": "liburing", - "rev": "7b3245583069bd481190c9da18f22e9fc8c3a805", + "rev": "1d674f83b7d0f07553ac44d99a401b05853d9dbe", "type": "github" }, "original": { @@ -1142,11 +1142,11 @@ ] }, "locked": { - "lastModified": 1720334033, - "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=", + "lastModified": 1720926593, + "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "685e40e1348007d2cf76747a201bab43d86b38cb", + "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", "type": "github" }, "original": { @@ -1209,11 +1209,11 @@ ] }, "locked": { - "lastModified": 1720055043, - "narHash": "sha256-SKizewU4UeYrkZWPUjur8EoxscGoNb0pGcrNL4YzAIg=", + "lastModified": 1720859326, + "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "168b220231a70e47cc1f0919048fa5914415fb18", + "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", "type": "github" }, "original": { @@ -1224,11 +1224,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720515935, - "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", + "lastModified": 1721331912, + "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", + "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be", "type": "github" }, "original": { @@ -1271,11 +1271,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1720705017, - "narHash": "sha256-eDbw6fazdrsvoQaiTLRHaJgJm2H/HO9uu31dzOf8C5M=", + "lastModified": 1721393053, + "narHash": "sha256-xNiw9gIxyF6xsyXCiFESPjxMjuVAfmr4sBpM9u2l5io=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bed9309adc836ddea35a5923fdca425d23002abf", + "rev": "a0691657e9634cfc001f02995cca394025e3e940", "type": "github" }, "original": { @@ -1382,11 +1382,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1720282526, - "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", + "lastModified": 1720915306, + "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", + "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", "type": "github" }, "original": { @@ -1398,11 +1398,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { @@ -1414,11 +1414,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1720781449, + "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", "type": "github" }, "original": { @@ -1430,11 +1430,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1720955038, + "narHash": "sha256-GaliJqfFwyYxReFywxAa8orCO+EnDq2NK2F+5aSc8vo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "aa247c0c90ecf4ae7a032c54fdc21b91ca274062", "type": "github" }, "original": { @@ -1542,11 +1542,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { @@ -1581,11 +1581,11 @@ ] }, "locked": { - "lastModified": 1720603727, - "narHash": "sha256-A5qYbCT3rHvVi95u8Zy12cRmW5OPT7yFl1LrTDSejyE=", + "lastModified": 1720992717, + "narHash": "sha256-8j1bZVfKT1vJ0e+U7NYRNBG+DdBj5C/tpwe5krxT4/4=", "owner": "pjones", "repo": "plasma-manager", - "rev": "f0691e1a9fff4684ce399c345c3a941d2ef0fe78", + "rev": "460b48dc3dcd05df568e27cbb90581d23baec8dc", "type": "github" }, "original": { @@ -1693,16 +1693,16 @@ "rocksdb_2": { "flake": false, "locked": { - "lastModified": 1719949653, - "narHash": "sha256-DYx7XHH2GEh17GukKhXs6laM6l+eugCmRkF0adpi9wk=", + "lastModified": 1720900786, + "narHash": "sha256-Vta9Um/RRuWwZ46BjXftV06iWLm/j/9MX39emXUvSAY=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "a935c0273e1ba44eacf88ce3685a9b9831486155", + "rev": "911f4243e69c2e320a7a209bf1f5f3ff5f825495", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.3.1", + "ref": "v9.4.0", "repo": "rocksdb", "type": "github" } @@ -1768,11 +1768,11 @@ "rust-analyzer-src_3": { "flake": false, "locked": { - "lastModified": 1720344064, - "narHash": "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=", + "lastModified": 1720717809, + "narHash": "sha256-6I+fm+nTLF/iaj7ffiFGlSY7POmubwUaPA/Wq0Bm53M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a5b21ea0aa644dffd7cf958b43f11f221d53404e", + "rev": "ffbc5ad993d5cd2f3b8bcf9a511165470944ab91", "type": "github" }, "original": { @@ -1815,11 +1815,11 @@ ] }, "locked": { - "lastModified": 1720232258, - "narHash": "sha256-eR5glZHS2bLpzUgTDhWGm04j+j5KMYKoDsY5DXAiuKQ=", + "lastModified": 1721010111, + "narHash": "sha256-GuPw2xhJZ+eszIJFu7z7AtqUmirSWPHpxuCpG6dSOic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "05ccbe21233d4e9110fc6428d2c3d74b430c3c69", + "rev": "3ef018b6d0f62eb59580a8e9fe141e37bf1d972d", "type": "github" }, "original": { @@ -1856,11 +1856,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1720479166, - "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=", + "lastModified": 1720926522, + "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "67035a355b1d52d2d238501f8cc1a18706979760", + "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", "type": "github" }, "original": { @@ -1988,11 +1988,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1720291207, - "narHash": "sha256-0az2z890pvKAxn2LJaHxWPgpSvbx0DlNbBIZlYyP7Y4=", + "lastModified": 1721054167, + "narHash": "sha256-0ZplHtEXoqytnDExvNoDWoTt1KjcobKVGXv5zmY3jrk=", "owner": "dj95", "repo": "zjstatus", - "rev": "af66be8031cbccf484363fc3efe6c020cd602b1e", + "rev": "924f821cf1a1800baa90a443a7150ca795ad93c7", "type": "github" }, "original": { From 7a95239f84d79df774120d5b876f935376538e3d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 25 Jul 2024 19:41:36 +0200 Subject: [PATCH 017/395] update flake lock --- flake.lock | 202 ++++++++++++++++++++++------------------------------- 1 file changed, 82 insertions(+), 120 deletions(-) diff --git a/flake.lock b/flake.lock index c40cdbf..b586175 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721350094, - "narHash": "sha256-JbiL5dMpHEKs044XVJEnT3l+ny369auBjchR8DiESao=", + "lastModified": 1721661754, + "narHash": "sha256-qbDP3rK2yeR83yRzPcJQKCB4/c37iuRFBbp0wOIYCqA=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "60ff4f2f3c3da34746f0993d4e6f1de79979f580", + "rev": "57cd58db1e7945c65ff03035fc54f69b5b3bd565", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1720472194, - "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=", + "lastModified": 1721784420, + "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", "owner": "catppuccin", "repo": "nix", - "rev": "d75d5803852fb0833767dc969a4581ac13204e22", + "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1721267279, - "narHash": "sha256-99utYoUwaX10XMjZiqe1YqhtWg4kUFBXnQikFkWTGtY=", + "lastModified": 1721669480, + "narHash": "sha256-CkGD8ZiiTKf8yBO4ZQcnMyS556GqdZd2R9Vj3ohPQak=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "06531993f69b8cefd5d67d3589791ca9cd6785c2", + "rev": "478804045805230ac0d34e1ea9ad6da4a3580109", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1718474113, - "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "lastModified": 1721322122, + "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", "owner": "ipetkov", "repo": "crane", - "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1718474113, - "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "lastModified": 1718730147, + "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", "owner": "ipetkov", "repo": "crane", - "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1721266288, - "narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=", + "lastModified": 1721871128, + "narHash": "sha256-NyWVCnSeePnJHGJxZ0l3zdGQGrVjUcx2IJbV8KIsPf0=", "owner": "nix-community", "repo": "disko", - "rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47", + "rev": "55e874b9c14764cb791e5740f0e92202e41393fc", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1717827974, - "narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=", + "lastModified": 1721456965, + "narHash": "sha256-AJjRiL2diAitpARbE9bUTlgtqHC8QS1ImXNaXMRhKoU=", "owner": "nix-community", "repo": "fenix", - "rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8", + "rev": "d3121c162a1fa4fabcb9af9642d50e8b05ddfe83", "type": "github" }, "original": { @@ -883,24 +883,6 @@ "type": "github" } }, - "flake-utils_8": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -953,11 +935,11 @@ ] }, "locked": { - "lastModified": 1721135958, - "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", + "lastModified": 1721852138, + "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", "owner": "nix-community", "repo": "home-manager", - "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", + "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", "type": "github" }, "original": { @@ -991,17 +973,16 @@ "crane": "crane_6", "flake-compat": "flake-compat_9", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1719818887, - "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=", + "lastModified": 1721581642, + "narHash": "sha256-Bd9ujkwkxwAYCnYKEKeY1fjsvD4vyiFjFS20Lxr/FD4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429", + "rev": "f3b4ade14392861388265e949b7007a8b62e21dc", "type": "github" }, "original": { @@ -1142,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1720926593, - "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", + "lastModified": 1721531260, + "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", + "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d", "type": "github" }, "original": { @@ -1188,11 +1169,11 @@ }, "nixlib": { "locked": { - "lastModified": 1719708727, - "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", + "lastModified": 1721523216, + "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", + "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", "type": "github" }, "original": { @@ -1209,11 +1190,11 @@ ] }, "locked": { - "lastModified": 1720859326, - "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", + "lastModified": 1721869487, + "narHash": "sha256-zcusn81g+0gO+tSMhfs4W+wAP9As/MWNTBCbS+Ggp7A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", + "rev": "c12f9a969c8cdf14618774515c7c6c96aef753c7", "type": "github" }, "original": { @@ -1224,11 +1205,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721331912, - "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=", + "lastModified": 1721911538, + "narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be", + "rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f", "type": "github" }, "original": { @@ -1271,11 +1252,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1721393053, - "narHash": "sha256-xNiw9gIxyF6xsyXCiFESPjxMjuVAfmr4sBpM9u2l5io=", + "lastModified": 1721929106, + "narHash": "sha256-gYkhL7COqjIxiNzrTB9++C4ATVDxgjPOcr9cHMSnHXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0691657e9634cfc001f02995cca394025e3e940", + "rev": "300a8ae0c5816f16f09c35fd593bf51015498b87", "type": "github" }, "original": { @@ -1366,11 +1347,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718447546, + "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "842253bf992c3a7157b67600c2857193f126563a", "type": "github" }, "original": { @@ -1382,11 +1363,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1720915306, - "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", + "lastModified": 1721524707, + "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", + "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", "type": "github" }, "original": { @@ -1398,11 +1379,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "lastModified": 1721743106, + "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", "type": "github" }, "original": { @@ -1414,11 +1395,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1720781449, - "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", "type": "github" }, "original": { @@ -1526,11 +1507,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1718541509, - "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", + "lastModified": 1719146883, + "narHash": "sha256-DAyIfQgyqalov0DcEKRvDOUin7axELasaP6NCPt7UQA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", + "rev": "084f8df2f3ff80cdec6f515931036f63c5d2f36c", "type": "github" }, "original": { @@ -1542,11 +1523,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "lastModified": 1721743106, + "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", "type": "github" }, "original": { @@ -1581,11 +1562,11 @@ ] }, "locked": { - "lastModified": 1720992717, - "narHash": "sha256-8j1bZVfKT1vJ0e+U7NYRNBG+DdBj5C/tpwe5krxT4/4=", + "lastModified": 1721724566, + "narHash": "sha256-6H+OTxXkOrh3P+15bhkQJY7OaBrQVzx4Pz+pCn6rtIg=", "owner": "pjones", "repo": "plasma-manager", - "rev": "460b48dc3dcd05df568e27cbb90581d23baec8dc", + "rev": "b967e042896de0f64513d4596e3d1f3eae445d1c", "type": "github" }, "original": { @@ -1660,11 +1641,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -1734,11 +1715,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1717583671, - "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=", + "lastModified": 1721414716, + "narHash": "sha256-23zmEelXzAvnfMlLsJ6a6P7yNiI9WOUrS9xh9dXVc/U=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "48bbdd6a74f3176987d5c809894ac33957000d19", + "rev": "b333f85a9dc06a45d9eb126c6371414c49b46784", "type": "github" }, "original": { @@ -1784,21 +1765,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1718504420, - "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", + "lastModified": 1719109180, + "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", + "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", "type": "github" }, "original": { @@ -1836,11 +1813,11 @@ "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1718697807, - "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=", + "lastModified": 1721121314, + "narHash": "sha256-zwc7YXga/1ppaZMWFreZykXtFwBgXodxUZiUx969r+g=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b", + "rev": "059b50b2e729729ea00c6831124d3837c494f3d5", "type": "gitlab" }, "original": { @@ -1856,11 +1833,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1720926522, - "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", + "lastModified": 1721688883, + "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", + "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", "type": "github" }, "original": { @@ -1944,21 +1921,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1967,11 +1929,11 @@ ] }, "locked": { - "lastModified": 1718522839, - "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", + "lastModified": 1721458737, + "narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", + "rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97", "type": "github" }, "original": { @@ -1983,7 +1945,7 @@ "zjstatus": { "inputs": { "crane": "crane_7", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_2" }, From 6374b80760832815aa666490a1de3d3d40c13b1a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Aug 2024 11:01:19 +0200 Subject: [PATCH 018/395] Add some fonts --- nixos/shared/packages/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index c6817e3..5bc6381 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -63,6 +63,8 @@ paratype-pt-serif roboto twemoji-color-font + fontawesome + atkinson-hyperlegible ]; enableDefaultPackages = false; }; From f2d7ccee9bea356c8c351cdd9925753178f18d4a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Aug 2024 11:03:38 +0200 Subject: [PATCH 019/395] Misspelling fixed for font-awesome --- nixos/shared/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 5bc6381..29be270 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -63,7 +63,7 @@ paratype-pt-serif roboto twemoji-color-font - fontawesome + font-awesome atkinson-hyperlegible ]; enableDefaultPackages = false; From 552c63a073592d5340e7bc64007d190be1f7b92f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 9 Aug 2024 13:07:33 +0200 Subject: [PATCH 020/395] update flake lock --- flake.lock | 206 ++++++++++++++++++++++++++--------------------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/flake.lock b/flake.lock index b586175..5304d5a 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721661754, - "narHash": "sha256-qbDP3rK2yeR83yRzPcJQKCB4/c37iuRFBbp0wOIYCqA=", + "lastModified": 1723190888, + "narHash": "sha256-Ly7nXtwKdg0IU6LS0ZGsTKkv21DVzlTYQdJgounfzIA=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "57cd58db1e7945c65ff03035fc54f69b5b3bd565", + "rev": "495a54c03b00ccc913ec8b4f3f5eb837c841d519", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1721784420, - "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "lastModified": 1722997334, + "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", "owner": "catppuccin", "repo": "nix", - "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "complement_2": { "flake": false, "locked": { - "lastModified": 1720637557, - "narHash": "sha256-oZz6nCmFmdJZpC+K1iOG2KkzTI6rlAmndxANPDVU7X0=", + "lastModified": 1722323564, + "narHash": "sha256-6w6/N8walz4Ayc9zu7iySqJRmGFukhkaICLn4dweAcA=", "owner": "matrix-org", "repo": "complement", - "rev": "0d14432e010482ea9e13a6f7c47c1533c0c9d62f", + "rev": "6e4426a9e63233f9821a4d2382bfed145244183f", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1721669480, - "narHash": "sha256-CkGD8ZiiTKf8yBO4ZQcnMyS556GqdZd2R9Vj3ohPQak=", + "lastModified": 1723151906, + "narHash": "sha256-EFUG2y6IkCCKR5BxFRoHyiBZ1eDkl2RQXfR6Cc0gTNw=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "478804045805230ac0d34e1ea9ad6da4a3580109", + "rev": "6662aa21ef4ab8e444fd3c62470fc090f23679fb", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1721322122, - "narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=", + "lastModified": 1721842668, + "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", "owner": "ipetkov", "repo": "crane", - "rev": "8a68b987c476a33e90f203f0927614a75c3f47ea", + "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1718730147, - "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", + "lastModified": 1721842668, + "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", "owner": "ipetkov", "repo": "crane", - "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", + "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1720975002, - "narHash": "sha256-1i521ecK2MFg+lxSk9oRx/C0SsdlI6GS6eYT79nA6TA=", + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", "owner": "ipetkov", "repo": "crane", - "rev": "1791a5b98d2c1bf143ad85469abcfa2426f3f087", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1721871128, - "narHash": "sha256-NyWVCnSeePnJHGJxZ0l3zdGQGrVjUcx2IJbV8KIsPf0=", + "lastModified": 1723080788, + "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", "owner": "nix-community", "repo": "disko", - "rev": "55e874b9c14764cb791e5740f0e92202e41393fc", + "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1721456965, - "narHash": "sha256-AJjRiL2diAitpARbE9bUTlgtqHC8QS1ImXNaXMRhKoU=", + "lastModified": 1722320953, + "narHash": "sha256-DfGaJtgrzcwPQYLTvjL1KaVIjpvi85b2MpM6yEGvJzM=", "owner": "nix-community", "repo": "fenix", - "rev": "d3121c162a1fa4fabcb9af9642d50e8b05ddfe83", + "rev": "483df76def3e5010d709aa3a0418ba2088503994", "type": "github" }, "original": { @@ -727,11 +727,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": { @@ -748,11 +748,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -935,11 +935,11 @@ ] }, "locked": { - "lastModified": 1721852138, - "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { @@ -955,11 +955,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1721226562, - "narHash": "sha256-KfdwusX12hhkzXKBmu2HhaU9EhaxVeWLDQw1Ll2A03o=", + "lastModified": 1723016361, + "narHash": "sha256-iEVCAOn7WUdJGrK2EW5hkfl4gBmYl5gVck+MSn6ba44=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "927eea31915468e06b94bedf678261dc7cf048c8", + "rev": "fc3d12deef508a73c7beef4cd9bebe03acde4ed7", "type": "github" }, "original": { @@ -978,11 +978,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1721581642, - "narHash": "sha256-Bd9ujkwkxwAYCnYKEKeY1fjsvD4vyiFjFS20Lxr/FD4=", + "lastModified": 1722329086, + "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f3b4ade14392861388265e949b7007a8b62e21dc", + "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1721531260, - "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=", + "lastModified": 1722740924, + "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d", + "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ }, "nixlib": { "locked": { - "lastModified": 1721523216, - "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", + "lastModified": 1722732880, + "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", + "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", "type": "github" }, "original": { @@ -1190,11 +1190,11 @@ ] }, "locked": { - "lastModified": 1721869487, - "narHash": "sha256-zcusn81g+0gO+tSMhfs4W+wAP9As/MWNTBCbS+Ggp7A=", + "lastModified": 1723078345, + "narHash": "sha256-HSxOQEKNZXiJe9aWnckTTCThOhcRCabwHa32IduDKLk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "c12f9a969c8cdf14618774515c7c6c96aef753c7", + "rev": "d6c5d29f58acc10ea82afff1de2b28f038f572bd", "type": "github" }, "original": { @@ -1205,11 +1205,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721911538, - "narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=", + "lastModified": 1723149858, + "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f", + "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988", "type": "github" }, "original": { @@ -1252,11 +1252,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1721929106, - "narHash": "sha256-gYkhL7COqjIxiNzrTB9++C4ATVDxgjPOcr9cHMSnHXk=", + "lastModified": 1723199741, + "narHash": "sha256-on+MQChgPNpKkVZ+pRkg059AnxmgcaTXxJyrbfuiGx0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "300a8ae0c5816f16f09c35fd593bf51015498b87", + "rev": "15fc4bb22f8b0faa99db98fd88f22eb2e0bf5eef", "type": "github" }, "original": { @@ -1347,16 +1347,16 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1718447546, - "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842253bf992c3a7157b67600c2857193f126563a", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1379,11 +1379,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721743106, - "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1411,11 +1411,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1720955038, - "narHash": "sha256-GaliJqfFwyYxReFywxAa8orCO+EnDq2NK2F+5aSc8vo=", + "lastModified": 1722957468, + "narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa247c0c90ecf4ae7a032c54fdc21b91ca274062", + "rev": "2a13929e1f191b3690dd2f2db13098b04adb9043", "type": "github" }, "original": { @@ -1491,11 +1491,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -1507,11 +1507,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1719146883, - "narHash": "sha256-DAyIfQgyqalov0DcEKRvDOUin7axELasaP6NCPt7UQA=", + "lastModified": 1722264024, + "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "084f8df2f3ff80cdec6f515931036f63c5d2f36c", + "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", "type": "github" }, "original": { @@ -1523,11 +1523,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1721743106, - "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1562,11 +1562,11 @@ ] }, "locked": { - "lastModified": 1721724566, - "narHash": "sha256-6H+OTxXkOrh3P+15bhkQJY7OaBrQVzx4Pz+pCn6rtIg=", + "lastModified": 1723141065, + "narHash": "sha256-6HD3Cx4KofX3jyWpZK1Nt1RmnPs2tD4HQLm3Ytk+htk=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b967e042896de0f64513d4596e3d1f3eae445d1c", + "rev": "5ab818b79ba5c6651209cc1c1d19afe6c9046ed4", "type": "github" }, "original": { @@ -1641,11 +1641,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1718879355, - "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -1715,11 +1715,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1721414716, - "narHash": "sha256-23zmEelXzAvnfMlLsJ6a6P7yNiI9WOUrS9xh9dXVc/U=", + "lastModified": 1722262053, + "narHash": "sha256-KxjkPVn9rQqYam6DhiN/V2NcMXtYW25maxkJoiVMpmE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "b333f85a9dc06a45d9eb126c6371414c49b46784", + "rev": "a021b85be57d34b1eed687fcafd5d5ec64b2d853", "type": "github" }, "original": { @@ -1771,11 +1771,11 @@ ] }, "locked": { - "lastModified": 1719109180, - "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", + "lastModified": 1722219664, + "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", + "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", "type": "github" }, "original": { @@ -1792,11 +1792,11 @@ ] }, "locked": { - "lastModified": 1721010111, - "narHash": "sha256-GuPw2xhJZ+eszIJFu7z7AtqUmirSWPHpxuCpG6dSOic=", + "lastModified": 1722997267, + "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3ef018b6d0f62eb59580a8e9fe141e37bf1d972d", + "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", "type": "github" }, "original": { @@ -1813,11 +1813,11 @@ "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1721121314, - "narHash": "sha256-zwc7YXga/1ppaZMWFreZykXtFwBgXodxUZiUx969r+g=", + "lastModified": 1722877200, + "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "059b50b2e729729ea00c6831124d3837c494f3d5", + "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", "type": "gitlab" }, "original": { @@ -1833,11 +1833,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1721688883, - "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", + "lastModified": 1722897572, + "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", + "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", "type": "github" }, "original": { @@ -1929,11 +1929,11 @@ ] }, "locked": { - "lastModified": 1721458737, - "narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=", + "lastModified": 1722330636, + "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97", + "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", "type": "github" }, "original": { @@ -1950,11 +1950,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1721054167, - "narHash": "sha256-0ZplHtEXoqytnDExvNoDWoTt1KjcobKVGXv5zmY3jrk=", + "lastModified": 1723031177, + "narHash": "sha256-bjiFmTOpd42a15NTtn8taQxUzCD+7+XbR+HklijsVO4=", "owner": "dj95", "repo": "zjstatus", - "rev": "924f821cf1a1800baa90a443a7150ca795ad93c7", + "rev": "e1e3b566268fbf6c80d6544f38b06368d23b4b46", "type": "github" }, "original": { From 148ac15889d694f7bdbb88c350350137be34c1d9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 11 Aug 2024 16:03:59 +0200 Subject: [PATCH 021/395] Should probably also install install-nix-no-inhibit to everything huh --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 29be270..8ca7a33 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -22,6 +22,7 @@ rebuild rebuild-no-inhibit install-nix + install-nix-no-inhibit update upgrade simple-completion-language-server From 71eab709e772956f58b3f12d7af4374e20f80d35 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:23:55 +0200 Subject: [PATCH 022/395] Let's see if we can run writefreely like this :) --- nixos/hosts/queen/secrets/sops.yaml | 7 ++--- .../package-configs/writefreely/default.nix | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 nixos/server/package-configs/writefreely/default.nix diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index d8c5ab7..68d0e73 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -11,6 +11,7 @@ lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYisHejmycgT8a2mWpk+5r3HkFmBNcLDeNlfnhIif5oLHGuHyw==,iv:M2GdNDxP4xpP35FJPTgljbcKpOm6DmEEnIYRItAxDVI=,tag:IiiNXeTi6Yja5PrnKRkhdA==,type:str] grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str] sync-secrets: ENC[AES256_GCM,data:AwCgqfSXmYVGnCV5PJ5Ql44IiutTS76F1H7Ow7gB4mQQ8PtiAsmArzpAXd7LzsXedm55X04U+GvkcbM9cwPcF+psyb3Zi8EnI/mjnI9MgFyySSEcosJZVAtCpXGIMyYgRXtF5OBh5CzupAG059d1TDAqrSpLXMuSDdypTaOMHxnlq5q1swfpzhhY3PVgUKVFXdjZLX8aF3JTE9ceVxFsB+traLzOQsl+QKty0x0mpuqR97zkMCchX7bTwgUgbl7phzTvmwV8Qw==,iv:gkZs5NB9+CLfz4kfV4ha2llZQPP81uuXRKqUlASgpiA=,tag:DXkiG0ZFHLHlVhwLwtv/XQ==,type:str] +writefreely: ENC[AES256_GCM,data:QOj5h/rHCxmgpPNhu3IS4eyruhQokHTJxW6yQM9YDgQ=,iv:qAd+/rAAanzL9FTIX22M+2kwI0WI2d3i86cJrn8MFBo=,tag:3zvpqnovDEoJdvK/qcFDuQ==,type:str] sops: kms: [] gcp_kms: [] @@ -26,8 +27,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-04T16:38:10Z" - mac: ENC[AES256_GCM,data:KqkNjZe/rMhiWNS3SeYHm+b23u1LD1jq3f0+jB/BVmy6pDQDTNgA/wWHF/HcorU2Z7TOdjofJPuvRuF6C8ec4RCtTxX2ubIYWV4H3BynYxrEuEsIN8EnPJDcFFc92n9PKzoWnHo2NK1a4ZX+DxYVjDDdjhOMWj/kqWRWZRU+qEw=,iv:rarq3mCSfDFzbIdSIe+3mTNTnoZwFZ2uPkYMGt/xqos=,tag:rCD6SUpwOktRo7fM3Irv7g==,type:str] + lastmodified: "2024-08-16T13:19:27Z" + mac: ENC[AES256_GCM,data:C/wU6gDxhgkmzFEOw+NJNRNyDctnCgt8/FsJUhysJ18f344GlCZcLNTOKT04bklfP1y/LGWeALZPWB5crump3k2YuK6kwQsoOkder9BO2GY/bPaLty03KY5xALYFP7vQwfLx7Z/pO76jHVRT19Eh0/tXqb0BHs8qXtvot81g5HU=,iv:GbEt2IFMc/QaUCOcrVhjYVbLUh4monovspYl9DxTA/w=,tag:5dt+5yK/kNOhkn56ufYDxg==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.8.1 + version: 3.9.0 diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix new file mode 100644 index 0000000..e196004 --- /dev/null +++ b/nixos/server/package-configs/writefreely/default.nix @@ -0,0 +1,26 @@ +{ + config, + pkgs, + ... +}: { + sops.secrets."writefreely".mode = "0440"; + sops.secrets."writefreely".owner = config.users.users.writefreely.name; + services.writefreely = { + enable = true; + host = "writefreely.gladtherescake.eu"; + nginx.enable = true; + nginx.forceSSL = true; + acme.enable = true; + database = { + type = "mysql"; + createLocally = true; + }; + admin = { + initialPasswordFile = config.sops.secrets."writefreely".path; + name = "GLaDTheresCake"; + }; + settings = { + server.port = "15763"; + }; + }; +} From e5e108e98315d95da80def91ac277dd593e482c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:30:58 +0200 Subject: [PATCH 023/395] For some reason gladtherescake.eu is being weird, let's try this domain --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index e196004..5e85aec 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -7,7 +7,7 @@ sops.secrets."writefreely".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; - host = "writefreely.gladtherescake.eu"; + host = "writefreely.lillianviolet.dev"; nginx.enable = true; nginx.forceSSL = true; acme.enable = true; From aab4b5c8e30eff4e25314006b36d7a7f440d09c4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:32:50 +0200 Subject: [PATCH 024/395] Wait I might want to actually add writefreely to packages loaded haha --- nixos/server/package-configs/default.nix | 1 + nixos/server/package-configs/writefreely/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 3d72d65..7314158 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -19,5 +19,6 @@ ./dashboard ./cinny ./firefox-sync + ./writefreely ]; } diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 5e85aec..e196004 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -7,7 +7,7 @@ sops.secrets."writefreely".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; - host = "writefreely.lillianviolet.dev"; + host = "writefreely.gladtherescake.eu"; nginx.enable = true; nginx.forceSSL = true; acme.enable = true; From 648af577625a0142ec98e5eaf44bfb070c1aceba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:35:18 +0200 Subject: [PATCH 025/395] Let's set a db password too --- nixos/hosts/queen/secrets/sops.yaml | 5 +++-- nixos/server/package-configs/writefreely/default.nix | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index 68d0e73..2213774 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -12,6 +12,7 @@ coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYis grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str] sync-secrets: ENC[AES256_GCM,data:AwCgqfSXmYVGnCV5PJ5Ql44IiutTS76F1H7Ow7gB4mQQ8PtiAsmArzpAXd7LzsXedm55X04U+GvkcbM9cwPcF+psyb3Zi8EnI/mjnI9MgFyySSEcosJZVAtCpXGIMyYgRXtF5OBh5CzupAG059d1TDAqrSpLXMuSDdypTaOMHxnlq5q1swfpzhhY3PVgUKVFXdjZLX8aF3JTE9ceVxFsB+traLzOQsl+QKty0x0mpuqR97zkMCchX7bTwgUgbl7phzTvmwV8Qw==,iv:gkZs5NB9+CLfz4kfV4ha2llZQPP81uuXRKqUlASgpiA=,tag:DXkiG0ZFHLHlVhwLwtv/XQ==,type:str] writefreely: ENC[AES256_GCM,data:QOj5h/rHCxmgpPNhu3IS4eyruhQokHTJxW6yQM9YDgQ=,iv:qAd+/rAAanzL9FTIX22M+2kwI0WI2d3i86cJrn8MFBo=,tag:3zvpqnovDEoJdvK/qcFDuQ==,type:str] +writefreelymysql: ENC[AES256_GCM,data:1JZwIX04O3DBAo7JvEkeNrFcSdcmk/u4WUf/kkbr2JA=,iv:8H8MR8w1iLfl2r62EbxPnLzs4qWFmwB5gNKEaly8q6c=,tag:K01oKMXkeMOFs3u7frMs0Q==,type:str] sops: kms: [] gcp_kms: [] @@ -27,8 +28,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-08-16T13:19:27Z" - mac: ENC[AES256_GCM,data:C/wU6gDxhgkmzFEOw+NJNRNyDctnCgt8/FsJUhysJ18f344GlCZcLNTOKT04bklfP1y/LGWeALZPWB5crump3k2YuK6kwQsoOkder9BO2GY/bPaLty03KY5xALYFP7vQwfLx7Z/pO76jHVRT19Eh0/tXqb0BHs8qXtvot81g5HU=,iv:GbEt2IFMc/QaUCOcrVhjYVbLUh4monovspYl9DxTA/w=,tag:5dt+5yK/kNOhkn56ufYDxg==,type:str] + lastmodified: "2024-08-16T13:34:43Z" + mac: ENC[AES256_GCM,data:IdQmx7/Y2fdQ9gBgKYCUZQuAVRqbP5KWG4EplO6pYqA8b5xzGnmCSCwyYIXU+3NExEZCEKEfX68mdYlWPRTKUdamOBdN+fQrGXwr5lw5dpKe03ccGw7Hayi0B4O8WbLEjw1RU50v2eoK9MpD5FPrUu1AzGz3+txxzV3hoxg6Sp0=,iv:WXvxAvg+sAKYbzjaz1QKDgVrnMraO3EtIgC12zb9Xi0=,tag:FmH84rGBotouvjCOq+xL8w==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.0 diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index e196004..8021324 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -5,6 +5,8 @@ }: { sops.secrets."writefreely".mode = "0440"; sops.secrets."writefreely".owner = config.users.users.writefreely.name; + sops.secrets."writefreelymysql".mode = "0440"; + sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; host = "writefreely.gladtherescake.eu"; @@ -14,6 +16,7 @@ database = { type = "mysql"; createLocally = true; + passwordFile = config.sops.secrets."writefreelymysql".path; }; admin = { initialPasswordFile = config.sops.secrets."writefreely".path; From 9cfb2ad379951b60ca3bdf27e0904fedd8ee139f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:36:11 +0200 Subject: [PATCH 026/395] That port is wrong --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 8021324..9056a76 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -23,7 +23,7 @@ name = "GLaDTheresCake"; }; settings = { - server.port = "15763"; + server.port = "1576"; }; }; } From d54ba8432a22d138091478fb04256cb8ad0d570d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:37:13 +0200 Subject: [PATCH 027/395] Oh it needs to be a number not a string I think --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 9056a76..47cea68 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -23,7 +23,7 @@ name = "GLaDTheresCake"; }; settings = { - server.port = "1576"; + server.port = 15763; }; }; } From 5854b7cb85fb71bb07b1426727f6f43c72c83ae2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 15:58:26 +0200 Subject: [PATCH 028/395] mysql doesn't want to cooperate, let's try sqlite for now --- nixos/server/package-configs/writefreely/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 47cea68..f04248e 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -14,9 +14,9 @@ nginx.forceSSL = true; acme.enable = true; database = { - type = "mysql"; - createLocally = true; - passwordFile = config.sops.secrets."writefreelymysql".path; + # type = "mysql"; + # createLocally = true; + # passwordFile = config.sops.secrets."writefreelymysql".path; }; admin = { initialPasswordFile = config.sops.secrets."writefreely".path; From bb5a1a1d8f1bd16f39bb1d54a6ba1f98cb19bffc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 19:55:34 +0200 Subject: [PATCH 029/395] Enable federation stuff on writefreely --- nixos/server/package-configs/writefreely/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index f04248e..f8c26f4 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -23,6 +23,10 @@ name = "GLaDTheresCake"; }; settings = { + min_username_len = 2; + max_blogs = 100; + default_visibility = "public"; + federation = true; server.port = 15763; }; }; From d947010d5d375ab510041ed5f611a7be21035b45 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 19:58:44 +0200 Subject: [PATCH 030/395] Ini type not valid? --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index f8c26f4..724dcc9 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -25,7 +25,7 @@ settings = { min_username_len = 2; max_blogs = 100; - default_visibility = "public"; + "default_visibility" = "public"; federation = true; server.port = 15763; }; From e4947f89aee34923d636aa86ffe02f11e85bb78b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 16 Aug 2024 20:01:55 +0200 Subject: [PATCH 031/395] This is the correct hierarchy for the ini --- nixos/server/package-configs/writefreely/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 724dcc9..05173b1 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -23,10 +23,12 @@ name = "GLaDTheresCake"; }; settings = { - min_username_len = 2; - max_blogs = 100; - "default_visibility" = "public"; - federation = true; + app = { + min_username_len = 2; + max_blogs = 100; + default_visibility = "public"; + federation = true; + }; server.port = 15763; }; }; From a939521573c2e3571410ec981eb41bc1fe0b895b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 13:17:58 +0200 Subject: [PATCH 032/395] Enable local timeline on writefreely --- nixos/server/package-configs/writefreely/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 05173b1..402eec9 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -28,6 +28,7 @@ max_blogs = 100; default_visibility = "public"; federation = true; + local_timeline = true; }; server.port = 15763; }; From 77cd704f97494f36f9c727d823e22f2e04d0b653 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 13:31:57 +0200 Subject: [PATCH 033/395] update flake lock --- flake.lock | 114 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 5304d5a..92fd07b 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723190888, - "narHash": "sha256-Ly7nXtwKdg0IU6LS0ZGsTKkv21DVzlTYQdJgounfzIA=", + "lastModified": 1723325427, + "narHash": "sha256-aOZcDWVv2b0MjkzZIHdEM1NIoO/0U1XtuVD4jGnMxLk=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "495a54c03b00ccc913ec8b4f3f5eb837c841d519", + "rev": "8b93af8747bd9de6bce60d1da2d6c8f2728f9ce3", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1722997334, - "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", + "lastModified": 1723691425, + "narHash": "sha256-F25VvHFMaqr26b7goaVWspXaK6XTRFz8RnILV+9OPkk=", "owner": "catppuccin", "repo": "nix", - "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", + "rev": "552056779a136092eb6358c573d925630172fc30", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1723151906, - "narHash": "sha256-EFUG2y6IkCCKR5BxFRoHyiBZ1eDkl2RQXfR6Cc0gTNw=", + "lastModified": 1723861150, + "narHash": "sha256-Px5wNTHVgTAYKCoyaBn8HCuzjBhz/xBXZwMJLLcIxqs=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6662aa21ef4ab8e444fd3c62470fc090f23679fb", + "rev": "28cd784972f9e6e78a77ee54ca07d998ca15a788", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1723080788, - "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", + "lastModified": 1723685519, + "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", "owner": "nix-community", "repo": "disko", - "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", + "rev": "276a0d055a720691912c6a34abb724e395c8e38a", "type": "github" }, "original": { @@ -935,11 +935,11 @@ ] }, "locked": { - "lastModified": 1723015306, - "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -955,11 +955,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1723016361, - "narHash": "sha256-iEVCAOn7WUdJGrK2EW5hkfl4gBmYl5gVck+MSn6ba44=", + "lastModified": 1723743257, + "narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fc3d12deef508a73c7beef4cd9bebe03acde4ed7", + "rev": "e4e0ca14918919300e04e80c34036028b4370640", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1722740924, - "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", + "lastModified": 1723352546, + "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", + "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ }, "nixlib": { "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": { @@ -1190,11 +1190,11 @@ ] }, "locked": { - "lastModified": 1723078345, - "narHash": "sha256-HSxOQEKNZXiJe9aWnckTTCThOhcRCabwHa32IduDKLk=", + "lastModified": 1723870831, + "narHash": "sha256-rXQKvogLHY3BxRVVt5unpbi0zpRf965f57gplWSzQ5k=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d6c5d29f58acc10ea82afff1de2b28f038f572bd", + "rev": "32e9d82bada67fc5155e8d4d99b6fc3a1765bfdc", "type": "github" }, "original": { @@ -1205,11 +1205,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723149858, - "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=", + "lastModified": 1723310128, + "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988", + "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "type": "github" }, "original": { @@ -1252,11 +1252,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1723199741, - "narHash": "sha256-on+MQChgPNpKkVZ+pRkg059AnxmgcaTXxJyrbfuiGx0=", + "lastModified": 1723893954, + "narHash": "sha256-InDwKFEbiv9cYr+gXdQU2x6TUOkpHcKUIfOTYUu+THc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "15fc4bb22f8b0faa99db98fd88f22eb2e0bf5eef", + "rev": "9b503a951d1536dd5467fe8f1956f9312327cc89", "type": "github" }, "original": { @@ -1379,11 +1379,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -1411,11 +1411,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1722957468, - "narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=", + "lastModified": 1723703277, + "narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a13929e1f191b3690dd2f2db13098b04adb9043", + "rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d", "type": "github" }, "original": { @@ -1491,11 +1491,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1523,11 +1523,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -1562,11 +1562,11 @@ ] }, "locked": { - "lastModified": 1723141065, - "narHash": "sha256-6HD3Cx4KofX3jyWpZK1Nt1RmnPs2tD4HQLm3Ytk+htk=", + "lastModified": 1723804780, + "narHash": "sha256-uuiu1UAfYr2Lo+5Ul6eA0UIYouoPvH9aIfYbq7wVF6c=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5ab818b79ba5c6651209cc1c1d19afe6c9046ed4", + "rev": "8726ecaa8b8c06910ef31abced57bf08a59730a1", "type": "github" }, "original": { @@ -1792,11 +1792,11 @@ ] }, "locked": { - "lastModified": 1722997267, - "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", + "lastModified": 1723774846, + "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", + "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f", "type": "github" }, "original": { @@ -1833,11 +1833,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "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": { @@ -1950,11 +1950,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1723031177, - "narHash": "sha256-bjiFmTOpd42a15NTtn8taQxUzCD+7+XbR+HklijsVO4=", + "lastModified": 1723818372, + "narHash": "sha256-dxRAONapqZRIlNfDyh/RVh011pdklBEDr92OsJizkAA=", "owner": "dj95", "repo": "zjstatus", - "rev": "e1e3b566268fbf6c80d6544f38b06368d23b4b46", + "rev": "671e0d12737cd8b269ca4408cfc67295ad3760b7", "type": "github" }, "original": { From 7fe5ec85133ed8b1b37c75683a232936cdbf1fc3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:04:38 +0200 Subject: [PATCH 034/395] Simple completion language server won't build so let's just disable it --- nixos/shared/packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 8ca7a33..307e099 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -25,7 +25,7 @@ install-nix-no-inhibit update upgrade - simple-completion-language-server + # simple-completion-language-server # System tools age From 1fcf3ceebeb3b8fd83299c98c54d2c43d459cd82 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:37:57 +0200 Subject: [PATCH 035/395] I might need to add the https --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 402eec9..ca41449 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -9,7 +9,7 @@ sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; - host = "writefreely.gladtherescake.eu"; + host = "https://writefreely.gladtherescake.eu"; nginx.enable = true; nginx.forceSSL = true; acme.enable = true; From bf76c84f13cfbc32394199d75a1538df886464ef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:41:09 +0200 Subject: [PATCH 036/395] Never mind that, undo --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index ca41449..402eec9 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -9,7 +9,7 @@ sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { enable = true; - host = "https://writefreely.gladtherescake.eu"; + host = "writefreely.gladtherescake.eu"; nginx.enable = true; nginx.forceSSL = true; acme.enable = true; From c19ea7a450d99ecff512f1ce190607c4ca98c747 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:43:28 +0200 Subject: [PATCH 037/395] Maybe it won't work on another port? --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 402eec9..cfaf814 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -30,7 +30,7 @@ federation = true; local_timeline = true; }; - server.port = 15763; + server.port = 80; }; }; } From fdc3c697bd4d97746a319cd1171d3574f7dbd2fa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:44:46 +0200 Subject: [PATCH 038/395] Nope that's not it --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index cfaf814..911452e 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -30,7 +30,7 @@ federation = true; local_timeline = true; }; - server.port = 80; + server.port = 1212; }; }; } From caa3d25659e0a3b5882b7cc992bfb10c4f6c39ca Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:48:47 +0200 Subject: [PATCH 039/395] Disable firefox sync --- nixos/server/package-configs/default.nix | 2 +- nixos/server/package-configs/writefreely/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 7314158..ef92293 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -18,7 +18,7 @@ ./coturn ./dashboard ./cinny - ./firefox-sync + #./firefox-sync ./writefreely ]; } diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 911452e..8f04a8a 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -14,9 +14,9 @@ nginx.forceSSL = true; acme.enable = true; database = { - # type = "mysql"; + type = "mysql"; # createLocally = true; - # passwordFile = config.sops.secrets."writefreelymysql".path; + passwordFile = config.sops.secrets."writefreelymysql".path; }; admin = { initialPasswordFile = config.sops.secrets."writefreely".path; From b17fea860ab7bfba8cb5c168fadc9950374725b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:49:52 +0200 Subject: [PATCH 040/395] Try again to enable mysql --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 8f04a8a..f83c10f 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -15,7 +15,7 @@ acme.enable = true; database = { type = "mysql"; - # createLocally = true; + createLocally = true; passwordFile = config.sops.secrets."writefreelymysql".path; }; admin = { From a331ba6a399ec6b2643c4c8b1b12c4c3e6a8eed6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 14:51:47 +0200 Subject: [PATCH 041/395] Urgh doesn't work still --- nixos/server/package-configs/writefreely/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index f83c10f..8dc9ab7 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -13,11 +13,11 @@ nginx.enable = true; nginx.forceSSL = true; acme.enable = true; - database = { - type = "mysql"; - createLocally = true; - passwordFile = config.sops.secrets."writefreelymysql".path; - }; + # database = { + # type = "mysql"; + # createLocally = true; + # passwordFile = config.sops.secrets."writefreelymysql".path; + # }; admin = { initialPasswordFile = config.sops.secrets."writefreely".path; name = "GLaDTheresCake"; From 6aa4012f878bfd89400941567a113ff430428bfc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 15:00:52 +0200 Subject: [PATCH 042/395] Error says I'm missing openssl in my path, maybe this will fix federation? --- nixos/server/package-configs/writefreely/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 8dc9ab7..1c7329d 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -8,6 +8,7 @@ sops.secrets."writefreelymysql".mode = "0440"; sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { + path = with pkgs; [openssl]; enable = true; host = "writefreely.gladtherescake.eu"; nginx.enable = true; From 596abd5e90910bfb21492058be3219de44e77b7b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 15:03:52 +0200 Subject: [PATCH 043/395] Maybe just installing it is enough? --- nixos/hosts/queen/configuration.nix | 1 + nixos/server/package-configs/writefreely/default.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 3495abc..9c9ba8b 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -73,6 +73,7 @@ nextcloud28 nginx onlyoffice-documentserver + openssl phanpy postgresql_16 python310 diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 1c7329d..8dc9ab7 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -8,7 +8,6 @@ sops.secrets."writefreelymysql".mode = "0440"; sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; services.writefreely = { - path = with pkgs; [openssl]; enable = true; host = "writefreely.gladtherescake.eu"; nginx.enable = true; From 8dab56592764281a64f30565128c24ec8e0165ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 15:08:57 +0200 Subject: [PATCH 044/395] Let me try manually adding it to the systemd service? --- nixos/server/package-configs/writefreely/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 8dc9ab7..0d2b4e4 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -33,4 +33,7 @@ server.port = 1212; }; }; + systemd.services.writefreely = { + path = [openssl]; + }; } From 12dc7835a0139b856fc4d88d6e77a85f3fd632d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 15:09:29 +0200 Subject: [PATCH 045/395] Need to add pkgs --- nixos/server/package-configs/writefreely/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 0d2b4e4..43dc7bc 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -34,6 +34,6 @@ }; }; systemd.services.writefreely = { - path = [openssl]; + path = [pkgs.openssl]; }; } From 0d34709c233daabc96120f46ed3b7ebf653050ba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 19:08:10 +0200 Subject: [PATCH 046/395] Add exfat support to maybe make the sd car reader work --- nixos/desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index d867eab..3b49a33 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -49,6 +49,8 @@ clinfo comma direnv + exfat + exfatprogs git-filter-repo gnupg pciutils From f0a50b9b5324c6f66649b8cdd727da098efab476 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 19:58:16 +0200 Subject: [PATCH 047/395] Disable watchmate for now since it's broken --- home-manager/desktop/default.nix | 2 +- home-manager/hosts/shodan/lillian.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 43c1a80..19ff7a4 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -110,7 +110,7 @@ nitrokey-app protonvpn-gui virtualbox - watchmate + #watchmate qbittorrent # Theming: diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index c37facd..f0a5c0d 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -73,7 +73,7 @@ nitrokey-app protonvpn-gui sops - watchmate + #watchmate qbittorrent zsh From 4ae563422d5eb0a1e106fa1e71e3d42545ff3816 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 17 Aug 2024 20:09:13 +0200 Subject: [PATCH 048/395] Same deal for rustdesk --- nixos/desktop/default.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 3b49a33..39f1937 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -88,7 +88,7 @@ noisetorch qjackctl wireplumber - rustdesk + #rustdesk ]) ++ (with pkgs-edge; [ # list of latest packages from nixpkgs master diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 9f586a6..f7e0c3e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -59,7 +59,7 @@ noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji - rustdesk + #rustdesk sbctl udisks util-linux From 9295fa0327b25b843e9eb86fd755e78e6105daee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 08:17:15 +0000 Subject: [PATCH 049/395] Change ssh key for EDI The new key signature for EDI for sshing updated --- nixos/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 20a22ec..41cf391 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -66,7 +66,7 @@ shell = pkgs.zsh; hashedPasswordFile = config.sops.secrets."lillian-password".path; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" ]; }; From f9d4122ff2e233421c4886bd135f782a68dda0a3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 08:18:13 +0000 Subject: [PATCH 050/395] Remove bcachefs stuff from desktops --- nixos/desktop/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 39f1937..80a26bf 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -17,9 +17,9 @@ nixpkgs = { # You can add overlays here overlays = [ - (final: prev: { - bcachefs-tools = pkgs-edge.bcachefs-tools; - }) + #(final: prev: { + #bcachefs-tools = pkgs-edge.bcachefs-tools; + #}) # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.modifications @@ -45,7 +45,7 @@ # System tools aha - bcachefs-tools + #bcachefs-tools clinfo comma direnv @@ -173,8 +173,8 @@ # FIXME: re-enable virtual camera loopback when it build again. boot.bootspec.enable = true; - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - boot.supportedFilesystems = ["bcachefs"]; + #boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + #boot.supportedFilesystems = ["bcachefs"]; boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; boot.kernelModules = [ # Virtual Camera From 1f10354d14f3d3827d9ece8ebcc1bde590d6b930 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 08:18:54 +0000 Subject: [PATCH 051/395] Make bcachefs ext4 in EDI --- disko/EDI/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disko/EDI/default.nix b/disko/EDI/default.nix index 1c2ab31..6fe0e0a 100644 --- a/disko/EDI/default.nix +++ b/disko/EDI/default.nix @@ -57,7 +57,7 @@ size = "100%FREE"; content = { type = "filesystem"; - format = "bcachefs"; + format = "ext4"; mountpoint = "/"; mountOptions = [ "defaults" From c33fbecf66584a78bcbf50916a94440380a26097 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 08:20:28 +0000 Subject: [PATCH 052/395] Change conduit to conduwuit in the flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 40ddf08..03cf2a4 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,7 @@ jovian, nixos-hardware, nix-index-database, - conduit, + conduwuit, ... } @ inputs: let inherit (self) outputs; From 71c086cd45b24331e0164d6b19e55be9ac7f9188 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 10:51:45 +0200 Subject: [PATCH 053/395] Update flake lock & disable cinny for now --- flake.lock | 592 ++++++----------------- nixos/server/package-configs/default.nix | 2 +- 2 files changed, 141 insertions(+), 453 deletions(-) diff --git a/flake.lock b/flake.lock index 92fd07b..5c813e1 100644 --- a/flake.lock +++ b/flake.lock @@ -8,29 +8,6 @@ "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, - "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, - "attic_2": { - "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_2" - }, "locked": { "lastModified": 1720542474, "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", @@ -60,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723325427, - "narHash": "sha256-aOZcDWVv2b0MjkzZIHdEM1NIoO/0U1XtuVD4jGnMxLk=", + "lastModified": 1724456070, + "narHash": "sha256-Mbi9N8S3OjS1XywvkraGf+jmOXZrjhTjVoWYxSf+XSY=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "8b93af8747bd9de6bce60d1da2d6c8f2728f9ce3", + "rev": "b422b19f636329e1a082bcacd3ac6b485d7a5b3e", "type": "github" }, "original": { @@ -92,8 +69,8 @@ "cachix": { "inputs": { "devenv": "devenv", - "flake-compat": "flake-compat_6", - "nixpkgs": "nixpkgs_5", + "flake-compat": "flake-compat_4", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -149,11 +126,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1723691425, - "narHash": "sha256-F25VvHFMaqr26b7goaVWspXaK6XTRFz8RnILV+9OPkk=", + "lastModified": 1724469296, + "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", "owner": "catppuccin", "repo": "nix", - "rev": "552056779a136092eb6358c573d925630172fc30", + "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", "type": "github" }, "original": { @@ -163,23 +140,6 @@ } }, "complement": { - "flake": false, - "locked": { - "lastModified": 1715700731, - "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", - "owner": "matrix-org", - "repo": "complement", - "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "complement_2": { "flake": false, "locked": { "lastModified": 1722323564, @@ -196,52 +156,28 @@ "type": "github" } }, - "conduit": { + "conduwuit": { "inputs": { "attic": "attic", + "cachix": "cachix", "complement": "complement", "crane": "crane_3", "fenix": "fenix_2", - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_2", - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1715983991, - "narHash": "sha256-2OL8zPpDHXgOxNqXlWqd1aJ2uZJCAuoqBWaabwWUg2M=", - "path": "/nix/store/2h6yxx9z1if5pqwsr7m6pr07h8i498qz-source", - "rev": "8bffcfe82b3cc50bb095f41afc585fabacb963e3", - "type": "path" - }, - "original": { - "id": "conduit", - "type": "indirect" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic_2", - "cachix": "cachix", - "complement": "complement_2", - "crane": "crane_5", - "fenix": "fenix_3", - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_3", "liburing": "liburing", - "nix-filter": "nix-filter_2", + "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ], - "rocksdb": "rocksdb_2" + "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1723861150, - "narHash": "sha256-Px5wNTHVgTAYKCoyaBn8HCuzjBhz/xBXZwMJLLcIxqs=", + "lastModified": 1724781403, + "narHash": "sha256-MO4WUq7p4SRnGVtxuDH5PLZnPgwl1ZtoXmwt5R/OTwc=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "28cd784972f9e6e78a77ee54ca07d998ca15a788", + "rev": "d26493562528172595ea063c55f76b7eb0d6b7c4", "type": "github" }, "original": { @@ -272,50 +208,6 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "inputs": { - "nixpkgs": [ - "conduit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715274763, - "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", - "owner": "ipetkov", - "repo": "crane", - "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { "inputs": { "nixpkgs": [ "conduwuit", @@ -337,7 +229,7 @@ "type": "github" } }, - "crane_5": { + "crane_3": { "inputs": { "nixpkgs": [ "conduwuit", @@ -359,7 +251,7 @@ "type": "github" } }, - "crane_6": { + "crane_4": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -380,7 +272,7 @@ "type": "github" } }, - "crane_7": { + "crane_5": { "inputs": { "nixpkgs": [ "zjstatus", @@ -388,11 +280,11 @@ ] }, "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "lastModified": 1724537630, + "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", "owner": "ipetkov", "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", "type": "github" }, "original": { @@ -445,7 +337,7 @@ "flake-compat" ], "nix": "nix", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "poetry2nix": "poetry2nix", "pre-commit-hooks": [ "conduwuit", @@ -477,11 +369,11 @@ ] }, "locked": { - "lastModified": 1723685519, - "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", + "lastModified": 1724895876, + "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=", "owner": "nix-community", "repo": "disko", - "rev": "276a0d055a720691912c6a34abb724e395c8e38a", + "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3", "type": "github" }, "original": { @@ -513,35 +405,12 @@ } }, "fenix_2": { - "inputs": { - "nixpkgs": [ - "conduit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1715322226, - "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", - "owner": "nix-community", - "repo": "fenix", - "rev": "297c756ba6249d483c1dafe42378560458842173", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, - "fenix_3": { "inputs": { "nixpkgs": [ "conduwuit", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src_3" + "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { "lastModified": 1720852044, @@ -574,22 +443,6 @@ "type": "github" } }, - "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-compat_2": { "flake": false, "locked": { @@ -609,16 +462,15 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { "owner": "edolstra", - "ref": "master", "repo": "flake-compat", "type": "github" } @@ -626,11 +478,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -642,11 +494,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -667,6 +519,7 @@ }, "original": { "owner": "edolstra", + "ref": "master", "repo": "flake-compat", "type": "github" } @@ -688,23 +541,6 @@ } }, "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_9": { "flake": false, "locked": { "lastModified": 1696426674, @@ -780,40 +616,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1689068808, "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", @@ -828,9 +630,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -847,9 +649,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -865,9 +667,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -935,11 +737,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -952,14 +754,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1723743257, - "narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=", + "lastModified": 1724908834, + "narHash": "sha256-QYtm4H+nzO8lYJYN6TfitmZ5jvb94YqY5MGWvZRCre8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e4e0ca14918919300e04e80c34036028b4370640", + "rev": "0ce5684924f553c65828041a86e7e3e09aeaac29", "type": "github" }, "original": { @@ -970,10 +772,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_6", - "flake-compat": "flake-compat_9", + "crane": "crane_4", + "flake-compat": "flake-compat_7", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -1010,7 +812,7 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_3", "nixpkgs": [ "conduwuit", "cachix", @@ -1052,22 +854,6 @@ "type": "github" } }, - "nix-filter_2": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1123,11 +909,11 @@ ] }, "locked": { - "lastModified": 1723352546, - "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", + "lastModified": 1724576102, + "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", + "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", "type": "github" }, "original": { @@ -1169,11 +955,11 @@ }, "nixlib": { "locked": { - "lastModified": 1723337705, - "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=", + "lastModified": 1724547350, + "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a", + "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", "type": "github" }, "original": { @@ -1190,11 +976,11 @@ ] }, "locked": { - "lastModified": 1723870831, - "narHash": "sha256-rXQKvogLHY3BxRVVt5unpbi0zpRf965f57gplWSzQ5k=", + "lastModified": 1724893087, + "narHash": "sha256-M3+Z8SSpzKPQ+/vw9a99G9HfqKWbVGzhFz4p3KAX0NI=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "32e9d82bada67fc5155e8d4d99b6fc3a1765bfdc", + "rev": "0dd0205bc3f6d602ddb62aaece5f62a8715a9e85", "type": "github" }, "original": { @@ -1205,11 +991,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724878143, + "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "type": "github" }, "original": { @@ -1252,11 +1038,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1723893954, - "narHash": "sha256-InDwKFEbiv9cYr+gXdQU2x6TUOkpHcKUIfOTYUu+THc=", + "lastModified": 1724918179, + "narHash": "sha256-vQ1gVPgJiDHPTjhwCqr9c/Z1YEhRzvhy6NvH2En200c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b503a951d1536dd5467fe8f1956f9312327cc89", + "rev": "9e073dc84d49aca4f845305641c552d9332b212f", "type": "github" }, "original": { @@ -1314,22 +1100,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1718811006, "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", @@ -1345,7 +1115,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -1361,7 +1131,7 @@ "type": "github" } }, - "nixpkgs-stable_5": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1721524707, "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", @@ -1379,11 +1149,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -1393,71 +1163,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1721466660, - "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1723703277, - "narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1692808169, "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", @@ -1473,7 +1179,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1719848872, "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", @@ -1489,13 +1195,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -1505,7 +1211,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1722264024, "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", @@ -1521,13 +1227,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -1537,7 +1243,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1552,6 +1258,38 @@ "type": "indirect" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1724748588, + "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1562,11 +1300,11 @@ ] }, "locked": { - "lastModified": 1723804780, - "narHash": "sha256-uuiu1UAfYr2Lo+5Ul6eA0UIYouoPvH9aIfYbq7wVF6c=", + "lastModified": 1724556439, + "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", "owner": "pjones", "repo": "plasma-manager", - "rev": "8726ecaa8b8c06910ef31abced57bf08a59730a1", + "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", "type": "github" }, "original": { @@ -1577,7 +1315,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "conduwuit", @@ -1604,14 +1342,14 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_5", "gitignore": "gitignore", "nixpkgs": [ "conduwuit", "cachix", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1719259945, @@ -1638,7 +1376,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1721042469, @@ -1655,23 +1393,6 @@ } }, "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1714770052, - "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "db6df0b185774778457dabfcbd822cb81760cade", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.1.1", - "repo": "rocksdb", - "type": "github" - } - }, - "rocksdb_2": { "flake": false, "locked": { "lastModified": 1720900786, @@ -1692,18 +1413,17 @@ "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduit": "conduit", "conduwuit": "conduwuit", "disko": "disko", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1730,23 +1450,6 @@ } }, "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1715255944, - "narHash": "sha256-vLLgYpdtKBaGYTamNLg1rbRo1bPXp4Jgded/gnprPVw=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "5bf2f85c8054d80424899fa581db1b192230efb5", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_3": { "flake": false, "locked": { "lastModified": 1720717809, @@ -1792,11 +1495,11 @@ ] }, "locked": { - "lastModified": 1723774846, - "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=", + "lastModified": 1724811750, + "narHash": "sha256-PvhVgQ1rm3gfhK7ts4emprhh/KMkFwXogmgsQ3srR7g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f", + "rev": "6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6", "type": "github" }, "original": { @@ -1808,8 +1511,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_10", - "nixpkgs": "nixpkgs_9", + "flake-compat": "flake-compat_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1829,8 +1532,8 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_10", - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs": "nixpkgs_8", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1723501126, @@ -1906,21 +1609,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1944,17 +1632,17 @@ }, "zjstatus": { "inputs": { - "crane": "crane_7", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_11", + "crane": "crane_5", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_9", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1723818372, - "narHash": "sha256-dxRAONapqZRIlNfDyh/RVh011pdklBEDr92OsJizkAA=", + "lastModified": 1724858904, + "narHash": "sha256-QGzfl4YHTl/HuYy6oe/OqAX8xViYht1BCCIpWq7uH5U=", "owner": "dj95", "repo": "zjstatus", - "rev": "671e0d12737cd8b269ca4408cfc67295ad3760b7", + "rev": "b2f15019bdfc04f65cac7cd073418ac6ad4dbddc", "type": "github" }, "original": { diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index ef92293..6384555 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -17,7 +17,7 @@ ./roundcube ./coturn ./dashboard - ./cinny + #./cinny #./firefox-sync ./writefreely ]; From 8d291e248885f1390053522dbaa895ec1e54c5fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 11:17:20 +0200 Subject: [PATCH 054/395] Disable lanzaboote for now --- nixos/hosts/EDI/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 78ee9f7..d0d1767 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -49,13 +49,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = lib.mkForce false; + boot.loader.systemd-boot.enable = true; boot.initrd.systemd.enable = true; - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + # boot.lanzaboote = { + # enable = true; + # pkiBundle = "/etc/secureboot"; + # }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "24.11"; From d1fc8d1b869a976a110cb91b845438135d0c3d16 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 11:46:26 +0200 Subject: [PATCH 055/395] Fix sidebar in firefox --- .../desktop/package-configs/firefox.nix | 398 +++++++++--------- 1 file changed, 199 insertions(+), 199 deletions(-) diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 8145022..0da278d 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -29,342 +29,342 @@ "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo"; }; userChrome = '' - /* - Title: Drannex42's FirefoxSidebar / Vertical Tabs - Description: Vertical tab design for Firefox with dynamic indentation:: - Sideberry and TreeStyleTabs (Legacy) themes available! - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: 12022.04.17 - */ - /* - Preferences / Settings :: - Use this file to set your preferences this will save them in one place for easier future updating - ========================================================================= - */ - - /* - Preferences / Settings - Use this file to set your preferences this will save them in one place for easier future updating - ========================================================================= + Title: Drannex42's FirefoxSidebar / Vertical Tabs + Description: Vertical tab design for Firefox with dynamic indentation:: + Sideberry and TreeStyleTabs (Legacy) themes available! + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: 12022.04.17 */ :root { - --sidebar-width: 50px; - --toolbar-height: -12px; - --menubar-height: -42px; - --sidebar-padding: calc(var(--sidebar-width) + 5px); - --toolbar-start-end-padding: 5px !important; + --sidebar-width: 50px; + --toolbar-height: 10px; + --menubar-height: 100px; + --sidebar-padding: calc(var(--sidebar-width) + 5px); + --toolbar-start-end-padding: 5px !important; - /* Custom Sidebar/Header Backround :: + /* Custom Sidebar/Header Backround :: This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly - */ + */ /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */ - --custom-sidebar-header-bg: #000; /* Default: Field (Disabled) */ + /* --custom-sidebar-header-bg: #000; */ - /* ====== Extension Settings ====== */ + /* ====== Extension Settings ====== */ - /* Window Control / Client Side Display Settings === + /* Window Control / Client Side Display Settings === If you are putting this on the left or right side uncomment the side preferences below and comment the other ========================================================================= - */ + */ --csd-width: 100px; --csd-top: 8px; /* - CSD - Left Side === - Default: --csd-left: 50px; --csd-margin-left: 92px; + CSD - Left Side === + Default: --csd-left: 50px; --csd-margin-left: 92px; */ - /* - --csd-left: 50px; - --csd-margin-left: 92px; - */ - /* - CSD - Right Side === - Defaults: --csd-right: 0px; --csd-margin-right: 95px; + --csd-left: 50px; + --csd-margin-left: 92px; */ - --csd-right: 36px; - --csd-margin-right: 130px; + /* + CSD - Right Side === + Defaults: --csd-right: 0px; --csd-margin-right: 95px; + */ - /* === END: Window Control / Client Side Display Settings === */ + --csd-right: 36px; + --csd-margin-right: 130px; - /* === END: Extension Settings === */ + /* === END: Window Control / Client Side Display Settings === */ + + /* === END: Extension Settings === */ } /* ========================================================================= */ - /* Sidebar (Core) :: This file is for the sidebar implementation */ /* - Extension (Core): Sidebar - Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: v12022.11.22 (YYYYY.MM.DD) + Extension (Core): Sidebar + Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: v12024.05.15 (YYYYY.MM.DD) */ #main-window #TabsToolbar { - visibility: collapse; + visibility: collapse; } + /* As of v12024.05.15 we updated to using this one by MrOtherGuy, with modifications */ + /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0 */ + /* Show sidebar only when the cursor is over it */ + /* The border controlling sidebar width will be removed so you'll need to modify these values to change width */ - #sidebar-box > #browser, - #webextpanels-window { - background: transparent !important; - - } - - #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] - #sidebar-header { - /*! display: none; */ - } - - /*Collapse in default state and add transition*/ #sidebar-box { - /*! overflow: visible !important; */ - border-right: none !important; /* border-right: 1px solid var(--sidebar-border-color) !important; */ - z-index: 2; - border-right: none !important; - width: 100% !important; - background: var(--custom-sidebar-bg, --sidebar-background); - - /* lock sidebar to height by doing the inverse margin of the toolbar element */ - z-index: 1000 !important; - position: relative !important; - margin-top: var(--menubar-height) !important; - border-right: none; - transition: none !important; - - /* lock sidebar to specified width */ - min-width: var(--sidebar-width) !important; - max-width: var(--sidebar-width) !important; - overflow: hidden !important; - transition-property: width; - transition-duration: 0.25s; - transition-delay: 0.25s; - transition-timing-function: ease-in; + --uc-sidebar-width: 50px; + --uc-sidebar-hover-width: 260px; + --uc-autohide-sidebar-delay: 10ms; + /* Wait 0.6s before hiding sidebar */ + --uc-autohide-transition-duration: 115ms; + --uc-autohide-transition-type: linear; + position: relative; + min-width: var(--uc-sidebar-width) !important; + width: var(--uc-sidebar-width) !important; + max-width: var(--uc-sidebar-width) !important; + z-index: 1; + margin-top: -40px; } - #sidebar-box::after { - background: var(--sidebar-border-color) !important; - margin-left: 207px; - z-index: 9999999; - position: absolute; - content: " "; - width: 1px; - height: 100%; - top: 0; - right: 0px; + + #sidebar-box[positionend] { + direction: rtl } - #sidebar-box:hover:after { - top: 42px; + #sidebar-box[positionend]>* { + direction: ltr } - /*All other sidebar-boxes should be larger on hover*/ - #sidebar-box:hover, #sidebar-box #sidebar:hover { - min-width: 350px !important; - max-width: 350px !important; - z-index: 999; - margin-right: -300px !important; + #sidebar-box[positionend]:-moz-locale-dir(rtl) { + direction: ltr } - /*Tree Style Tabs && Sideberry specific sidebar width and size*/ + #sidebar-box[positionend]:-moz-locale-dir(rtl)>* { + direction: rtl + } - #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"]:hover, - #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]:hover, - #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar:hover { - min-width: 260px !important; - max-width: 260px !important; - margin-right: -210px !important; + #main-window[sizemode="fullscreen"] #sidebar-box { + --uc-sidebar-width: 1px; + } + + #sidebar-splitter { + display: none } #sidebar-header { - border: none !important; - border-right: 1px solid var(--sidebar-border-color); - background: var(--custom-sidebar-header-bg, transparent) !important; + overflow: hidden; + color: var(--chrome-color, inherit) !important; + padding-inline: 0 !important; + background: var(--custom-sidebar-header-bg, inherit) !important; + padding: 8px 12px !important; + padding-top: 9px !important; + border-bottom: none !Important; } - #sidebar-close, - #sidebar-title, - #sidebar-switcher-arrow { - display: none; - border: none; + #sidebar-header::before, + #sidebar-header::after { + content: ""; + display: flex; + padding-left: 0px; } - #sidebar-switcher-target { - border: none !important; - margin-left: 4.5px !important; - padding-top: 4px !important; - padding-bottom: 6px !important; + #sidebar-header, + #sidebar { + transition: min-width var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important; + min-width: var(--uc-sidebar-width) !important; + will-change: min-width; } - #sidebar-switcher-target:focus-visible:not(:hover, [open]), - #sidebar-close:focus-visible:not(:hover, [open]) { - outline: none !important; + #sidebar-box:hover>#sidebar-header, + #sidebar-box:hover>#sidebar { + min-width: var(--uc-sidebar-hover-width) !important; + width: var(--uc-sidebar-hover-width) !important; + transition-delay: 0ms !important; + } + + #sidebar-box>#sidebar-header #sidebar-title { + opacity: 0; + } + + #sidebar-box:hover>#sidebar-header #sidebar-title { + opacity: 1; + } + + .sidebar-panel { + background-color: transparent !important; + color: var(--newtab-text-primary-color) !important; + } + + .sidebar-panel #search-box { + -moz-appearance: none !important; + background-color: rgba(249, 249, 250, 0.1) !important; + color: inherit !important; + } + + /* Add sidebar divider and give it background */ + + #sidebar, + #sidebar-header { + background-color: inherit !important; + border-right: 1px solid var(--sidebar-border-color); + border-inline-width: 0px 1px; + } + + #sidebar-box:not([positionend])> :-moz-locale-dir(rtl), + #sidebar-box[positionend]>* { + border-inline-width: 1px 0px; } + /* Move statuspanel to the other side when sidebar is hovered so it doesn't get covered by sidebar */ - .sidebar-splitter { - opacity: 0 !important; - width: 0px !important; - border: none !important; - --avatar-image-url: none !important; + #sidebar-box:not([positionend]):hover~#appcontent #statuspanel { + inset-inline: auto 0px !important; } - #sidebarMenu-popup .subviewbutton { - min-width: 0px; - padding: 0; - margin: 0 !important; + #sidebar-box:not([positionend]):hover~#appcontent #statuspanel-label { + margin-inline: 0px !important; + border-left-style: solid !important; } - toolbarseparator { - display: none; - } - - #nav-bar-customization-target { - z-index: 99999; - position: relative; - } .browser-toolbar { - padding-left: var(--sidebar-width) !important; - position: relative !important; + padding-left: var(--sidebar-width) !important; + position: relative !important; } #PersonalToolbar { - padding: 2px 5px !important; - padding-top: 0px !important; - margin-top: 0px !important; - padding-left: calc(var(--sidebar-width) + 6px) !important; + padding: 2px 5px !important; + padding-top: 0px !important; + margin-top: 0px !important; + padding-left: calc(var(--sidebar-width) + 6px) !important; } /* - Extensions :: - To enable/disable specific extensions just comment/uncomment the line below. - ========================================================================= + Extensions :: + To enable/disable specific extensions just comment/uncomment the line below. + ========================================================================= */ - /* CSD / Window Controls */ /* - Extension: Window Controls / Client Side Decorations (CSD) - Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Contributors: Mr-nUUb, Xanaxus, Drannex42 - Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 + Extension: Window Controls / Client Side Decorations (CSD) + Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Contributors: Mr-nUUb, Xanaxus, Drannex42 + Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 */ /* allow the buttons to appear */ .browser-toolbar { - position: unset !important; + position: unset !important; } /* reserve space for buttons */ #nav-bar { - padding-right: var(--csd-margin-right) !important; - margin-left: var(--csd-margin-left) !important; + padding-right: var(--csd-margin-right) !important; + margin-left: var(--csd-margin-left) !important; } /* move buttons next to menu button */ .titlebar-buttonbox-container { - visibility: visible !important; - position: fixed !important; - display: block; - z-index: 999999999; - top: var(--csd-top, inherit); - right: var(--csd-right, inherit); - left: var(--csd-left, inherit); - max-width: var(--csd-width); + visibility: visible !important; + position: fixed !important; + display: block; + z-index: 999999999; + top: var(--csd-top, inherit); + right: var(--csd-right, inherit); + left: var(--csd-left, inherit); + max-width: var(--csd-width); } /* hide buttons in fullscreen mode (video player and F11) */ #main-window[inFullscreen="true"] .titlebar-buttonbox-container, #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container { - visibility: hidden !important; + visibility: hidden !important; } /* remove empty space when in fullscreen mode (F11) */ #main-window[inFullscreen="true"] #nav-bar { - padding-right: 0px !important; - margin-left: 0px !important; + padding-right: 0px !important; + margin-left: 0px !important; } + /* END Client Side Decorations / Window Controls */ + /* + Extension: Superbox Removal (and compaction) + Description: This removes the superbox and fixes some padding around the urlbar. + Repository URL: https://github.com/drannex42/FirefoxSidebar + */ + /* --- Prevent enlargement */ #urlbar[breakout-extend] { - top: calc( - (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 - ) !important; - left: 0 !important; - width: 100% !important; + /* top: calc( */ + /* (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 */ + /* ) !important; */ + /* Fix due to deprecation https://www.reddit.com/r/firefox/comments/1cs3g49/address_bar_suggestions_going_up_instead_of_down/ */ + top: calc((var(--urlbar-container-height, --urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important; + left: 0 !important; + width: 100% !important; } #urlbar[breakout-extend] #urlbar-input-container { - height: var(--urlbar-height) !important; - /* padding: 0px !important; */ - padding-block: 0px !important; - padding-inline: 0px !important; + height: var(--urlbar-height) !important; + /* padding: 0px !important; */ + padding-block: 0px !important; + padding-inline: 0px !important; } + .urlbarView-row { - padding: 0px 2px 0px 2px; + padding: 0px 2px 0px 2px; } + /* END Prevent enlargement --- */ /*/* --- Reduce row paddings to make them more compact */ .urlbarView-row { - padding: 2px 0px !important; - line-height: 1.2em !important; - margin: -1px; - margin-bottom: 0px; + padding: 2px 0px !important; + line-height: 1.2em !important; + margin: -1px; + margin-bottom: 0px; } + .urlbarView-row-inner { - padding-bottom: 6px !important; + padding-bottom: 6px !important; } + .urlbarView { - margin: 0px !important; - width: 100% !important; + margin: 0px !important; + width: 100% !important; } + /* END Reduce row paddings to make them more compact --- */ /* Disable Urlbar Animation */ - #urlbar[breakout][breakout-extend][breakout-extend-animate] - > #urlbar-background { - animation-name: none !important; - animation: none !important; + #urlbar[breakout][breakout-extend][breakout-extend-animate]>#urlbar-background { + animation-name: none !important; + animation: none !important; } + /* END Disable Urlbar Animation */ /* --- More compact "Search with Google" rows */ - .urlbarView-row[dynamicType="onboardTabToSearch"] > .urlbarView-row-inner { - min-height: auto !important; - width: auto !important; + .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner { + min-height: auto !important; + width: auto !important; } - .urlbarView-row[dynamicType="onboardTabToSearch"] - > .urlbarView-row-inner - > .urlbarView-no-wrap - > .urlbarView-favicon { - margin-bottom: -1px; + + .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon { + margin-bottom: -1px; } + /* END More compact "Search with Google" rows --- */ /* Remove active border on the addressbar when in focus */ #nav-bar { - --toolbar-field-focus-border-color: #ccc; + --toolbar-field-focus-border-color: #ccc; } /* Remove box shadow on address bar */ #urlbar-background, #searchbar { - box-shadow: none !important; + box-shadow: none !important; } ''; bookmarks = [ From 469bd2b40a7a4c41896bf3a09f221f1e08fe2876 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 13:58:18 +0200 Subject: [PATCH 056/395] Update zsh for firefox and enable lanzaboote on EDI --- home-manager/shared/shell/zsh.nix | 9 +++++++++ nixos/hosts/EDI/configuration.nix | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index d68ee10..cc38d8f 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -34,6 +34,15 @@ sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM="; }; } + { + name = "terraform"; + src = pkgs.fetchFromGitHub { + owner = "macunha1"; + repo = "zsh-terraform"; + rev = "fd1471d3757f8ed13f56c4426f88616111de2a87"; + sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc"; + }; + } ]; autosuggestion.enable = true; enableCompletion = true; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index d0d1767..78ee9f7 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -49,13 +49,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.initrd.systemd.enable = true; - # boot.lanzaboote = { - # enable = true; - # pkiBundle = "/etc/secureboot"; - # }; + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "24.11"; From bebd3cc4876da24439d46fccbda4377e1fdae505 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 14:46:04 +0200 Subject: [PATCH 057/395] Use more up to date version of konsole --- nixos/desktop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 80a26bf..0970a21 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -18,7 +18,7 @@ # You can add overlays here overlays = [ #(final: prev: { - #bcachefs-tools = pkgs-edge.bcachefs-tools; + #bcachefs-tools = pkgs-edge.bcachefs-tools; #}) # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions @@ -75,6 +75,7 @@ kdePackages.kdepim-addons kdePackages.kirigami kdePackages.kdeconnect-kde + kdePackages.konsole # kdePackages.krunner-ssh # kdePackages.krunner-symbols kdePackages.packagekit-qt From fcef7501938237b9ef885cabf5537a0c732c22c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 15:12:50 +0200 Subject: [PATCH 058/395] Add filelight for disk usage stuff --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 0970a21..2997f89 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -71,6 +71,7 @@ # KDE/QT krunner-translator kdePackages.discover + kdePackages.filelight kdePackages.kcalc kdePackages.kdepim-addons kdePackages.kirigami From 9d3ca00a9951844a030f987cdc15666514af7449 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 2 Sep 2024 21:35:04 +0200 Subject: [PATCH 059/395] update flake lock --- flake.lock | 290 +++++++++++++++++++++++++++-------------------------- 1 file changed, 148 insertions(+), 142 deletions(-) diff --git a/flake.lock b/flake.lock index 5c813e1..8387f1c 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1720542474, - "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", + "lastModified": 1724226964, + "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=", "owner": "zhaofengli", "repo": "attic", - "rev": "6139576a3ce6bb992e0f6c3022528ec233e45f00", + "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2", "type": "github" }, "original": { @@ -37,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724456070, - "narHash": "sha256-Mbi9N8S3OjS1XywvkraGf+jmOXZrjhTjVoWYxSf+XSY=", + "lastModified": 1725154455, + "narHash": "sha256-EAfDQEnWPL/ch6zfPFukXw3tb6yl9+k81x6jI7RjJyg=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "b422b19f636329e1a082bcacd3ac6b485d7a5b3e", + "rev": "1e058db4b603f8992b781b4654b48221dd04407a", "type": "github" }, "original": { @@ -70,15 +70,15 @@ "inputs": { "devenv": "devenv", "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks" + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1719923519, - "narHash": "sha256-7Rhljj2fsklFRsu+eq7N683Z9qukmreMEj5C1GqCrSA=", + "lastModified": 1724232775, + "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", "owner": "cachix", "repo": "cachix", - "rev": "4e9e71f78b9500fa6210cf1eaa4d75bdbab777c3", + "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", "type": "github" }, "original": { @@ -163,7 +163,7 @@ "complement": "complement", "crane": "crane_3", "fenix": "fenix_2", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_3", "liburing": "liburing", "nix-filter": "nix-filter", @@ -173,11 +173,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1724781403, - "narHash": "sha256-MO4WUq7p4SRnGVtxuDH5PLZnPgwl1ZtoXmwt5R/OTwc=", + "lastModified": 1725209064, + "narHash": "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "d26493562528172595ea063c55f76b7eb0d6b7c4", + "rev": "8f7ade4c22533a3177bfd8f175e178573ba6c1d4", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1717025063, - "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", "owner": "ipetkov", "repo": "crane", - "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1720546058, - "narHash": "sha256-iU2yVaPIZm5vMGdlT0+57vdB/aPq/V5oZFBRwYw+HBM=", + "lastModified": 1724006180, + "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=", "owner": "ipetkov", "repo": "crane", - "rev": "2d83156f23c43598cf44e152c33a59d3892f8b29", + "rev": "7ce92819802bc583b7e82ebc08013a530f22209f", "type": "github" }, "original": { @@ -310,15 +310,15 @@ "pre-commit-hooks": [ "conduwuit", "cachix", - "pre-commit-hooks" + "git-hooks" ] }, "locked": { - "lastModified": 1719759336, - "narHash": "sha256-3a34VL/QnHprl5gMy9xlx6d8J+iNp+W88Ex8smkgH9M=", + "lastModified": 1723156315, + "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", "owner": "cachix", "repo": "devenv", - "rev": "bb32aa986f2f695385e54428d0eaf7d05b31466e", + "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1724895876, - "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=", + "lastModified": 1725242307, + "narHash": "sha256-a2iTMBngegEZvaNAzzxq5Gc5Vp3UWoGUqWtK11Txbic=", "owner": "nix-community", "repo": "disko", - "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3", + "rev": "96073e6423623d4a8027e9739d2af86d6422ea7a", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1720852044, - "narHash": "sha256-3NBYz8VuXuKU+8ONd9NFafCNjPEGHIZQ2Mdoam1a4mY=", + "lastModified": 1724221791, + "narHash": "sha256-mKX67QPnUybOopVph/LhOV1G/H4EvPxDIfSmbufrVdA=", "owner": "nix-community", "repo": "fenix", - "rev": "5087b12a595ee73131a944d922f24d81dae05725", + "rev": "e88b38a5a3834e039d413a88f8150a75ef6453ef", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -503,6 +503,7 @@ }, "original": { "owner": "edolstra", + "ref": "master", "repo": "flake-compat", "type": "github" } @@ -519,7 +520,6 @@ }, "original": { "owner": "edolstra", - "ref": "master", "repo": "flake-compat", "type": "github" } @@ -540,22 +540,6 @@ "type": "github" } }, - "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -563,11 +547,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -598,12 +582,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -614,7 +601,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1689068808, @@ -632,7 +619,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -651,7 +638,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -669,7 +656,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -685,12 +672,41 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ "conduwuit", "cachix", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -737,11 +753,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "type": "github" }, "original": { @@ -757,11 +773,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1724908834, - "narHash": "sha256-QYtm4H+nzO8lYJYN6TfitmZ5jvb94YqY5MGWvZRCre8=", + "lastModified": 1725153537, + "narHash": "sha256-8+BJdXM1WBAttY+C63pEMUmUtSEWXHEhXOkLK4k1s2E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0ce5684924f553c65828041a86e7e3e09aeaac29", + "rev": "b13488a1f8ab01db6a3d18629f7b22a430f03984", "type": "github" }, "original": { @@ -773,7 +789,7 @@ "lanzaboote": { "inputs": { "crane": "crane_4", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", @@ -796,11 +812,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1720798442, - "narHash": "sha256-gtPppAoksMLW4GuruQ36nf4EAqIA1Bs6V9Xcx8dBxrQ=", + "lastModified": 1724199144, + "narHash": "sha256-MVjnwO6EbKzzSrU51dSseLarZ1fRp+6SagAf/nE/XZU=", "owner": "axboe", "repo": "liburing", - "rev": "1d674f83b7d0f07553ac44d99a401b05853d9dbe", + "rev": "2d4e799017d64cd2f8304503eef9064931bb3fbd", "type": "github" }, "original": { @@ -909,11 +925,11 @@ ] }, "locked": { - "lastModified": 1724576102, - "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", + "lastModified": 1725161148, + "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", + "rev": "32058e9138248874773630c846563b1a78ee7a5b", "type": "github" }, "original": { @@ -955,11 +971,11 @@ }, "nixlib": { "locked": { - "lastModified": 1724547350, - "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", + "lastModified": 1725152544, + "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", + "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", "type": "github" }, "original": { @@ -976,11 +992,11 @@ ] }, "locked": { - "lastModified": 1724893087, - "narHash": "sha256-M3+Z8SSpzKPQ+/vw9a99G9HfqKWbVGzhFz4p3KAX0NI=", + "lastModified": 1725298144, + "narHash": "sha256-LI+gI4qeVTQaS0vW6tn49RG+f8cH1KBALaligCeHLog=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0dd0205bc3f6d602ddb62aaece5f62a8715a9e85", + "rev": "8e337ce40421c4f33e7535aeb988d8e30fe067eb", "type": "github" }, "original": { @@ -1007,11 +1023,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "lastModified": 1723827930, + "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d", "type": "github" }, "original": { @@ -1038,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1724918179, - "narHash": "sha256-vQ1gVPgJiDHPTjhwCqr9c/Z1YEhRzvhy6NvH2En200c=", + "lastModified": 1725304648, + "narHash": "sha256-RzrNqB6nJx0/eUaP7WASW3iqjvxrHUcVtkrYdVwi+do=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e073dc84d49aca4f845305641c552d9332b212f", + "rev": "5b5931f371c926c622332b6724c7fecc60e78c97", "type": "github" }, "original": { @@ -1085,11 +1101,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -1101,16 +1117,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1718811006, - "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1149,11 +1165,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -1181,11 +1197,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1229,11 +1245,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -1300,11 +1316,11 @@ ] }, "locked": { - "lastModified": 1724556439, - "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", + "lastModified": 1725210710, + "narHash": "sha256-HHWEeLhfDeprabbxjGc/jVWpUu0+gFaQ0jWgohe02XE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", + "rev": "c00261909b44a960894552bbeafb762af2fa9bd8", "type": "github" }, "original": { @@ -1340,31 +1356,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_5", - "gitignore": "gitignore", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1395,16 +1386,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1720900786, - "narHash": "sha256-Vta9Um/RRuWwZ46BjXftV06iWLm/j/9MX39emXUvSAY=", + "lastModified": 1724285323, + "narHash": "sha256-k60kreKQ0v+bQ16yBd2SfLYpuNjMw2qoRmZL/S3k6CU=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "911f4243e69c2e320a7a209bf1f5f3ff5f825495", + "rev": "5a67ad7ce46328578ee5587fb0c23faa03d14e67", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.4.0", + "ref": "v9.5.2", "repo": "rocksdb", "type": "github" } @@ -1452,11 +1443,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1720717809, - "narHash": "sha256-6I+fm+nTLF/iaj7ffiFGlSY7POmubwUaPA/Wq0Bm53M=", + "lastModified": 1724153119, + "narHash": "sha256-WxpvDJDttkINkXmUA/W5o11lwLPYhATAgu0QUAacZ2g=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ffbc5ad993d5cd2f3b8bcf9a511165470944ab91", + "rev": "3723e5910c14f0ffbd13de474b8a8fcc74db04ce", "type": "github" }, "original": { @@ -1511,7 +1502,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "nixpkgs": "nixpkgs_7", "nixpkgs-24_05": "nixpkgs-24_05" }, @@ -1536,11 +1527,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1723501126, - "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", + "lastModified": 1725201042, + "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", + "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", "type": "github" }, "original": { @@ -1609,6 +1600,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ From 2df0f3e7817e6a7cd2bbe47527f01243dfb38251 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 3 Sep 2024 10:26:58 +0200 Subject: [PATCH 060/395] update flake lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8387f1c..222535a 100644 --- a/flake.lock +++ b/flake.lock @@ -1054,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1725304648, - "narHash": "sha256-RzrNqB6nJx0/eUaP7WASW3iqjvxrHUcVtkrYdVwi+do=", + "lastModified": 1725351521, + "narHash": "sha256-ho00xV4BBpKa03Oe7mce+4+gMvvzRJbb5uW38eYnM0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5931f371c926c622332b6724c7fecc60e78c97", + "rev": "1f20f29afc062d092282fdfdc53a18dd2b011bb1", "type": "github" }, "original": { @@ -1316,11 +1316,11 @@ ] }, "locked": { - "lastModified": 1725210710, - "narHash": "sha256-HHWEeLhfDeprabbxjGc/jVWpUu0+gFaQ0jWgohe02XE=", + "lastModified": 1725327224, + "narHash": "sha256-+cMfiE+zigDuChOFlhUH3yN7Yll9hr1LRBHsO09pqjY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "c00261909b44a960894552bbeafb762af2fa9bd8", + "rev": "3f1589c38428bd8121fd5deebd86ce4108b29d6e", "type": "github" }, "original": { From cdb3860b76306cc48cd80912deb31a35ad77bd35 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 5 Sep 2024 14:54:01 +0200 Subject: [PATCH 061/395] Trying to enable the well known for conduwuit --- nixos/server/package-configs/conduit/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 1e8e631..f69a9ab 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -44,6 +44,10 @@ in { allow_registration = false; turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"]; turn_secret = "cPKWEn4Fo5TAJoE7iX3xeVOaMVE4afeRN1iRGWYfbkWbkaZMxTpnmazHyH6c6yXT"; + well_known = { + server = "matrix.gladtherescake.eu:443"; + client = "https://matrix.gladtherescake.eu"; + }; }; }; From 9deba2b39541d89645bd2844efac903bbab6f738 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 6 Sep 2024 15:22:47 +0200 Subject: [PATCH 062/395] update flake lock --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 222535a..e152f6c 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725154455, - "narHash": "sha256-EAfDQEnWPL/ch6zfPFukXw3tb6yl9+k81x6jI7RjJyg=", + "lastModified": 1725464380, + "narHash": "sha256-E9Xdw5/jkU9yhqjU+EzoBS0OKbL0a8YEkInYrriaUkQ=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "1e058db4b603f8992b781b4654b48221dd04407a", + "rev": "68704c30dce693b83deb0e7ea40d47bae8e359b4", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1724469296, - "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", + "lastModified": 1725509983, + "narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=", "owner": "catppuccin", "repo": "nix", - "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", + "rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1725242307, - "narHash": "sha256-a2iTMBngegEZvaNAzzxq5Gc5Vp3UWoGUqWtK11Txbic=", + "lastModified": 1725377834, + "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", "owner": "nix-community", "repo": "disko", - "rev": "96073e6423623d4a8027e9739d2af86d6422ea7a", + "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", "type": "github" }, "original": { @@ -753,11 +753,11 @@ ] }, "locked": { - "lastModified": 1725180166, - "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "lastModified": 1725627831, + "narHash": "sha256-MIaU+T3DIowKvy1esp2owm3EgeyVgWFEoJ5jwAJIyvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "rev": "7d569851e95e8b360a3d7a2f52c5fc6a597a7657", "type": "github" }, "original": { @@ -773,11 +773,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1725153537, - "narHash": "sha256-8+BJdXM1WBAttY+C63pEMUmUtSEWXHEhXOkLK4k1s2E=", + "lastModified": 1725600800, + "narHash": "sha256-wst7p3RZ9kZUNzN22d27wU8YSBB7Grlx6Q03A7boRaU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b13488a1f8ab01db6a3d18629f7b22a430f03984", + "rev": "2d050e65a71e02a1f19d1a35c086bd2e3dfb2cdb", "type": "github" }, "original": { @@ -796,11 +796,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1722329086, - "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=", + "lastModified": 1725379389, + "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a", + "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", "type": "github" }, "original": { @@ -992,11 +992,11 @@ ] }, "locked": { - "lastModified": 1725298144, - "narHash": "sha256-LI+gI4qeVTQaS0vW6tn49RG+f8cH1KBALaligCeHLog=", + "lastModified": 1725497951, + "narHash": "sha256-fayKyVs/9FQdYH+3SCOkQM1GCsEPPVE+lSiVGlYQ7i0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8e337ce40421c4f33e7535aeb988d8e30fe067eb", + "rev": "15a07ebf4a041bf232026263f1f96f2af390f3bc", "type": "github" }, "original": { @@ -1007,11 +1007,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724878143, - "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", + "lastModified": 1725477728, + "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", + "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1725351521, - "narHash": "sha256-ho00xV4BBpKa03Oe7mce+4+gMvvzRJbb5uW38eYnM0U=", + "lastModified": 1725628719, + "narHash": "sha256-n1LM+y4GJdr0VXvsFPqGo9ED4Ut6n8ERg6+/MKMDQiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f20f29afc062d092282fdfdc53a18dd2b011bb1", + "rev": "31247792c61e44f71eb67ce0584a49bab177f869", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -1245,11 +1245,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -1276,11 +1276,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1721466660, - "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { @@ -1316,11 +1316,11 @@ ] }, "locked": { - "lastModified": 1725327224, - "narHash": "sha256-+cMfiE+zigDuChOFlhUH3yN7Yll9hr1LRBHsO09pqjY=", + "lastModified": 1725575977, + "narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=", "owner": "pjones", "repo": "plasma-manager", - "rev": "3f1589c38428bd8121fd5deebd86ce4108b29d6e", + "rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39", "type": "github" }, "original": { @@ -1527,11 +1527,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1725201042, - "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", + "lastModified": 1725540166, + "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", + "rev": "d9d781523a1463965cd1e1333a306e70d9feff07", "type": "github" }, "original": { From 202893ec08fc4fa2e3d692ff7bf8e1bd517fb9d4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 10:28:05 +0200 Subject: [PATCH 063/395] Add pylsp to python editing in helix --- home-manager/shared/shell/helix/default.nix | 2 +- nixos/server/package-configs/conduit/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index ae6d948..b8ee578 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -36,7 +36,7 @@ language-id = "python"; auto-format = true; file-types = ["py"]; - language-servers = ["ruff" "scls"]; + language-servers = ["ruff" "scls" "pylsp"]; } { name = "typst"; diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index f69a9ab..2ea9053 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -127,7 +127,7 @@ in { ''; }; locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = { - proxyPass = "http://backend_conduit/client/unstable/org.matrix.msc3575/sync"; + proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync"; proxyWebsockets = true; recommendedProxySettings = false; extraConfig = '' From 460d421513675c61feb154a412b7b94b635a3a14 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 14:10:41 +0200 Subject: [PATCH 064/395] Add ruff plugin to pylsp --- home-manager/shared/shell/helix/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index b8ee578..5aad24a 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -76,6 +76,15 @@ } ]; language-server = { + pylsp = { + config.pylsp.plugins = { + ruff = { + enabled = true; + ignore = ["F401"]; + lineLength = 120; + }; + }; + }; ruff = { command = "ruff-lsp"; }; From 8d36a530a81302f78aa7b22560b09bccd610c315 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 14:50:16 +0200 Subject: [PATCH 065/395] Disable the other linters aside from ruff in helix --- home-manager/shared/shell/helix/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 5aad24a..7eaee34 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -78,6 +78,13 @@ language-server = { pylsp = { config.pylsp.plugins = { + flake8 = {enabled = false;}; + autopep8 = {enabled = false;}; + mccabe = {enabled = false;}; + pycodestyle = {enabled = false;}; + pyflakes = {enabled = false;}; + pylint = {enabled = false;}; + yapf = {enabled = false;}; ruff = { enabled = true; ignore = ["F401"]; From 17200daa04fd6c0cf3aa788296c9370f9fe2b04f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 15:03:55 +0200 Subject: [PATCH 066/395] Enable more lints with ruff --- home-manager/shared/shell/helix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 7eaee34..a452603 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -87,6 +87,7 @@ yapf = {enabled = false;}; ruff = { enabled = true; + select = ["E" "F" "UP" "B" "SIM" "I" "PD"]; ignore = ["F401"]; lineLength = 120; }; From 76248fcd2c434a93284516da73196e3ecb68f7d1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 15:37:42 +0200 Subject: [PATCH 067/395] Add all the features for ruff I want --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index a452603..e755fcf 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -87,7 +87,7 @@ yapf = {enabled = false;}; ruff = { enabled = true; - select = ["E" "F" "UP" "B" "SIM" "I" "PD"]; + select = ["E" "F" "UP" "B" "SIM" "I" "PD" "NPY" "PERF" "FURB" "DOC" "TRY" "W" "R" "PL" "TCH" "Q" "PT" "ICN" "C4" "COM" "FBT" "S" "N"]; ignore = ["F401"]; lineLength = 120; }; From d75850955135df66ce3d315079379e7ee3b78b40 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 17:00:25 +0200 Subject: [PATCH 068/395] update flake lock --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index e152f6c..c28bfbb 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725464380, - "narHash": "sha256-E9Xdw5/jkU9yhqjU+EzoBS0OKbL0a8YEkInYrriaUkQ=", + "lastModified": 1725762345, + "narHash": "sha256-e2He1FFN35H3uVeUYO9+2fbG7IPoOSGub9oEKc1S0eQ=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "68704c30dce693b83deb0e7ea40d47bae8e359b4", + "rev": "bc5d903fdae933fad017d370764e2ae38d58b42d", "type": "github" }, "original": { @@ -753,11 +753,11 @@ ] }, "locked": { - "lastModified": 1725627831, - "narHash": "sha256-MIaU+T3DIowKvy1esp2owm3EgeyVgWFEoJ5jwAJIyvc=", + "lastModified": 1725948275, + "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d569851e95e8b360a3d7a2f52c5fc6a597a7657", + "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", "type": "github" }, "original": { @@ -773,11 +773,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1725600800, - "narHash": "sha256-wst7p3RZ9kZUNzN22d27wU8YSBB7Grlx6Q03A7boRaU=", + "lastModified": 1725944773, + "narHash": "sha256-MG/rHAx1soZTnuSrFsYLuSRzuQCUOXP8o7k8M0FzEd8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2d050e65a71e02a1f19d1a35c086bd2e3dfb2cdb", + "rev": "b9af8b3887f231334c1fae0efcb7be45096559e4", "type": "github" }, "original": { @@ -925,11 +925,11 @@ ] }, "locked": { - "lastModified": 1725161148, - "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", + "lastModified": 1725765290, + "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "32058e9138248874773630c846563b1a78ee7a5b", + "rev": "642275444c5a9defce57219c944b3179bf2adaa9", "type": "github" }, "original": { @@ -971,11 +971,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725152544, - "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", + "lastModified": 1725757153, + "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", + "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", "type": "github" }, "original": { @@ -992,11 +992,11 @@ ] }, "locked": { - "lastModified": 1725497951, - "narHash": "sha256-fayKyVs/9FQdYH+3SCOkQM1GCsEPPVE+lSiVGlYQ7i0=", + "lastModified": 1725843519, + "narHash": "sha256-Z6DglUwgFDz6fIvQ89wx/uBVWrGvEGECq0Ypyk/eigE=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "15a07ebf4a041bf232026263f1f96f2af390f3bc", + "rev": "214efbd73241d72a8f48b8b9a73bb54895cd51a7", "type": "github" }, "original": { @@ -1007,11 +1007,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725477728, - "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1725628719, - "narHash": "sha256-n1LM+y4GJdr0VXvsFPqGo9ED4Ut6n8ERg6+/MKMDQiM=", + "lastModified": 1725980019, + "narHash": "sha256-RJvwwGhegNA8+hSj3nQKhheO6ruZv8hY6zQF6J1sXAU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "31247792c61e44f71eb67ce0584a49bab177f869", + "rev": "d174eca1faa532934280f9c826af2f0b77217404", "type": "github" }, "original": { @@ -1149,11 +1149,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1721524707, - "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", + "lastModified": 1725762081, + "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", + "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -1245,11 +1245,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -1276,11 +1276,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1725534445, + "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", "type": "github" }, "original": { @@ -1316,11 +1316,11 @@ ] }, "locked": { - "lastModified": 1725575977, - "narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=", + "lastModified": 1725914634, + "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39", + "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", "type": "github" }, "original": { @@ -1527,11 +1527,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1725540166, - "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", + "lastModified": 1725922448, + "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d9d781523a1463965cd1e1333a306e70d9feff07", + "rev": "cede1a08039178ac12957733e97ab1006c6b6892", "type": "github" }, "original": { From 5f43f81d51cb219df5dbfceedf21fb24eae69b6f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 10 Sep 2024 17:25:28 +0200 Subject: [PATCH 069/395] Disable lanzaboote on shodan for now --- flake.nix | 2 +- nixos/hosts/shodan/configuration.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 03cf2a4..bf5e57f 100644 --- a/flake.nix +++ b/flake.nix @@ -213,7 +213,7 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - lanzaboote.nixosModules.lanzaboote + #lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f7e0c3e..3b7eed4 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -207,13 +207,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = lib.mkForce false; + boot.loader.systemd-boot.enable = true; boot.initrd.systemd.enable = true; - boot.lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + #boot.lanzaboote = { + # enable = true; + # pkiBundle = "/etc/secureboot"; + #}; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; From 40f0c218d9d5132c0af35db145ed9776814a520d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:18:22 +0200 Subject: [PATCH 070/395] We can't do that because secure boot is on... --- flake.nix | 2 +- nixos/hosts/shodan/configuration.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index bf5e57f..03cf2a4 100644 --- a/flake.nix +++ b/flake.nix @@ -213,7 +213,7 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - #lanzaboote.nixosModules.lanzaboote + lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 3b7eed4..f7e0c3e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -207,13 +207,13 @@ # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false # for now. - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.initrd.systemd.enable = true; - #boot.lanzaboote = { - # enable = true; - # pkiBundle = "/etc/secureboot"; - #}; + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; boot.loader.systemd-boot.configurationLimit = 3; boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; From 9929c7447dd232ffa135d5667effa64c41966701 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:25:10 +0200 Subject: [PATCH 071/395] I don't think this'll fix the lanzaboote error but we can try --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 03cf2a4..5428f52 100644 --- a/flake.nix +++ b/flake.nix @@ -220,8 +220,8 @@ catppuccin.nixosModules.catppuccin { home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager inputs.catppuccin.homeManagerModules.catppuccin + inputs.plasma-manager.homeManagerModules.plasma-manager ]; } ]; From a6312e6805c28b7f51c866696afaf7f2d758bec4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:27:05 +0200 Subject: [PATCH 072/395] update flake lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index c28bfbb..1c494aa 100644 --- a/flake.lock +++ b/flake.lock @@ -753,11 +753,11 @@ ] }, "locked": { - "lastModified": 1725948275, - "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", + "lastModified": 1726036828, + "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", + "rev": "8a1671642826633586d12ac3158e463c7a50a112", "type": "github" }, "original": { @@ -773,11 +773,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1725944773, - "narHash": "sha256-MG/rHAx1soZTnuSrFsYLuSRzuQCUOXP8o7k8M0FzEd8=", + "lastModified": 1726031155, + "narHash": "sha256-QUv5cxy40HRC7vJz9JjbVEmlHT+q1VIuikNJUQZHre0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b9af8b3887f231334c1fae0efcb7be45096559e4", + "rev": "90c68db7d9430bd30e8c5096a0e3dc078b410050", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1725980019, - "narHash": "sha256-RJvwwGhegNA8+hSj3nQKhheO6ruZv8hY6zQF6J1sXAU=", + "lastModified": 1726057121, + "narHash": "sha256-6xBH5ii+WfuU6A4nJ2JMAajl0N+v+OLnt9y6eC+pphw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d174eca1faa532934280f9c826af2f0b77217404", + "rev": "842d84cdcc779f2e3ad1950f19cab533833ba0ea", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1725983898, + "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "type": "github" }, "original": { @@ -1245,11 +1245,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1725983898, + "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "type": "github" }, "original": { From cee4f93f32aceacb9a1d4176244831f67e8bcb00 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:33:51 +0200 Subject: [PATCH 073/395] I don't think this will fix things but we'll see what impact it has --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 5428f52..2e0723c 100644 --- a/flake.nix +++ b/flake.nix @@ -213,7 +213,7 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - lanzaboote.nixosModules.lanzaboote + # lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager From f0ba3cb27d37c0b856365e75e9b48cadbb3e478a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:34:50 +0200 Subject: [PATCH 074/395] Maybe just put it in imports? --- nixos/hosts/shodan/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f7e0c3e..7c5eae2 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -15,6 +15,8 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default + inputs.lanzaboote.nixosModules.lanzaboote + # Import the shared settings ../../shared ../../desktop/package-configs/firefox From 57f50e54c6188b74038367fde26d62f54c804bc3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 11 Sep 2024 14:35:56 +0200 Subject: [PATCH 075/395] And with the original module? --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2e0723c..5428f52 100644 --- a/flake.nix +++ b/flake.nix @@ -213,7 +213,7 @@ # > Our main nixos configuration file < ./nixos/hosts/shodan/configuration.nix sops-nix.nixosModules.sops - # lanzaboote.nixosModules.lanzaboote + lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko jovian.nixosModules.jovian home-manager.nixosModules.home-manager From 2f6ba250cc6fc0bbae9de6f1fc1f09a7289101e3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 16 Sep 2024 21:09:20 +0200 Subject: [PATCH 076/395] Why does it work here now? I don't know, this should build according to nix flake check, flake lock updated, removed isos for now --- flake.lock | 175 +++++++++++++++------------ flake.nix | 78 ++++++------ nixos/hosts/shodan/configuration.nix | 2 - 3 files changed, 135 insertions(+), 120 deletions(-) diff --git a/flake.lock b/flake.lock index 1c494aa..7691bc0 100644 --- a/flake.lock +++ b/flake.lock @@ -4,16 +4,17 @@ "inputs": { "crane": "crane_2", "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1724226964, - "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=", + "lastModified": 1725300620, + "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", "owner": "zhaofengli", "repo": "attic", - "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2", + "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", "type": "github" }, "original": { @@ -142,11 +143,11 @@ "complement": { "flake": false, "locked": { - "lastModified": 1722323564, - "narHash": "sha256-6w6/N8walz4Ayc9zu7iySqJRmGFukhkaICLn4dweAcA=", + "lastModified": 1724347376, + "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", "owner": "matrix-org", "repo": "complement", - "rev": "6e4426a9e63233f9821a4d2382bfed145244183f", + "rev": "39733c1b2f8314800776748cc7164f9a34650686", "type": "github" }, "original": { @@ -173,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1725209064, - "narHash": "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=", + "lastModified": 1726444589, + "narHash": "sha256-dWKVjS4wvyZxRjhUICTnnw8mHYwJij4SGvXIG/U5oRo=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8f7ade4c22533a3177bfd8f175e178573ba6c1d4", + "rev": "032b199129f8648a77bde285f755a78e9ec349a7", "type": "github" }, "original": { @@ -230,18 +231,12 @@ } }, "crane_3": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724006180, - "narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=", + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "owner": "ipetkov", "repo": "crane", - "rev": "7ce92819802bc583b7e82ebc08013a530f22209f", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "type": "github" }, "original": { @@ -369,11 +364,11 @@ ] }, "locked": { - "lastModified": 1725377834, - "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", + "lastModified": 1726396892, + "narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=", "owner": "nix-community", "repo": "disko", - "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", + "rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce", "type": "github" }, "original": { @@ -413,11 +408,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1724221791, - "narHash": "sha256-mKX67QPnUybOopVph/LhOV1G/H4EvPxDIfSmbufrVdA=", + "lastModified": 1725690497, + "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", "owner": "nix-community", "repo": "fenix", - "rev": "e88b38a5a3834e039d413a88f8150a75ef6453ef", + "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", "type": "github" }, "original": { @@ -543,15 +538,17 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "conduwuit", + "attic", "nixpkgs" ] }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -561,6 +558,26 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -753,11 +770,11 @@ ] }, "locked": { - "lastModified": 1726036828, - "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", + "lastModified": 1726440980, + "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a1671642826633586d12ac3158e463c7a50a112", + "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "type": "github" }, "original": { @@ -773,11 +790,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1726031155, - "narHash": "sha256-QUv5cxy40HRC7vJz9JjbVEmlHT+q1VIuikNJUQZHre0=", + "lastModified": 1726115155, + "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "90c68db7d9430bd30e8c5096a0e3dc078b410050", + "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", "type": "github" }, "original": { @@ -790,7 +807,7 @@ "inputs": { "crane": "crane_4", "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" @@ -812,11 +829,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1724199144, - "narHash": "sha256-MVjnwO6EbKzzSrU51dSseLarZ1fRp+6SagAf/nE/XZU=", + "lastModified": 1725659644, + "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", "owner": "axboe", "repo": "liburing", - "rev": "2d4e799017d64cd2f8304503eef9064931bb3fbd", + "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", "type": "github" }, "original": { @@ -925,11 +942,11 @@ ] }, "locked": { - "lastModified": 1725765290, - "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", + "lastModified": 1726449931, + "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "642275444c5a9defce57219c944b3179bf2adaa9", + "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", "type": "github" }, "original": { @@ -971,11 +988,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725757153, - "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", + "lastModified": 1726362065, + "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", + "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555", "type": "github" }, "original": { @@ -992,11 +1009,11 @@ ] }, "locked": { - "lastModified": 1725843519, - "narHash": "sha256-Z6DglUwgFDz6fIvQ89wx/uBVWrGvEGECq0Ypyk/eigE=", + "lastModified": 1726494069, + "narHash": "sha256-eBmurYEjTDfWbpJOO5jQu9yxoznOxLF/7IwYJyD+ljw=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "214efbd73241d72a8f48b8b9a73bb54895cd51a7", + "rev": "934dff070150ec3f67aea4f1dbe6ad303870669f", "type": "github" }, "original": { @@ -1007,11 +1024,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1726489388, + "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "type": "github" }, "original": { @@ -1023,11 +1040,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723827930, - "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=", + "lastModified": 1724999960, + "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d", + "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", "type": "github" }, "original": { @@ -1054,11 +1071,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1726057121, - "narHash": "sha256-6xBH5ii+WfuU6A4nJ2JMAajl0N+v+OLnt9y6eC+pphw=", + "lastModified": 1726513143, + "narHash": "sha256-z3JL4iYtx2+dcEm4JlHmOM+2/JHWb9YLp0NBWqUihk4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "842d84cdcc779f2e3ad1950f19cab533833ba0ea", + "rev": "bff640bbd7eb7ebec2a7a9d99291fbbc7b3177ba", "type": "github" }, "original": { @@ -1101,16 +1118,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1165,11 +1182,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -1245,11 +1262,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -1316,11 +1333,11 @@ ] }, "locked": { - "lastModified": 1725914634, - "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", + "lastModified": 1726509788, + "narHash": "sha256-PmCmO8NDKzwHrTp9Ox/rcLiCYivqIpZlnLk8wZRjv2I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", + "rev": "5a0c70a007837e2db01e0bb68971792e8653d32c", "type": "github" }, "original": { @@ -1386,16 +1403,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1724285323, - "narHash": "sha256-k60kreKQ0v+bQ16yBd2SfLYpuNjMw2qoRmZL/S3k6CU=", + "lastModified": 1725811807, + "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "5a67ad7ce46328578ee5587fb0c23faa03d14e67", + "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.5.2", + "ref": "v9.6.1", "repo": "rocksdb", "type": "github" } @@ -1406,7 +1423,7 @@ "catppuccin": "catppuccin", "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", @@ -1443,11 +1460,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1724153119, - "narHash": "sha256-WxpvDJDttkINkXmUA/W5o11lwLPYhATAgu0QUAacZ2g=", + "lastModified": 1725630423, + "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "3723e5910c14f0ffbd13de474b8a8fcc74db04ce", + "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", "type": "github" }, "original": { @@ -1527,11 +1544,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1725922448, - "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", + "lastModified": 1726218807, + "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cede1a08039178ac12957733e97ab1006c6b6892", + "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5428f52..95a8488 100644 --- a/flake.nix +++ b/flake.nix @@ -227,46 +227,46 @@ ]; }; - ISO = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - {_module.args = {inherit pkgs-edge;};} - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" - "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" - ./nixos/hosts/iso/configuration.nix - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - nix-index-database.nixosModules.nix-index - catppuccin.nixosModules.catppuccin - { - home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager - inputs.catppuccin.homeManagerModules.catppuccin - ]; - } - ]; - }; + # ISO = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # {_module.args = {inherit pkgs-edge;};} + # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + # "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + # ./nixos/hosts/iso/configuration.nix + # sops-nix.nixosModules.sops + # home-manager.nixosModules.home-manager + # nix-index-database.nixosModules.nix-index + # catppuccin.nixosModules.catppuccin + # { + # home-manager.sharedModules = [ + # inputs.plasma-manager.homeManagerModules.plasma-manager + # inputs.catppuccin.homeManagerModules.catppuccin + # ]; + # } + # ]; + # }; - iso_server = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - {_module.args = {inherit pkgs-edge;};} - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" - "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" - ./nixos/hosts/iso_server/configuration.nix - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - nix-index-database.nixosModules.nix-index - catppuccin.nixosModules.catppuccin - { - home-manager.sharedModules = [ - inputs.catppuccin.homeManagerModules.catppuccin - ]; - } - ]; - }; + # iso_server = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = [ + # {_module.args = {inherit pkgs-edge;};} + # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + # "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + # ./nixos/hosts/iso_server/configuration.nix + # sops-nix.nixosModules.sops + # home-manager.nixosModules.home-manager + # nix-index-database.nixosModules.nix-index + # catppuccin.nixosModules.catppuccin + # { + # home-manager.sharedModules = [ + # inputs.catppuccin.homeManagerModules.catppuccin + # ]; + # } + # ]; + # }; }; }; } diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 7c5eae2..f7e0c3e 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -15,8 +15,6 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default - inputs.lanzaboote.nixosModules.lanzaboote - # Import the shared settings ../../shared ../../desktop/package-configs/firefox From 08dcbada274718e829785a1eb7d47f4f507f65fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 18 Sep 2024 16:08:00 +0200 Subject: [PATCH 077/395] Add html and css linting to helix --- home-manager/shared/default.nix | 1 + home-manager/shared/shell/helix/default.nix | 33 +++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 465a8ce..8386997 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -21,6 +21,7 @@ home.packages = with pkgs; [ # System tools: + vscode-langservers-extracted sops zsh bat diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index e755fcf..018d614 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -74,8 +74,41 @@ args = ["-q"]; }; } + { + name = "html"; + language-id = "html"; + auto-format = true; + file-types = ["htm" "html"]; + language-servers = ["vscode-html-language-server" "vscode-eslint-language-server"]; + } + { + name = "css"; + language-id = "css"; + auto-format = true; + file-types = ["css"]; + language-servers = ["vscode-css-language-server" "vscode-eslint-language-server"]; + } + { + name = "json"; + language-id = "json"; + auto-format = true; + file-types = ["json"]; + language-servers = ["vscode-json-language-server" "vscode-eslint-language-server"]; + } ]; language-server = { + vscode-html-language-server = { + command = "vscode-html-language-server"; + }; + vscode-css-language-server = { + command = "vscode-css-language-server"; + }; + vscode-eslint-language-server = { + command = "vscode-eslint-language-server"; + }; + vscode-json-language-server = { + command = "vscode-json-language-server"; + }; pylsp = { config.pylsp.plugins = { flake8 = {enabled = false;}; From 503aa6433753bd32d7271e9c88f530791c56bf5f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 23 Sep 2024 22:14:01 +0200 Subject: [PATCH 078/395] Not dealing with bcachefs on glados either tbh --- disko/GLaDOS/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index 53ffd96..b418785 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -57,7 +57,7 @@ size = "100%FREE"; content = { type = "filesystem"; - format = "bcachefs"; + format = "ext4"; mountpoint = "/"; mountOptions = [ "defaults" From 93c7e9214bdea21bc1731dee4d9fd7ed449eaeb1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 24 Sep 2024 21:50:15 +0200 Subject: [PATCH 079/395] update flake lock --- flake.lock | 120 +++++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 7691bc0..b43d281 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1725509983, - "narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=", + "lastModified": 1726952185, + "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", "owner": "catppuccin", "repo": "nix", - "rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9", + "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", "type": "github" }, "original": { @@ -268,18 +268,12 @@ } }, "crane_5": { - "inputs": { - "nixpkgs": [ - "zjstatus", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724537630, - "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", + "lastModified": 1725409566, + "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "owner": "ipetkov", "repo": "crane", - "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", + "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "type": "github" }, "original": { @@ -364,11 +358,11 @@ ] }, "locked": { - "lastModified": 1726396892, - "narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=", + "lastModified": 1727196810, + "narHash": "sha256-xQzgXRlczZoFfrUdA4nD5qojCQVqpiIk82aYINQZd+U=", "owner": "nix-community", "repo": "disko", - "rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce", + "rev": "6d42596a35d34918a905e8539a44d3fc91f42b5b", "type": "github" }, "original": { @@ -658,11 +652,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -770,11 +764,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1727111745, + "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "21c021862fa696c8199934e2153214ab57150cb6", "type": "github" }, "original": { @@ -790,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1726115155, - "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", + "lastModified": 1727071274, + "narHash": "sha256-xG83n8zvL+fMFArU1ikcUpw0bhRkrzkSTDJPpBCLlUA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", + "rev": "03aa054340528d300711253a98f7dccca9378604", "type": "github" }, "original": { @@ -942,11 +936,11 @@ ] }, "locked": { - "lastModified": 1726449931, - "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", + "lastModified": 1726975622, + "narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", + "rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417", "type": "github" }, "original": { @@ -988,11 +982,11 @@ }, "nixlib": { "locked": { - "lastModified": 1726362065, - "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", + "lastModified": 1726966855, + "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555", + "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", "type": "github" }, "original": { @@ -1009,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1726494069, - "narHash": "sha256-eBmurYEjTDfWbpJOO5jQu9yxoznOxLF/7IwYJyD+ljw=", + "lastModified": 1727053438, + "narHash": "sha256-t/+z1Tf7hSaStU1pBYkY7i0/GkG+YIPSmfeRrK8eYUw=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "934dff070150ec3f67aea4f1dbe6ad303870669f", + "rev": "e8c1cd886cc17e31e424f915efd32e84d8af0ce9", "type": "github" }, "original": { @@ -1024,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726489388, - "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", + "lastModified": 1727040444, + "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", + "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", "type": "github" }, "original": { @@ -1071,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1726513143, - "narHash": "sha256-z3JL4iYtx2+dcEm4JlHmOM+2/JHWb9YLp0NBWqUihk4=", + "lastModified": 1727207138, + "narHash": "sha256-r1jtkKgmJE88YWdKYGa4XB6fpnQGQfzbAEtIYtbLyzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bff640bbd7eb7ebec2a7a9d99291fbbc7b3177ba", + "rev": "ac35e3b0e0d81c433012534bc213d4cf44da4fd7", "type": "github" }, "original": { @@ -1182,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -1230,11 +1224,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { @@ -1262,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -1309,11 +1303,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1724748588, - "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", + "lastModified": 1726481836, + "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", + "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", "type": "github" }, "original": { @@ -1333,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1726509788, - "narHash": "sha256-PmCmO8NDKzwHrTp9Ox/rcLiCYivqIpZlnLk8wZRjv2I=", + "lastModified": 1727193535, + "narHash": "sha256-+OXzeHgg+kErwpJI40xbIAUHZS1Ky9V3wOcfcDmCOJE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5a0c70a007837e2db01e0bb68971792e8653d32c", + "rev": "e3d60d6c8a0ff5f9b8b7db200589524c367af2f4", "type": "github" }, "original": { @@ -1503,11 +1497,11 @@ ] }, "locked": { - "lastModified": 1724811750, - "narHash": "sha256-PvhVgQ1rm3gfhK7ts4emprhh/KMkFwXogmgsQ3srR7g=", + "lastModified": 1726453838, + "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6", + "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", "type": "github" }, "original": { @@ -1544,11 +1538,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1726218807, - "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", + "lastModified": 1726524647, + "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", + "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "type": "github" }, "original": { @@ -1661,11 +1655,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1724858904, - "narHash": "sha256-QGzfl4YHTl/HuYy6oe/OqAX8xViYht1BCCIpWq7uH5U=", + "lastModified": 1726515093, + "narHash": "sha256-Y2OHV3QfLPQj3Q4+TmrMeRXthwigU/YSBv2g8y8GWWU=", "owner": "dj95", "repo": "zjstatus", - "rev": "b2f15019bdfc04f65cac7cd073418ac6ad4dbddc", + "rev": "d1c662c1052adec6f14f3ee8a51cecebe4a29ffa", "type": "github" }, "original": { From f96fcb5bf8b685ed28a77d322d3721268fb07288 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 24 Sep 2024 22:52:26 +0200 Subject: [PATCH 080/395] updated SSH key for GLaDOS --- nixos/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 41cf391..1138ad2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -67,7 +67,7 @@ hashedPasswordFile = config.sops.secrets."lillian-password".path; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS" ]; }; From 349c7806055553aa30c820f3adf454da6cc7f897 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 25 Sep 2024 22:04:21 +0200 Subject: [PATCH 081/395] added gamescope to desktop home manager --- home-manager/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 19ff7a4..8349ffb 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -92,6 +92,7 @@ # Gaming: prismlauncher steam + gamescope # Multimedia: freetube From 84e61ce5757c79420f69f2ab96fc3c77d811f538 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 26 Sep 2024 12:09:58 +0200 Subject: [PATCH 082/395] update flake lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index b43d281..379aed3 100644 --- a/flake.lock +++ b/flake.lock @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1727196810, - "narHash": "sha256-xQzgXRlczZoFfrUdA4nD5qojCQVqpiIk82aYINQZd+U=", + "lastModified": 1727249977, + "narHash": "sha256-lAqOCDI4B6hA+t+KHSm/Go8hQF/Ob5sgXaIRtMAnMKw=", "owner": "nix-community", "repo": "disko", - "rev": "6d42596a35d34918a905e8539a44d3fc91f42b5b", + "rev": "c1c472f4cd91e4b0703e02810a8c7ed30186b6fa", "type": "github" }, "original": { @@ -764,11 +764,11 @@ ] }, "locked": { - "lastModified": 1727111745, - "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", + "lastModified": 1727246346, + "narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=", "owner": "nix-community", "repo": "home-manager", - "rev": "21c021862fa696c8199934e2153214ab57150cb6", + "rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1727053438, - "narHash": "sha256-t/+z1Tf7hSaStU1pBYkY7i0/GkG+YIPSmfeRrK8eYUw=", + "lastModified": 1727312535, + "narHash": "sha256-exnTgS6OBYvEa8v5x8UsLQK2ERdDFwXNFQHoT2cqycY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "e8c1cd886cc17e31e424f915efd32e84d8af0ce9", + "rev": "f31447cd3f8e54674bd1675969e97e6043a309bc", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1727207138, - "narHash": "sha256-r1jtkKgmJE88YWdKYGa4XB6fpnQGQfzbAEtIYtbLyzc=", + "lastModified": 1727343478, + "narHash": "sha256-oswVBH+Nzbfn6Qfq52uKBgDtMiYZUyl5bLEaGrpNWqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35e3b0e0d81c433012534bc213d4cf44da4fd7", + "rev": "dec1098ad00f65a42e06eb2affdb0ee265e88cd5", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1727193535, - "narHash": "sha256-+OXzeHgg+kErwpJI40xbIAUHZS1Ky9V3wOcfcDmCOJE=", + "lastModified": 1727210241, + "narHash": "sha256-lufS6uzSbSrggNCSgubymMQWnQMh7PvQ+lRZ8qH9Uoc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "e3d60d6c8a0ff5f9b8b7db200589524c367af2f4", + "rev": "a02fef2ece8084aff0b41700bb57d24d73574cd1", "type": "github" }, "original": { From 751f68bcde20521ae4d7eb75e7badc7bfb7ab069 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 28 Sep 2024 22:46:37 +0200 Subject: [PATCH 083/395] added btop to shared --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 8386997..5f9116c 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -25,5 +25,6 @@ sops zsh bat + btop ]; } From 2b463461fad8d1cf5423fcf8dff26add680c5d17 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 16:36:42 +0200 Subject: [PATCH 084/395] Update plasma manager config --- home-manager/desktop/plasma-desktop.nix | 1177 +++++++++++++++++++++++ 1 file changed, 1177 insertions(+) create mode 100644 home-manager/desktop/plasma-desktop.nix diff --git a/home-manager/desktop/plasma-desktop.nix b/home-manager/desktop/plasma-desktop.nix new file mode 100644 index 0000000..1ccfab8 --- /dev/null +++ b/home-manager/desktop/plasma-desktop.nix @@ -0,0 +1,1177 @@ +{ + programs.plasma = { + enable = true; + shortcuts = { + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; + "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; + "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; + "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; + "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."decrease_volume_small" = "Shift+Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."increase_volume_small" = "Shift+Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; + "ksmserver"."LogOut" = "none,,Log Out"; + "ksmserver"."Reboot" = "none,,Reboot"; + "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; + "ksmserver"."Shut Down" = "none,,Shut Down"; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Cube" = "Meta+C,none"; + "kwin"."Cycle Overview" = []; + "kwin"."Cycle Overview Opposite" = []; + "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; + "kwin"."Edit Tiles" = "Meta+T"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Grid View" = "Meta+G"; + "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = []; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; + "kwin"."Overview" = "Meta+W"; + "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; + "kwin"."Show Desktop" = "Meta+D"; + "kwin"."ShowDesktopGrid" = "Meta+F8,none"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12,none"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; + "kwin"."Switch Window Down" = "Meta+Alt+Down"; + "kwin"."Switch Window Left" = "Meta+Alt+Left"; + "kwin"."Switch Window Right" = "Meta+Alt+Right"; + "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; + "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; + "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; + "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; + "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; + "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; + "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; + "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; + "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; + "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; + "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; + "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; + "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; + "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; + "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; + "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; + "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; + "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; + "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; + "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; + "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; + "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; + "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; + "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; + "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; + "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; + "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; + "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; + "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; + "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab,Alt+Shift+Tab,Walk Through Windows (Reverse)"; + "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; + "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; + "kwin"."Walk Through Windows of Current Application" = "none,Alt+`,Walk Through Windows of Current Application"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; + "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; + "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; + "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; + "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; + "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; + "kwin"."Window Lower" = "none,,Lower Window"; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; + "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = "none,,Move Window"; + "kwin"."Window Move Center" = "none,,Move Window to the Center"; + "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; + "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; + "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; + "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; + "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; + "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = "none,,Move Window Down"; + "kwin"."Window Pack Left" = "none,,Move Window Left"; + "kwin"."Window Pack Right" = "none,,Move Window Right"; + "kwin"."Window Pack Up" = "none,,Move Window Up"; + "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; + "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; + "kwin"."Window Quick Tile Left" = "Meta+Left"; + "kwin"."Window Quick Tile Right" = "Meta+Right"; + "kwin"."Window Quick Tile Top" = "Meta+Up"; + "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; + "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; + "kwin"."Window Raise" = "none,,Raise Window"; + "kwin"."Window Resize" = "none,,Resize Window"; + "kwin"."Window Shade" = "none,,Shade Window"; + "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; + "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; + "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; + "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; + "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; + "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; + "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; + "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; + "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; + "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; + "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; + "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; + "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; + "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; + "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; + "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; + "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; + "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; + "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; + "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; + "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; + "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; + "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; + "kwin"."Window to Next Screen" = "none,Meta+Shift+Right,Move Window to Next Screen"; + "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; + "kwin"."Window to Previous Screen" = "none,Meta+Shift+Left,Move Window to Previous Screen"; + "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; + "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; + "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; + "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; + "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; + "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; + "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; + "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = ["Meta++,Meta++" "Meta+=,Zoom In"]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = "none,,Media volume down"; + "mediacontrol"."mediavolumeup" = "none,,Media volume up"; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = "none,,Play media playback"; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = []; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; + "plasmashell"."activate task manager entry 1" = "Meta+1"; + "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10"; + "plasmashell"."activate task manager entry 2" = "Meta+2"; + "plasmashell"."activate task manager entry 3" = "Meta+3"; + "plasmashell"."activate task manager entry 4" = "Meta+4"; + "plasmashell"."activate task manager entry 5" = "Meta+5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "plasmashell"."activate task manager entry 7" = "Meta+7"; + "plasmashell"."activate task manager entry 8" = "Meta+8"; + "plasmashell"."activate task manager entry 9" = "Meta+9"; + "plasmashell"."clear-history" = "none,,Clear Clipboard History"; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = "none,,Next History Item"; + "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; + "plasmashell"."edit_clipboard" = []; + "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+Tab,none,Walk through activities"; + "plasmashell"."previous activity" = "Meta+Shift+Tab,none,Walk through activities (Reverse)"; + "plasmashell"."repeat_action" = "Meta+Ctrl+R"; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = "none,,Show Barcode…"; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; + "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; + "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; + "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; + "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; + "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/org.kde.spectacle.desktop"."RecordRegion" = []; + "services/org.kde.spectacle.desktop"."RecordScreen" = []; + "services/org.kde.spectacle.desktop"."RecordWindow" = []; + "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; + "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; + "services/org.kde.spectacle.desktop"."_launch" = "Print"; + "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; + "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 8; + "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; + "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; + "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; + "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; + "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; + "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; + "dolphinrc"."General"."RememberOpenedTabs" = false; + "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; + "dolphinrc"."IconsMode"."PreviewSize" = 80; + "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; + "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "dolphinrc"."PreviewSettings"."Plugins" = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail"; + "dolphinrc"."Search"."Location" = "Everywhere"; + "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "katerc"."General"."Days Meta Infos" = 30; + "katerc"."General"."Save Meta Infos" = true; + "katerc"."General"."Show Full Path in Title" = false; + "katerc"."General"."Show Menu Bar" = true; + "katerc"."General"."Show Status Bar" = true; + "katerc"."General"."Show Tab Bar" = true; + "katerc"."General"."Show Url Nav Bar" = true; + "katerc"."KTextEditor Document"."Allow End of Line Detection" = true; + "katerc"."KTextEditor Document"."Auto Detect Indent" = true; + "katerc"."KTextEditor Document"."Auto Reload If State Is In Version Control" = true; + "katerc"."KTextEditor Document"."Auto Save" = false; + "katerc"."KTextEditor Document"."Auto Save Interval" = 0; + "katerc"."KTextEditor Document"."Auto Save On Focus Out" = false; + "katerc"."KTextEditor Document"."BOM" = false; + "katerc"."KTextEditor Document"."Backup Local" = false; + "katerc"."KTextEditor Document"."Backup Prefix" = ""; + "katerc"."KTextEditor Document"."Backup Remote" = false; + "katerc"."KTextEditor Document"."Backup Suffix" = "~"; + "katerc"."KTextEditor Document"."Camel Cursor" = true; + "katerc"."KTextEditor Document"."Encoding" = "UTF-8"; + "katerc"."KTextEditor Document"."End of Line" = 0; + "katerc"."KTextEditor Document"."Indent On Backspace" = true; + "katerc"."KTextEditor Document"."Indent On Tab" = true; + "katerc"."KTextEditor Document"."Indent On Text Paste" = false; + "katerc"."KTextEditor Document"."Indentation Mode" = "normal"; + "katerc"."KTextEditor Document"."Indentation Width" = 4; + "katerc"."KTextEditor Document"."Keep Extra Spaces" = false; + "katerc"."KTextEditor Document"."Line Length Limit" = 10000; + "katerc"."KTextEditor Document"."Newline at End of File" = true; + "katerc"."KTextEditor Document"."On-The-Fly Spellcheck" = false; + "katerc"."KTextEditor Document"."Overwrite Mode" = false; + "katerc"."KTextEditor Document"."PageUp/PageDown Moves Cursor" = false; + "katerc"."KTextEditor Document"."Remove Spaces" = 1; + "katerc"."KTextEditor Document"."ReplaceTabsDyn" = true; + "katerc"."KTextEditor Document"."Show Spaces" = 0; + "katerc"."KTextEditor Document"."Show Tabs" = true; + "katerc"."KTextEditor Document"."Smart Home" = true; + "katerc"."KTextEditor Document"."Swap Directory" = ""; + "katerc"."KTextEditor Document"."Swap File Mode" = 1; + "katerc"."KTextEditor Document"."Swap Sync Interval" = 15; + "katerc"."KTextEditor Document"."Tab Handling" = 2; + "katerc"."KTextEditor Document"."Tab Width" = 4; + "katerc"."KTextEditor Document"."Trailing Marker Size" = 1; + "katerc"."KTextEditor Document"."Word Wrap" = false; + "katerc"."KTextEditor Document"."Word Wrap Column" = 80; + "katerc"."KTextEditor Editor"."Encoding Prober Type" = 1; + "katerc"."KTextEditor Editor"."Fallback Encoding" = "ISO 8859-15"; + "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false; + "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true; + "katerc"."KTextEditor Renderer"."Color Theme" = "Catppuccin Macchiato"; + "katerc"."KTextEditor Renderer"."Font" = "Hack,10,-1,7,50,0,0,0,0,0"; + "katerc"."KTextEditor Renderer"."Line Height Multiplier" = 1; + "katerc"."KTextEditor Renderer"."Show Indentation Lines" = false; + "katerc"."KTextEditor Renderer"."Show Whole Bracket Expression" = false; + "katerc"."KTextEditor Renderer"."Word Wrap Marker" = false; + "katerc"."KTextEditor View"."Allow Mark Menu" = true; + "katerc"."KTextEditor View"."Auto Brackets" = true; + "katerc"."KTextEditor View"."Auto Center Lines" = 0; + "katerc"."KTextEditor View"."Auto Completion" = true; + "katerc"."KTextEditor View"."Auto Completion Preselect First Entry" = true; + "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; + "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; + "katerc"."KTextEditor View"."Bracket Match Preview" = false; + "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}[]'\""; + "katerc"."KTextEditor View"."Default Mark Type" = 1; + "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; + "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; + "katerc"."KTextEditor View"."Dynamic Word Wrap At Static Marker" = false; + "katerc"."KTextEditor View"."Dynamic Word Wrap Indicators" = 1; + "katerc"."KTextEditor View"."Dynamic Wrap not at word boundaries" = false; + "katerc"."KTextEditor View"."Enable Tab completion" = false; + "katerc"."KTextEditor View"."Fold First Line" = false; + "katerc"."KTextEditor View"."Folding Bar" = true; + "katerc"."KTextEditor View"."Folding Preview" = true; + "katerc"."KTextEditor View"."Icon Bar" = false; + "katerc"."KTextEditor View"."Input Mode" = 0; + "katerc"."KTextEditor View"."Keyword Completion" = true; + "katerc"."KTextEditor View"."Line Modification" = true; + "katerc"."KTextEditor View"."Line Numbers" = true; + "katerc"."KTextEditor View"."Max Clipboard History Entries" = 20; + "katerc"."KTextEditor View"."Maximum Search History Size" = 100; + "katerc"."KTextEditor View"."Mouse Paste At Cursor Position" = false; + "katerc"."KTextEditor View"."Multiple Cursor Modifier" = 134217728; + "katerc"."KTextEditor View"."Persistent Selection" = false; + "katerc"."KTextEditor View"."Scroll Bar Marks" = false; + "katerc"."KTextEditor View"."Scroll Bar Mini Map All" = true; + "katerc"."KTextEditor View"."Scroll Bar Mini Map Width" = 60; + "katerc"."KTextEditor View"."Scroll Bar MiniMap" = true; + "katerc"."KTextEditor View"."Scroll Bar Preview" = true; + "katerc"."KTextEditor View"."Scroll Past End" = false; + "katerc"."KTextEditor View"."Search/Replace Flags" = 140; + "katerc"."KTextEditor View"."Shoe Line Ending Type in Statusbar" = false; + "katerc"."KTextEditor View"."Show Documentation With Completion" = true; + "katerc"."KTextEditor View"."Show File Encoding" = true; + "katerc"."KTextEditor View"."Show Focus Frame Around Editor" = true; + "katerc"."KTextEditor View"."Show Folding Icons On Hover Only" = true; + "katerc"."KTextEditor View"."Show Line Count" = false; + "katerc"."KTextEditor View"."Show Scrollbars" = 0; + "katerc"."KTextEditor View"."Show Statusbar Dictionary" = true; + "katerc"."KTextEditor View"."Show Statusbar Highlighting Mode" = true; + "katerc"."KTextEditor View"."Show Statusbar Input Mode" = true; + "katerc"."KTextEditor View"."Show Statusbar Line Column" = true; + "katerc"."KTextEditor View"."Show Statusbar Tab Settings" = true; + "katerc"."KTextEditor View"."Show Word Count" = false; + "katerc"."KTextEditor View"."Smart Copy Cut" = true; + "katerc"."KTextEditor View"."Statusbar Line Column Compact Mode" = true; + "katerc"."KTextEditor View"."Text Drag And Drop" = true; + "katerc"."KTextEditor View"."User Sets Of Chars To Enclose Selection" = ""; + "katerc"."KTextEditor View"."Vi Input Mode Steal Keys" = false; + "katerc"."KTextEditor View"."Vi Relative Line Numbers" = false; + "katerc"."KTextEditor View"."Word Completion" = true; + "katerc"."KTextEditor View"."Word Completion Minimal Word Length" = 3; + "katerc"."KTextEditor View"."Word Completion Remove Tail" = true; + "katerc"."KTextEditor::Search"."Search History" = "uuid"; + "katerc"."filetree"."editShade" = "93,62,114"; + "katerc"."filetree"."listMode" = false; + "katerc"."filetree"."shadingEnabled" = true; + "katerc"."filetree"."showCloseButton" = false; + "katerc"."filetree"."showFullPathOnRoots" = false; + "katerc"."filetree"."showToolbar" = true; + "katerc"."filetree"."sortRole" = 0; + "katerc"."filetree"."viewShade" = "101,69,143"; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; + "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; + "kcminputrc"."Mouse"."cursorSize" = 32; + "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "960,540"; + "kdeglobals"."General"."AccentColor" = "184,117,220"; + "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; + "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; + "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; + "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; + "kdeglobals"."KDE"."ShowDeleteCommand" = false; + "kdeglobals"."KDE"."SingleClick" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Preview" = false; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; + "kdeglobals"."PreviewSettings"."MaximumRemoteSize" = 0; + "kdeglobals"."WM"."activeBackground" = "49,54,59"; + "kdeglobals"."WM"."activeBlend" = "252,252,252"; + "kdeglobals"."WM"."activeForeground" = "252,252,252"; + "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; + "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; + "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "khotkeysrc"."Data"."DataCount" = 3; + "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; + "khotkeysrc"."Data_1"."DataCount" = 1; + "khotkeysrc"."Data_1"."Enabled" = true; + "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; + "khotkeysrc"."Data_1"."SystemGroup" = 1; + "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1"."Comment" = "Comment"; + "khotkeysrc"."Data_1_1"."Enabled" = true; + "khotkeysrc"."Data_1_1"."Name" = "Search"; + "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; + "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; + "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; + "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; + "khotkeysrc"."Data_2"."DataCount" = 8; + "khotkeysrc"."Data_2"."Enabled" = false; + "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; + "khotkeysrc"."Data_2"."Name" = "Examples"; + "khotkeysrc"."Data_2"."SystemGroup" = 0; + "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; + "khotkeysrc"."Data_2_1"."Enabled" = false; + "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; + "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; + "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; + "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; + "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; + "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; + "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; + "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; + "khotkeysrc"."Data_2_2"."Enabled" = false; + "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; + "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; + "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; + "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; + "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; + "khotkeysrc"."Data_2_3"."Enabled" = false; + "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; + "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; + "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; + "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; + "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; + "khotkeysrc"."Data_2_4"."Enabled" = false; + "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; + "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; + "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; + "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; + "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; + "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; + "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; + "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; + "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; + "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; + "khotkeysrc"."Data_2_5"."Enabled" = false; + "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; + "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; + "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; + "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; + "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; + "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; + "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; + "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; + "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; + "khotkeysrc"."Data_2_6"."Enabled" = false; + "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; + "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; + "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; + "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; + "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; + "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; + "khotkeysrc"."Data_2_7"."DataCount" = 4; + "khotkeysrc"."Data_2_7"."Enabled" = false; + "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; + "khotkeysrc"."Data_2_7"."SystemGroup" = 0; + "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; + "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; + "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; + "khotkeysrc"."Data_2_7_1"."Comment" = ""; + "khotkeysrc"."Data_2_7_1"."Enabled" = false; + "khotkeysrc"."Data_2_7_1"."Name" = "Back"; + "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2"."Comment" = ""; + "khotkeysrc"."Data_2_7_2"."Enabled" = false; + "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; + "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3"."Comment" = ""; + "khotkeysrc"."Data_2_7_3"."Enabled" = false; + "khotkeysrc"."Data_2_7_3"."Name" = "Up"; + "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; + "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4"."Comment" = ""; + "khotkeysrc"."Data_2_7_4"."Enabled" = false; + "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; + "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; + "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; + "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; + "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; + "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; + "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; + "khotkeysrc"."Data_2_8"."Enabled" = false; + "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; + "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; + "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; + "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; + "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; + "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; + "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; + "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; + "khotkeysrc"."Data_3"."DataCount" = 14; + "khotkeysrc"."Data_3"."Enabled" = true; + "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; + "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; + "khotkeysrc"."Data_3"."SystemGroup" = 0; + "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; + "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; + "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; + "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; + "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors"; + "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; + "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; + "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; + "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; + "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; + "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; + "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; + "khotkeysrc"."Data_3_1"."Enabled" = true; + "khotkeysrc"."Data_3_1"."Name" = "Back"; + "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; + "khotkeysrc"."Data_3_10"."Enabled" = false; + "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; + "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; + "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; + "khotkeysrc"."Data_3_11"."Enabled" = true; + "khotkeysrc"."Data_3_11"."Name" = "Up"; + "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; + "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; + "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; + "khotkeysrc"."Data_3_12"."Enabled" = false; + "khotkeysrc"."Data_3_12"."Name" = "Up #2"; + "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; + "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; + "khotkeysrc"."Data_3_13"."Enabled" = true; + "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; + "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; + "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; + "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; + "khotkeysrc"."Data_3_14"."Enabled" = true; + "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; + "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; + "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; + "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; + "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; + "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; + "khotkeysrc"."Data_3_2"."Enabled" = true; + "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; + "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; + "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; + "khotkeysrc"."Data_3_3"."Enabled" = true; + "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; + "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; + "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; + "khotkeysrc"."Data_3_4"."Enabled" = true; + "khotkeysrc"."Data_3_4"."Name" = "Forward"; + "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; + "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; + "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; + "khotkeysrc"."Data_3_5"."Enabled" = true; + "khotkeysrc"."Data_3_5"."Name" = "Home"; + "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; + "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; + "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; + "khotkeysrc"."Data_3_6"."Enabled" = true; + "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; + "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; + "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; + "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; + "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; + "khotkeysrc"."Data_3_7"."Enabled" = true; + "khotkeysrc"."Data_3_7"."Name" = "New Tab"; + "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; + "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; + "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; + "khotkeysrc"."Data_3_8"."Enabled" = true; + "khotkeysrc"."Data_3_8"."Name" = "New Window"; + "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; + "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; + "khotkeysrc"."Data_3_9"."Enabled" = true; + "khotkeysrc"."Data_3_9"."Name" = "Reload"; + "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; + "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; + "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; + "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; + "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; + "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; + "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; + "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; + "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; + "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; + "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; + "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions" = ""; + "khotkeysrc"."General"."BrowserApplication" = ""; + "khotkeysrc"."Gestures"."Disabled" = true; + "khotkeysrc"."Gestures"."MouseButton" = 2; + "khotkeysrc"."Gestures"."Timeout" = 300; + "khotkeysrc"."GesturesExclude"."Comment" = ""; + "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; + "khotkeysrc"."KDE"."AnimationDurationFactor" = ""; + "khotkeysrc"."KDE"."ShowDeleteCommand" = ""; + "khotkeysrc"."KDE"."SingleClick" = ""; + "khotkeysrc"."KDE"."widgetStyle" = ""; + "khotkeysrc"."KFileDialog Settings"."Allow Expansion" = ""; + "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension" = ""; + "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation" = ""; + "khotkeysrc"."KFileDialog Settings"."Decoration position" = ""; + "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode" = ""; + "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Bookmarks" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Full Path" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Inline Previews" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Preview" = ""; + "khotkeysrc"."KFileDialog Settings"."Show Speedbar" = ""; + "khotkeysrc"."KFileDialog Settings"."Show hidden files" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort by" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort directories first" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort hidden files last" = ""; + "khotkeysrc"."KFileDialog Settings"."Sort reversed" = ""; + "khotkeysrc"."KFileDialog Settings"."Speedbar Width" = ""; + "khotkeysrc"."KFileDialog Settings"."View Style" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size" = ""; + "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; + "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."PreviewSettings"."MaximumRemoteSize" = ""; + "khotkeysrc"."Voice"."Shortcut" = ""; + "khotkeysrc"."WM"."activeBackground" = ""; + "khotkeysrc"."WM"."activeBlend" = ""; + "khotkeysrc"."WM"."activeForeground" = ""; + "khotkeysrc"."WM"."inactiveBackground" = ""; + "khotkeysrc"."WM"."inactiveBlend" = ""; + "khotkeysrc"."WM"."inactiveForeground" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; + "kiorc"."Confirmations"."ConfirmTrash" = false; + "kiorc"."Executable scripts"."behaviourOnLaunch" = "alwaysAsk"; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "krunnerrc"."Plugins"."locationsEnabled" = true; + "krunnerrc"."Plugins"."placesEnabled" = true; + "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; + "kservicemenurc"."Show"."compressfileitemaction" = true; + "kservicemenurc"."Show"."extractfileitemaction" = true; + "kservicemenurc"."Show"."forgetfileitemaction" = true; + "kservicemenurc"."Show"."installFont" = true; + "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin" = true; + "kservicemenurc"."Show"."kdeconnectfileitemaction" = true; + "kservicemenurc"."Show"."kio-admin" = true; + "kservicemenurc"."Show"."mountisoaction" = true; + "kservicemenurc"."Show"."nextclouddolphinactionplugin" = true; + "kservicemenurc"."Show"."runInKonsole" = true; + "kservicemenurc"."Show"."setAsWallpaper" = true; + "kservicemenurc"."Show"."slideshowfileitemaction" = true; + "kservicemenurc"."Show"."tagsfileitemaction" = true; + "ksmserverrc"."General"."loginMode" = "restoreSavedSession"; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; + "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; + "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; + "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 2; + "kwinrc"."Effect-diminactive"."Strength" = 15; + "kwinrc"."Effect-magiclamp"."AnimationDuration" = 20; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; + "kwinrc"."NightColor"."LongitudeFixed" = 5.44; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 1400; + "kwinrc"."Plugins"."diminactiveEnabled" = true; + "kwinrc"."Plugins"."dimscreenEnabled" = true; + "kwinrc"."Plugins"."wobblywindowsEnabled" = true; + "kwinrc"."Tiling"."padding" = 0; + "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"layoutDirection\":\"vertical\",\"tiles\":x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d}x5d,\"width\":1}x5d}"; + "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; + "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}"; + "kwinrc"."Xwayland"."Scale" = 1; + "kxkbrc"."Layout"."Options" = "compose:caps"; + "kxkbrc"."Layout"."ResetOldOptions" = true; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; + "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "plasmanotifyrc"."Applications/firefox"."Seen" = true; + "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; + "plasmarc"."Wallpapers"."usersWallpapers" = ""; + "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; + "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; + "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; + }; + dataFile = { + "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; + "kate/anonymous.katesession"."Document 0"."Bookmarks" = ""; + "kate/anonymous.katesession"."Document 0"."Encoding" = "UTF-8"; + "kate/anonymous.katesession"."Document 0"."Highlighting" = "None"; + "kate/anonymous.katesession"."Document 0"."Highlighting Set By User" = false; + "kate/anonymous.katesession"."Document 0"."Indentation Mode" = "normal"; + "kate/anonymous.katesession"."Document 0"."Mode" = "Normal"; + "kate/anonymous.katesession"."Document 0"."Mode Set By User" = false; + "kate/anonymous.katesession"."Document 0"."URL" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; + "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."externaltoolsplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."formatplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katebacktracebrowserplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katebuildplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katecloseexceptplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katecolorpickerplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katectagsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katefilebrowserplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katefiletreeplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."kategdbplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."kategitblameplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katekonsoleplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."kateprojectplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."katereplicodeplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesearchplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."katesnippetsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesqlplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesymbolviewerplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katexmlcheckplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katexmltoolsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."keyboardmacrosplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."ktexteditorpreviewplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."latexcompletionplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."lspclientplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."openlinkplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; + "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; + "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 1874; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 1634; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,927,0"; + "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 1874; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Active View" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":[]}"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; + "kate/anonymous.katesession"."Open Documents"."Count" = 1; + "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; + "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentExcludeFilter" = "-1"; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentFilter" = "-1"; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExcludeFilters" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExpandSearchResults" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Filters" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."FollowSymLink" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."HiddenFiles" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."MatchCase" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Place" = 1; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Recursive" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Replaces" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Search" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeAllProjects" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeCurrentFile" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeFolder" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeOpenFiles" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeProject" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiles" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiless" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."UseRegExp" = false; + }; + }; +} From a7982d282ae729bc54b5330958c498a92e57fdaa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 16:46:16 +0200 Subject: [PATCH 085/395] Wrong place for it oops --- .../package-configs/plasma-desktop.nix | 558 +++++--- home-manager/desktop/plasma-desktop.nix | 1177 ----------------- 2 files changed, 408 insertions(+), 1327 deletions(-) delete mode 100644 home-manager/desktop/plasma-desktop.nix diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 5d68046..1ccfab8 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -8,7 +8,7 @@ "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; @@ -16,27 +16,28 @@ "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; + "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = []; - "ksmserver"."Reboot" = []; - "ksmserver"."Reboot Without Confirmation" = []; - "ksmserver"."Shut Down" = []; + "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; + "ksmserver"."LogOut" = "none,,Log Out"; + "ksmserver"."Reboot" = "none,,Reboot"; + "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; + "ksmserver"."Shut Down" = "none,,Shut Down"; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cube" = "Meta+C"; + "kwin"."Cube" = "Meta+C,none"; "kwin"."Cycle Overview" = []; "kwin"."Cycle Overview Opposite" = []; - "kwin"."Decrease Opacity" = []; + "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = []; + "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; @@ -46,10 +47,10 @@ "kwin"."MoveZoomRight" = []; "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = []; + "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12"; + "kwin"."ShowDesktopGrid" = "Meta+F8,none"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12,none"; "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; @@ -59,136 +60,136 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = []; - "kwin"."Switch to Desktop 11" = []; - "kwin"."Switch to Desktop 12" = []; - "kwin"."Switch to Desktop 13" = []; - "kwin"."Switch to Desktop 14" = []; - "kwin"."Switch to Desktop 15" = []; - "kwin"."Switch to Desktop 16" = []; - "kwin"."Switch to Desktop 17" = []; - "kwin"."Switch to Desktop 18" = []; - "kwin"."Switch to Desktop 19" = []; + "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; + "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; + "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; + "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; + "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; + "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; + "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; + "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; + "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; + "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = []; + "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = []; - "kwin"."Switch to Desktop 6" = []; - "kwin"."Switch to Desktop 7" = []; - "kwin"."Switch to Desktop 8" = []; - "kwin"."Switch to Desktop 9" = []; - "kwin"."Switch to Next Desktop" = []; - "kwin"."Switch to Next Screen" = []; - "kwin"."Switch to Previous Desktop" = []; - "kwin"."Switch to Previous Screen" = []; - "kwin"."Switch to Screen 0" = []; - "kwin"."Switch to Screen 1" = []; - "kwin"."Switch to Screen 2" = []; - "kwin"."Switch to Screen 3" = []; - "kwin"."Switch to Screen 4" = []; - "kwin"."Switch to Screen 5" = []; - "kwin"."Switch to Screen 6" = []; - "kwin"."Switch to Screen 7" = []; - "kwin"."Switch to Screen Above" = []; - "kwin"."Switch to Screen Below" = []; - "kwin"."Switch to Screen to the Left" = []; - "kwin"."Switch to Screen to the Right" = []; + "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; + "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; + "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; + "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; + "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; + "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; + "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; + "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; + "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; + "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; + "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; + "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; + "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; + "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; + "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; + "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; + "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; + "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; + "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; + "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; + "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; "kwin"."Walk Through Desktop List" = []; "kwin"."Walk Through Desktop List (Reverse)" = []; "kwin"."Walk Through Desktops" = []; "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = []; - "kwin"."Walk Through Windows Alternative (Reverse)" = []; - "kwin"."Walk Through Windows of Current Application" = []; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab,Alt+Shift+Tab,Walk Through Windows (Reverse)"; + "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; + "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; + "kwin"."Walk Through Windows of Current Application" = "none,Alt+`,Walk Through Windows of Current Application"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = []; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; - "kwin"."Window Above Other Windows" = []; - "kwin"."Window Below Other Windows" = []; + "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; + "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; + "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = []; - "kwin"."Window Grow Horizontal" = []; - "kwin"."Window Grow Vertical" = []; - "kwin"."Window Lower" = []; + "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; + "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; + "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; + "kwin"."Window Lower" = "none,,Lower Window"; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = []; - "kwin"."Window Maximize Vertical" = []; + "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; + "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = []; - "kwin"."Window Move Center" = []; - "kwin"."Window No Border" = []; - "kwin"."Window On All Desktops" = []; + "kwin"."Window Move" = "none,,Move Window"; + "kwin"."Window Move Center" = "none,,Move Window to the Center"; + "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; + "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = []; - "kwin"."Window One Screen Up" = []; - "kwin"."Window One Screen to the Left" = []; - "kwin"."Window One Screen to the Right" = []; + "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; + "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; + "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; + "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = []; - "kwin"."Window Pack Left" = []; - "kwin"."Window Pack Right" = []; - "kwin"."Window Pack Up" = []; + "kwin"."Window Pack Down" = "none,,Move Window Down"; + "kwin"."Window Pack Left" = "none,,Move Window Left"; + "kwin"."Window Pack Right" = "none,,Move Window Right"; + "kwin"."Window Pack Up" = "none,,Move Window Up"; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = []; - "kwin"."Window Quick Tile Bottom Right" = []; + "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; + "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = []; - "kwin"."Window Quick Tile Top Right" = []; - "kwin"."Window Raise" = []; - "kwin"."Window Resize" = []; - "kwin"."Window Shade" = []; - "kwin"."Window Shrink Horizontal" = []; - "kwin"."Window Shrink Vertical" = []; - "kwin"."Window to Desktop 1" = []; - "kwin"."Window to Desktop 10" = []; - "kwin"."Window to Desktop 11" = []; - "kwin"."Window to Desktop 12" = []; - "kwin"."Window to Desktop 13" = []; - "kwin"."Window to Desktop 14" = []; - "kwin"."Window to Desktop 15" = []; - "kwin"."Window to Desktop 16" = []; - "kwin"."Window to Desktop 17" = []; - "kwin"."Window to Desktop 18" = []; - "kwin"."Window to Desktop 19" = []; - "kwin"."Window to Desktop 2" = []; - "kwin"."Window to Desktop 20" = []; - "kwin"."Window to Desktop 3" = []; - "kwin"."Window to Desktop 4" = []; - "kwin"."Window to Desktop 5" = []; - "kwin"."Window to Desktop 6" = []; - "kwin"."Window to Desktop 7" = []; - "kwin"."Window to Desktop 8" = []; - "kwin"."Window to Desktop 9" = []; - "kwin"."Window to Next Desktop" = []; - "kwin"."Window to Next Screen" = []; - "kwin"."Window to Previous Desktop" = []; - "kwin"."Window to Previous Screen" = []; - "kwin"."Window to Screen 0" = []; - "kwin"."Window to Screen 1" = []; - "kwin"."Window to Screen 2" = []; - "kwin"."Window to Screen 3" = []; - "kwin"."Window to Screen 4" = []; - "kwin"."Window to Screen 5" = []; - "kwin"."Window to Screen 6" = []; - "kwin"."Window to Screen 7" = []; + "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; + "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; + "kwin"."Window Raise" = "none,,Raise Window"; + "kwin"."Window Resize" = "none,,Resize Window"; + "kwin"."Window Shade" = "none,,Shade Window"; + "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; + "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; + "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; + "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; + "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; + "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; + "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; + "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; + "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; + "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; + "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; + "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; + "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; + "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; + "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; + "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; + "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; + "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; + "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; + "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; + "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; + "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; + "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; + "kwin"."Window to Next Screen" = "none,Meta+Shift+Right,Move Window to Next Screen"; + "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; + "kwin"."Window to Previous Screen" = "none,Meta+Shift+Left,Move Window to Previous Screen"; + "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; + "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; + "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; + "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; + "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; + "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; + "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; + "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = "Meta++"; + "kwin"."view_zoom_in" = ["Meta++,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = []; - "mediacontrol"."mediavolumeup" = []; + "mediacontrol"."mediavolumedown" = "none,,Media volume down"; + "mediacontrol"."mediavolumeup" = "none,,Media volume up"; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = []; + "mediacontrol"."playmedia" = "none,,Play media playback"; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; @@ -204,9 +205,10 @@ "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = []; + "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10"; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -215,23 +217,23 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = []; + "plasmashell"."clear-history" = "none,,Clear Clipboard History"; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = []; - "plasmashell"."cyclePrevAction" = []; + "plasmashell"."cycleNextAction" = "none,,Next History Item"; + "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = "Meta+Tab"; - "plasmashell"."previous activity" = "Meta+Shift+Tab"; + "plasmashell"."next activity" = "Meta+Tab,none,Walk through activities"; + "plasmashell"."previous activity" = "Meta+Shift+Tab,none,Walk through activities (Reverse)"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = []; + "plasmashell"."show-barcode" = "none,,Show Barcode…"; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = []; - "plasmashell"."switch to previous activity" = []; - "plasmashell"."toggle do not disturb" = []; + "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; + "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; + "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; @@ -244,22 +246,22 @@ "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { @@ -268,8 +270,12 @@ "baloofilerc"."General"."exclude filters version" = 8; "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; - "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; + "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; + "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; + "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; + "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; + "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; "dolphinrc"."IconsMode"."PreviewSize" = 80; "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; @@ -278,6 +284,128 @@ "dolphinrc"."Search"."Location" = "Everywhere"; "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; + "katerc"."General"."Days Meta Infos" = 30; + "katerc"."General"."Save Meta Infos" = true; + "katerc"."General"."Show Full Path in Title" = false; + "katerc"."General"."Show Menu Bar" = true; + "katerc"."General"."Show Status Bar" = true; + "katerc"."General"."Show Tab Bar" = true; + "katerc"."General"."Show Url Nav Bar" = true; + "katerc"."KTextEditor Document"."Allow End of Line Detection" = true; + "katerc"."KTextEditor Document"."Auto Detect Indent" = true; + "katerc"."KTextEditor Document"."Auto Reload If State Is In Version Control" = true; + "katerc"."KTextEditor Document"."Auto Save" = false; + "katerc"."KTextEditor Document"."Auto Save Interval" = 0; + "katerc"."KTextEditor Document"."Auto Save On Focus Out" = false; + "katerc"."KTextEditor Document"."BOM" = false; + "katerc"."KTextEditor Document"."Backup Local" = false; + "katerc"."KTextEditor Document"."Backup Prefix" = ""; + "katerc"."KTextEditor Document"."Backup Remote" = false; + "katerc"."KTextEditor Document"."Backup Suffix" = "~"; + "katerc"."KTextEditor Document"."Camel Cursor" = true; + "katerc"."KTextEditor Document"."Encoding" = "UTF-8"; + "katerc"."KTextEditor Document"."End of Line" = 0; + "katerc"."KTextEditor Document"."Indent On Backspace" = true; + "katerc"."KTextEditor Document"."Indent On Tab" = true; + "katerc"."KTextEditor Document"."Indent On Text Paste" = false; + "katerc"."KTextEditor Document"."Indentation Mode" = "normal"; + "katerc"."KTextEditor Document"."Indentation Width" = 4; + "katerc"."KTextEditor Document"."Keep Extra Spaces" = false; + "katerc"."KTextEditor Document"."Line Length Limit" = 10000; + "katerc"."KTextEditor Document"."Newline at End of File" = true; + "katerc"."KTextEditor Document"."On-The-Fly Spellcheck" = false; + "katerc"."KTextEditor Document"."Overwrite Mode" = false; + "katerc"."KTextEditor Document"."PageUp/PageDown Moves Cursor" = false; + "katerc"."KTextEditor Document"."Remove Spaces" = 1; + "katerc"."KTextEditor Document"."ReplaceTabsDyn" = true; + "katerc"."KTextEditor Document"."Show Spaces" = 0; + "katerc"."KTextEditor Document"."Show Tabs" = true; + "katerc"."KTextEditor Document"."Smart Home" = true; + "katerc"."KTextEditor Document"."Swap Directory" = ""; + "katerc"."KTextEditor Document"."Swap File Mode" = 1; + "katerc"."KTextEditor Document"."Swap Sync Interval" = 15; + "katerc"."KTextEditor Document"."Tab Handling" = 2; + "katerc"."KTextEditor Document"."Tab Width" = 4; + "katerc"."KTextEditor Document"."Trailing Marker Size" = 1; + "katerc"."KTextEditor Document"."Word Wrap" = false; + "katerc"."KTextEditor Document"."Word Wrap Column" = 80; + "katerc"."KTextEditor Editor"."Encoding Prober Type" = 1; + "katerc"."KTextEditor Editor"."Fallback Encoding" = "ISO 8859-15"; + "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false; + "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true; + "katerc"."KTextEditor Renderer"."Color Theme" = "Catppuccin Macchiato"; + "katerc"."KTextEditor Renderer"."Font" = "Hack,10,-1,7,50,0,0,0,0,0"; + "katerc"."KTextEditor Renderer"."Line Height Multiplier" = 1; + "katerc"."KTextEditor Renderer"."Show Indentation Lines" = false; + "katerc"."KTextEditor Renderer"."Show Whole Bracket Expression" = false; + "katerc"."KTextEditor Renderer"."Word Wrap Marker" = false; + "katerc"."KTextEditor View"."Allow Mark Menu" = true; + "katerc"."KTextEditor View"."Auto Brackets" = true; + "katerc"."KTextEditor View"."Auto Center Lines" = 0; + "katerc"."KTextEditor View"."Auto Completion" = true; + "katerc"."KTextEditor View"."Auto Completion Preselect First Entry" = true; + "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; + "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; + "katerc"."KTextEditor View"."Bracket Match Preview" = false; + "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}[]'\""; + "katerc"."KTextEditor View"."Default Mark Type" = 1; + "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; + "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; + "katerc"."KTextEditor View"."Dynamic Word Wrap At Static Marker" = false; + "katerc"."KTextEditor View"."Dynamic Word Wrap Indicators" = 1; + "katerc"."KTextEditor View"."Dynamic Wrap not at word boundaries" = false; + "katerc"."KTextEditor View"."Enable Tab completion" = false; + "katerc"."KTextEditor View"."Fold First Line" = false; + "katerc"."KTextEditor View"."Folding Bar" = true; + "katerc"."KTextEditor View"."Folding Preview" = true; + "katerc"."KTextEditor View"."Icon Bar" = false; + "katerc"."KTextEditor View"."Input Mode" = 0; + "katerc"."KTextEditor View"."Keyword Completion" = true; + "katerc"."KTextEditor View"."Line Modification" = true; + "katerc"."KTextEditor View"."Line Numbers" = true; + "katerc"."KTextEditor View"."Max Clipboard History Entries" = 20; + "katerc"."KTextEditor View"."Maximum Search History Size" = 100; + "katerc"."KTextEditor View"."Mouse Paste At Cursor Position" = false; + "katerc"."KTextEditor View"."Multiple Cursor Modifier" = 134217728; + "katerc"."KTextEditor View"."Persistent Selection" = false; + "katerc"."KTextEditor View"."Scroll Bar Marks" = false; + "katerc"."KTextEditor View"."Scroll Bar Mini Map All" = true; + "katerc"."KTextEditor View"."Scroll Bar Mini Map Width" = 60; + "katerc"."KTextEditor View"."Scroll Bar MiniMap" = true; + "katerc"."KTextEditor View"."Scroll Bar Preview" = true; + "katerc"."KTextEditor View"."Scroll Past End" = false; + "katerc"."KTextEditor View"."Search/Replace Flags" = 140; + "katerc"."KTextEditor View"."Shoe Line Ending Type in Statusbar" = false; + "katerc"."KTextEditor View"."Show Documentation With Completion" = true; + "katerc"."KTextEditor View"."Show File Encoding" = true; + "katerc"."KTextEditor View"."Show Focus Frame Around Editor" = true; + "katerc"."KTextEditor View"."Show Folding Icons On Hover Only" = true; + "katerc"."KTextEditor View"."Show Line Count" = false; + "katerc"."KTextEditor View"."Show Scrollbars" = 0; + "katerc"."KTextEditor View"."Show Statusbar Dictionary" = true; + "katerc"."KTextEditor View"."Show Statusbar Highlighting Mode" = true; + "katerc"."KTextEditor View"."Show Statusbar Input Mode" = true; + "katerc"."KTextEditor View"."Show Statusbar Line Column" = true; + "katerc"."KTextEditor View"."Show Statusbar Tab Settings" = true; + "katerc"."KTextEditor View"."Show Word Count" = false; + "katerc"."KTextEditor View"."Smart Copy Cut" = true; + "katerc"."KTextEditor View"."Statusbar Line Column Compact Mode" = true; + "katerc"."KTextEditor View"."Text Drag And Drop" = true; + "katerc"."KTextEditor View"."User Sets Of Chars To Enclose Selection" = ""; + "katerc"."KTextEditor View"."Vi Input Mode Steal Keys" = false; + "katerc"."KTextEditor View"."Vi Relative Line Numbers" = false; + "katerc"."KTextEditor View"."Word Completion" = true; + "katerc"."KTextEditor View"."Word Completion Minimal Word Length" = 3; + "katerc"."KTextEditor View"."Word Completion Remove Tail" = true; + "katerc"."KTextEditor::Search"."Search History" = "uuid"; + "katerc"."filetree"."editShade" = "93,62,114"; + "katerc"."filetree"."listMode" = false; + "katerc"."filetree"."shadingEnabled" = true; + "katerc"."filetree"."showCloseButton" = false; + "katerc"."filetree"."showFullPathOnRoots" = false; + "katerc"."filetree"."showToolbar" = true; + "katerc"."filetree"."sortRole" = 0; + "katerc"."filetree"."viewShade" = "101,69,143"; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; @@ -289,6 +417,7 @@ "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "960,540"; "kdeglobals"."General"."AccentColor" = "184,117,220"; "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; @@ -322,17 +451,6 @@ "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; - "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; - "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; - "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; - "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; - "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; - "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; - "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; - "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; - "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System"; - "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell"; "khotkeysrc"."Data"."DataCount" = 3; "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; "khotkeysrc"."Data_1"."DataCount" = 1; @@ -876,6 +994,7 @@ "kservicemenurc"."Show"."setAsWallpaper" = true; "kservicemenurc"."Show"."slideshowfileitemaction" = true; "kservicemenurc"."Show"."tagsfileitemaction" = true; + "ksmserverrc"."General"."loginMode" = "restoreSavedSession"; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; @@ -900,6 +1019,7 @@ "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; + "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}"; "kwinrc"."Xwayland"."Scale" = 1; "kxkbrc"."Layout"."Options" = "compose:caps"; "kxkbrc"."Layout"."ResetOldOptions" = true; @@ -912,8 +1032,146 @@ "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; + "plasmanotifyrc"."Applications/firefox"."Seen" = true; + "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; "plasmarc"."Wallpapers"."usersWallpapers" = ""; + "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; + "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; + dataFile = { + "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; + "kate/anonymous.katesession"."Document 0"."Bookmarks" = ""; + "kate/anonymous.katesession"."Document 0"."Encoding" = "UTF-8"; + "kate/anonymous.katesession"."Document 0"."Highlighting" = "None"; + "kate/anonymous.katesession"."Document 0"."Highlighting Set By User" = false; + "kate/anonymous.katesession"."Document 0"."Indentation Mode" = "normal"; + "kate/anonymous.katesession"."Document 0"."Mode" = "Normal"; + "kate/anonymous.katesession"."Document 0"."Mode Set By User" = false; + "kate/anonymous.katesession"."Document 0"."URL" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; + "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."externaltoolsplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."formatplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katebacktracebrowserplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katebuildplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katecloseexceptplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katecolorpickerplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katectagsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katefilebrowserplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katefiletreeplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."kategdbplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."kategitblameplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katekonsoleplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."kateprojectplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."katereplicodeplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesearchplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."katesnippetsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesqlplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katesymbolviewerplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katexmlcheckplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."katexmltoolsplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."keyboardmacrosplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."ktexteditorpreviewplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."latexcompletionplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."lspclientplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."openlinkplugin" = false; + "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; + "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; + "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; + "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 1874; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 1634; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Position" = 0; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,927,0"; + "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; + "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 1874; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Active View" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":[]}"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; + "kate/anonymous.katesession"."Open Documents"."Count" = 1; + "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; + "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentExcludeFilter" = "-1"; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentFilter" = "-1"; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExcludeFilters" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExpandSearchResults" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Filters" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."FollowSymLink" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."HiddenFiles" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."MatchCase" = false; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Place" = 1; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Recursive" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Replaces" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Search" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeAllProjects" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeCurrentFile" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeFolder" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeOpenFiles" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeProject" = true; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiles" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiless" = ""; + "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."UseRegExp" = false; + }; }; } diff --git a/home-manager/desktop/plasma-desktop.nix b/home-manager/desktop/plasma-desktop.nix deleted file mode 100644 index 1ccfab8..0000000 --- a/home-manager/desktop/plasma-desktop.nix +++ /dev/null @@ -1,1177 +0,0 @@ -{ - programs.plasma = { - enable = true; - shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; - "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; - "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; - "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; - "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; - "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; - "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; - "kmix"."decrease_volume" = "Volume Down"; - "kmix"."decrease_volume_small" = "Shift+Volume Down"; - "kmix"."increase_microphone_volume" = "Microphone Volume Up"; - "kmix"."increase_volume" = "Volume Up"; - "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; - "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; - "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; - "ksmserver"."LogOut" = "none,,Log Out"; - "ksmserver"."Reboot" = "none,,Reboot"; - "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; - "ksmserver"."Shut Down" = "none,,Shut Down"; - "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cube" = "Meta+C,none"; - "kwin"."Cycle Overview" = []; - "kwin"."Cycle Overview Opposite" = []; - "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; - "kwin"."Edit Tiles" = "Meta+T"; - "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; - "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = []; - "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; - "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = []; - "kwin"."MoveMouseToCenter" = "Meta+F6"; - "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = []; - "kwin"."MoveZoomLeft" = []; - "kwin"."MoveZoomRight" = []; - "kwin"."MoveZoomUp" = []; - "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; - "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8,none"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12,none"; - "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; - "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; - "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; - "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; - "kwin"."Switch Window Down" = "Meta+Alt+Down"; - "kwin"."Switch Window Left" = "Meta+Alt+Left"; - "kwin"."Switch Window Right" = "Meta+Alt+Right"; - "kwin"."Switch Window Up" = "Meta+Alt+Up"; - "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; - "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; - "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; - "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; - "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; - "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; - "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; - "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; - "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; - "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; - "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; - "kwin"."Switch to Desktop 3" = "Ctrl+F3"; - "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; - "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; - "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; - "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; - "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; - "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; - "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; - "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; - "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; - "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; - "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; - "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; - "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; - "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; - "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; - "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; - "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; - "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; - "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; - "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; - "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; - "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; - "kwin"."Walk Through Desktop List" = []; - "kwin"."Walk Through Desktop List (Reverse)" = []; - "kwin"."Walk Through Desktops" = []; - "kwin"."Walk Through Desktops (Reverse)" = []; - "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab,Alt+Shift+Tab,Walk Through Windows (Reverse)"; - "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; - "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; - "kwin"."Walk Through Windows of Current Application" = "none,Alt+`,Walk Through Windows of Current Application"; - "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; - "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; - "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; - "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; - "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; - "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; - "kwin"."Window Lower" = "none,,Lower Window"; - "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; - "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; - "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = "none,,Move Window"; - "kwin"."Window Move Center" = "none,,Move Window to the Center"; - "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; - "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; - "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; - "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; - "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; - "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; - "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; - "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; - "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; - "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = "none,,Move Window Down"; - "kwin"."Window Pack Left" = "none,,Move Window Left"; - "kwin"."Window Pack Right" = "none,,Move Window Right"; - "kwin"."Window Pack Up" = "none,,Move Window Up"; - "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; - "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; - "kwin"."Window Quick Tile Left" = "Meta+Left"; - "kwin"."Window Quick Tile Right" = "Meta+Right"; - "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; - "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; - "kwin"."Window Raise" = "none,,Raise Window"; - "kwin"."Window Resize" = "none,,Resize Window"; - "kwin"."Window Shade" = "none,,Shade Window"; - "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; - "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; - "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; - "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; - "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; - "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; - "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; - "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; - "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; - "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; - "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; - "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; - "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; - "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; - "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; - "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; - "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; - "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; - "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; - "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; - "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; - "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; - "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; - "kwin"."Window to Next Screen" = "none,Meta+Shift+Right,Move Window to Next Screen"; - "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; - "kwin"."Window to Previous Screen" = "none,Meta+Shift+Left,Move Window to Previous Screen"; - "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; - "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; - "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; - "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; - "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; - "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; - "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; - "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; - "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["Meta++,Meta++" "Meta+=,Zoom In"]; - "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = "none,,Media volume down"; - "mediacontrol"."mediavolumeup" = "none,,Media volume up"; - "mediacontrol"."nextmedia" = "Media Next"; - "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = "none,,Play media playback"; - "mediacontrol"."playpausemedia" = "Media Play"; - "mediacontrol"."previousmedia" = "Media Previous"; - "mediacontrol"."stopmedia" = "Media Stop"; - "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; - "org_kde_powerdevil"."Hibernate" = "Hibernate"; - "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; - "org_kde_powerdevil"."PowerDown" = "Power Down"; - "org_kde_powerdevil"."PowerOff" = "Power Off"; - "org_kde_powerdevil"."Sleep" = "Sleep"; - "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; - "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; - "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10"; - "plasmashell"."activate task manager entry 2" = "Meta+2"; - "plasmashell"."activate task manager entry 3" = "Meta+3"; - "plasmashell"."activate task manager entry 4" = "Meta+4"; - "plasmashell"."activate task manager entry 5" = "Meta+5"; - "plasmashell"."activate task manager entry 6" = "Meta+6"; - "plasmashell"."activate task manager entry 7" = "Meta+7"; - "plasmashell"."activate task manager entry 8" = "Meta+8"; - "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = "none,,Clear Clipboard History"; - "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; - "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = "none,,Next History Item"; - "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; - "plasmashell"."edit_clipboard" = []; - "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = "Meta+Tab,none,Walk through activities"; - "plasmashell"."previous activity" = "Meta+Shift+Tab,none,Walk through activities (Reverse)"; - "plasmashell"."repeat_action" = "Meta+Ctrl+R"; - "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = "none,,Show Barcode…"; - "plasmashell"."show-on-mouse-pos" = "Meta+V"; - "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; - "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; - "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; - "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; - "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; - "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/org.kde.spectacle.desktop"."RecordRegion" = []; - "services/org.kde.spectacle.desktop"."RecordScreen" = []; - "services/org.kde.spectacle.desktop"."RecordWindow" = []; - "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; - "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; - "services/org.kde.spectacle.desktop"."_launch" = "Print"; - "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; - "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; - "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; - "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; - "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; - "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; - }; - configFile = { - "baloofilerc"."General"."dbVersion" = 2; - "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; - "baloofilerc"."General"."exclude filters version" = 8; - "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; - "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; - "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; - "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; - "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; - "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; - "dolphinrc"."General"."RememberOpenedTabs" = false; - "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; - "dolphinrc"."IconsMode"."PreviewSize" = 80; - "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; - "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; - "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; - "dolphinrc"."PreviewSettings"."Plugins" = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail"; - "dolphinrc"."Search"."Location" = "Everywhere"; - "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; - "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; - "katerc"."General"."Days Meta Infos" = 30; - "katerc"."General"."Save Meta Infos" = true; - "katerc"."General"."Show Full Path in Title" = false; - "katerc"."General"."Show Menu Bar" = true; - "katerc"."General"."Show Status Bar" = true; - "katerc"."General"."Show Tab Bar" = true; - "katerc"."General"."Show Url Nav Bar" = true; - "katerc"."KTextEditor Document"."Allow End of Line Detection" = true; - "katerc"."KTextEditor Document"."Auto Detect Indent" = true; - "katerc"."KTextEditor Document"."Auto Reload If State Is In Version Control" = true; - "katerc"."KTextEditor Document"."Auto Save" = false; - "katerc"."KTextEditor Document"."Auto Save Interval" = 0; - "katerc"."KTextEditor Document"."Auto Save On Focus Out" = false; - "katerc"."KTextEditor Document"."BOM" = false; - "katerc"."KTextEditor Document"."Backup Local" = false; - "katerc"."KTextEditor Document"."Backup Prefix" = ""; - "katerc"."KTextEditor Document"."Backup Remote" = false; - "katerc"."KTextEditor Document"."Backup Suffix" = "~"; - "katerc"."KTextEditor Document"."Camel Cursor" = true; - "katerc"."KTextEditor Document"."Encoding" = "UTF-8"; - "katerc"."KTextEditor Document"."End of Line" = 0; - "katerc"."KTextEditor Document"."Indent On Backspace" = true; - "katerc"."KTextEditor Document"."Indent On Tab" = true; - "katerc"."KTextEditor Document"."Indent On Text Paste" = false; - "katerc"."KTextEditor Document"."Indentation Mode" = "normal"; - "katerc"."KTextEditor Document"."Indentation Width" = 4; - "katerc"."KTextEditor Document"."Keep Extra Spaces" = false; - "katerc"."KTextEditor Document"."Line Length Limit" = 10000; - "katerc"."KTextEditor Document"."Newline at End of File" = true; - "katerc"."KTextEditor Document"."On-The-Fly Spellcheck" = false; - "katerc"."KTextEditor Document"."Overwrite Mode" = false; - "katerc"."KTextEditor Document"."PageUp/PageDown Moves Cursor" = false; - "katerc"."KTextEditor Document"."Remove Spaces" = 1; - "katerc"."KTextEditor Document"."ReplaceTabsDyn" = true; - "katerc"."KTextEditor Document"."Show Spaces" = 0; - "katerc"."KTextEditor Document"."Show Tabs" = true; - "katerc"."KTextEditor Document"."Smart Home" = true; - "katerc"."KTextEditor Document"."Swap Directory" = ""; - "katerc"."KTextEditor Document"."Swap File Mode" = 1; - "katerc"."KTextEditor Document"."Swap Sync Interval" = 15; - "katerc"."KTextEditor Document"."Tab Handling" = 2; - "katerc"."KTextEditor Document"."Tab Width" = 4; - "katerc"."KTextEditor Document"."Trailing Marker Size" = 1; - "katerc"."KTextEditor Document"."Word Wrap" = false; - "katerc"."KTextEditor Document"."Word Wrap Column" = 80; - "katerc"."KTextEditor Editor"."Encoding Prober Type" = 1; - "katerc"."KTextEditor Editor"."Fallback Encoding" = "ISO 8859-15"; - "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false; - "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true; - "katerc"."KTextEditor Renderer"."Color Theme" = "Catppuccin Macchiato"; - "katerc"."KTextEditor Renderer"."Font" = "Hack,10,-1,7,50,0,0,0,0,0"; - "katerc"."KTextEditor Renderer"."Line Height Multiplier" = 1; - "katerc"."KTextEditor Renderer"."Show Indentation Lines" = false; - "katerc"."KTextEditor Renderer"."Show Whole Bracket Expression" = false; - "katerc"."KTextEditor Renderer"."Word Wrap Marker" = false; - "katerc"."KTextEditor View"."Allow Mark Menu" = true; - "katerc"."KTextEditor View"."Auto Brackets" = true; - "katerc"."KTextEditor View"."Auto Center Lines" = 0; - "katerc"."KTextEditor View"."Auto Completion" = true; - "katerc"."KTextEditor View"."Auto Completion Preselect First Entry" = true; - "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; - "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; - "katerc"."KTextEditor View"."Bracket Match Preview" = false; - "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}[]'\""; - "katerc"."KTextEditor View"."Default Mark Type" = 1; - "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; - "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; - "katerc"."KTextEditor View"."Dynamic Word Wrap At Static Marker" = false; - "katerc"."KTextEditor View"."Dynamic Word Wrap Indicators" = 1; - "katerc"."KTextEditor View"."Dynamic Wrap not at word boundaries" = false; - "katerc"."KTextEditor View"."Enable Tab completion" = false; - "katerc"."KTextEditor View"."Fold First Line" = false; - "katerc"."KTextEditor View"."Folding Bar" = true; - "katerc"."KTextEditor View"."Folding Preview" = true; - "katerc"."KTextEditor View"."Icon Bar" = false; - "katerc"."KTextEditor View"."Input Mode" = 0; - "katerc"."KTextEditor View"."Keyword Completion" = true; - "katerc"."KTextEditor View"."Line Modification" = true; - "katerc"."KTextEditor View"."Line Numbers" = true; - "katerc"."KTextEditor View"."Max Clipboard History Entries" = 20; - "katerc"."KTextEditor View"."Maximum Search History Size" = 100; - "katerc"."KTextEditor View"."Mouse Paste At Cursor Position" = false; - "katerc"."KTextEditor View"."Multiple Cursor Modifier" = 134217728; - "katerc"."KTextEditor View"."Persistent Selection" = false; - "katerc"."KTextEditor View"."Scroll Bar Marks" = false; - "katerc"."KTextEditor View"."Scroll Bar Mini Map All" = true; - "katerc"."KTextEditor View"."Scroll Bar Mini Map Width" = 60; - "katerc"."KTextEditor View"."Scroll Bar MiniMap" = true; - "katerc"."KTextEditor View"."Scroll Bar Preview" = true; - "katerc"."KTextEditor View"."Scroll Past End" = false; - "katerc"."KTextEditor View"."Search/Replace Flags" = 140; - "katerc"."KTextEditor View"."Shoe Line Ending Type in Statusbar" = false; - "katerc"."KTextEditor View"."Show Documentation With Completion" = true; - "katerc"."KTextEditor View"."Show File Encoding" = true; - "katerc"."KTextEditor View"."Show Focus Frame Around Editor" = true; - "katerc"."KTextEditor View"."Show Folding Icons On Hover Only" = true; - "katerc"."KTextEditor View"."Show Line Count" = false; - "katerc"."KTextEditor View"."Show Scrollbars" = 0; - "katerc"."KTextEditor View"."Show Statusbar Dictionary" = true; - "katerc"."KTextEditor View"."Show Statusbar Highlighting Mode" = true; - "katerc"."KTextEditor View"."Show Statusbar Input Mode" = true; - "katerc"."KTextEditor View"."Show Statusbar Line Column" = true; - "katerc"."KTextEditor View"."Show Statusbar Tab Settings" = true; - "katerc"."KTextEditor View"."Show Word Count" = false; - "katerc"."KTextEditor View"."Smart Copy Cut" = true; - "katerc"."KTextEditor View"."Statusbar Line Column Compact Mode" = true; - "katerc"."KTextEditor View"."Text Drag And Drop" = true; - "katerc"."KTextEditor View"."User Sets Of Chars To Enclose Selection" = ""; - "katerc"."KTextEditor View"."Vi Input Mode Steal Keys" = false; - "katerc"."KTextEditor View"."Vi Relative Line Numbers" = false; - "katerc"."KTextEditor View"."Word Completion" = true; - "katerc"."KTextEditor View"."Word Completion Minimal Word Length" = 3; - "katerc"."KTextEditor View"."Word Completion Remove Tail" = true; - "katerc"."KTextEditor::Search"."Search History" = "uuid"; - "katerc"."filetree"."editShade" = "93,62,114"; - "katerc"."filetree"."listMode" = false; - "katerc"."filetree"."shadingEnabled" = true; - "katerc"."filetree"."showCloseButton" = false; - "katerc"."filetree"."showFullPathOnRoots" = false; - "katerc"."filetree"."showToolbar" = true; - "katerc"."filetree"."sortRole" = 0; - "katerc"."filetree"."viewShade" = "101,69,143"; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; - "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; - "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; - "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; - "kcminputrc"."Libinput/1739/30383/CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; - "kcminputrc"."Mouse"."cursorSize" = 32; - "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; - "kded5rc"."Module-browserintegrationreminder"."autoload" = false; - "kded5rc"."Module-device_automounter"."autoload" = false; - "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; - "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "960,540"; - "kdeglobals"."General"."AccentColor" = "184,117,220"; - "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; - "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; - "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; - "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; - "kdeglobals"."KDE"."ShowDeleteCommand" = false; - "kdeglobals"."KDE"."SingleClick" = false; - "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; - "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; - "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = false; - "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; - "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; - "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; - "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; - "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; - "kdeglobals"."KFileDialog Settings"."Show Preview" = false; - "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; - "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; - "kdeglobals"."KFileDialog Settings"."Sort by" = "Date"; - "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; - "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; - "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; - "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 138; - "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; - "kdeglobals"."KShortcutsDialog Settings"."Dialog Size" = "600,480"; - "kdeglobals"."PreviewSettings"."MaximumRemoteSize" = 0; - "kdeglobals"."WM"."activeBackground" = "49,54,59"; - "kdeglobals"."WM"."activeBlend" = "252,252,252"; - "kdeglobals"."WM"."activeForeground" = "252,252,252"; - "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; - "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; - "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; - "khotkeysrc"."Data"."DataCount" = 3; - "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; - "khotkeysrc"."Data_1"."DataCount" = 1; - "khotkeysrc"."Data_1"."Enabled" = true; - "khotkeysrc"."Data_1"."Name" = "KMenuEdit"; - "khotkeysrc"."Data_1"."SystemGroup" = 1; - "khotkeysrc"."Data_1"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1"."Comment" = "Comment"; - "khotkeysrc"."Data_1_1"."Enabled" = true; - "khotkeysrc"."Data_1_1"."Name" = "Search"; - "khotkeysrc"."Data_1_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_1_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_1_1Actions0"."CommandURL" = "http://google.com"; - "khotkeysrc"."Data_1_1Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_1_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_1_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_1_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_1_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_1_1Triggers0"."Key" = ""; - "khotkeysrc"."Data_1_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_1_1Triggers0"."Uuid" = "{d03619b6-9b3c-48cc-9d9c-a2aadb485550}"; - "khotkeysrc"."Data_2"."Comment" = "This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)"; - "khotkeysrc"."Data_2"."DataCount" = 8; - "khotkeysrc"."Data_2"."Enabled" = false; - "khotkeysrc"."Data_2"."ImportId" = "kde32b1"; - "khotkeysrc"."Data_2"."Name" = "Examples"; - "khotkeysrc"."Data_2"."SystemGroup" = 0; - "khotkeysrc"."Data_2"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1"."Comment" = "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple."; - "khotkeysrc"."Data_2_1"."Enabled" = false; - "khotkeysrc"."Data_2_1"."Name" = "Activate KSIRC Window"; - "khotkeysrc"."Data_2_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_1Actions0"."Type" = "ACTIVATE_WINDOW"; - "khotkeysrc"."Data_2_1Actions0Window"."Comment" = "KSIRC window"; - "khotkeysrc"."Data_2_1Actions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Class" = "ksirc"; - "khotkeysrc"."Data_2_1Actions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_1Actions0Window0"."Comment" = "KSIRC"; - "khotkeysrc"."Data_2_1Actions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_1Actions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_1Actions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_1Actions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_1Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_1Triggers0"."Key" = "Ctrl+Alt+I"; - "khotkeysrc"."Data_2_1Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_1Triggers0"."Uuid" = "{edd7522b-b1b3-4273-838a-358ee66356b2}"; - "khotkeysrc"."Data_2_2"."Comment" = "After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you typed it. This is especially useful if you have call to frequently type a word (for instance, 'unsigned'). Every keypress in the input is separated by a colon ':'. Note that the keypresses literally mean keypresses, so you have to write what you would press on the keyboard. In the table below, the left column shows the input and the right column shows what to type.\n\n\"enter\" (i.e. new line) Enter or Return\na (i.e. small a) A\nA (i.e. capital a) Shift+A\n: (colon) Shift+;\n' ' (space) Space"; - "khotkeysrc"."Data_2_2"."Enabled" = false; - "khotkeysrc"."Data_2_2"."Name" = "Type 'Hello'"; - "khotkeysrc"."Data_2_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_2Actions0"."Input" = "Shift+H:E:L:L:O\n"; - "khotkeysrc"."Data_2_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_2Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_2Triggers0"."Key" = "Ctrl+Alt+H"; - "khotkeysrc"."Data_2_2Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_2Triggers0"."Uuid" = "{fd8182a4-81c3-4540-8e28-f7e5e72585c5}"; - "khotkeysrc"."Data_2_3"."Comment" = "This action runs Konsole, after pressing Ctrl+Alt+T."; - "khotkeysrc"."Data_2_3"."Enabled" = false; - "khotkeysrc"."Data_2_3"."Name" = "Run Konsole"; - "khotkeysrc"."Data_2_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_3Actions0"."CommandURL" = "konsole"; - "khotkeysrc"."Data_2_3Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_3Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_3Triggers0"."Key" = "Ctrl+Alt+T"; - "khotkeysrc"."Data_2_3Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_3Triggers0"."Uuid" = "{cdaec3a6-214e-4cc5-a877-c1df7064993e}"; - "khotkeysrc"."Data_2_4"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nQt Designer uses Ctrl+F4 for closing windows. In KDE, however, Ctrl+F4 is the shortcut for going to virtual desktop 4, so this shortcut does not work in Qt Designer. Further, Qt Designer does not use KDE's standard Ctrl+W for closing the window.\n\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, the effect of Ctrl+W is unchanged.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title."; - "khotkeysrc"."Data_2_4"."Enabled" = false; - "khotkeysrc"."Data_2_4"."Name" = "Remap Ctrl+W to Ctrl+F4 in Qt Designer"; - "khotkeysrc"."Data_2_4"."Type" = "GENERIC_ACTION_DATA"; - "khotkeysrc"."Data_2_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_4Actions0"."Input" = "Ctrl+F4"; - "khotkeysrc"."Data_2_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_4Conditions0Window"."Comment" = "Qt Designer"; - "khotkeysrc"."Data_2_4Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_4Conditions0Window0"."Class" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."ClassType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Comment" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_4Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_4Conditions0Window0"."Title" = "Qt Designer by Trolltech"; - "khotkeysrc"."Data_2_4Conditions0Window0"."TitleType" = 2; - "khotkeysrc"."Data_2_4Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_4Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_4Triggers"."Comment" = ""; - "khotkeysrc"."Data_2_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_4Triggers0"."Key" = "Ctrl+W"; - "khotkeysrc"."Data_2_4Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_4Triggers0"."Uuid" = "{be4d63e1-1548-4c32-bdae-670b212885a5}"; - "khotkeysrc"."Data_2_5"."Comment" = "By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the minicli. You can use any kind of D-Bus call, just like using the command line 'qdbus' tool."; - "khotkeysrc"."Data_2_5"."Enabled" = false; - "khotkeysrc"."Data_2_5"."Name" = "Perform D-Bus call 'qdbus org.kde.krunner /App display'"; - "khotkeysrc"."Data_2_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_5Actions0"."Arguments" = ""; - "khotkeysrc"."Data_2_5Actions0"."Call" = "popupExecuteCommand"; - "khotkeysrc"."Data_2_5Actions0"."RemoteApp" = "org.kde.krunner"; - "khotkeysrc"."Data_2_5Actions0"."RemoteObj" = "/App"; - "khotkeysrc"."Data_2_5Actions0"."Type" = "DBUS"; - "khotkeysrc"."Data_2_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_5Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_5Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_5Triggers0"."Key" = "Ctrl+Alt+W"; - "khotkeysrc"."Data_2_5Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_5Triggers0"."Uuid" = "{04f1cf14-2324-43a4-854e-867e289623db}"; - "khotkeysrc"."Data_2_6"."Comment" = "Read the comment on the \"Type 'Hello'\" action first.\n\nJust like the \"Type 'Hello'\" action, this one simulates keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if, for instance, it is on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."; - "khotkeysrc"."Data_2_6"."Enabled" = false; - "khotkeysrc"."Data_2_6"."Name" = "Next in XMMS"; - "khotkeysrc"."Data_2_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_6Actions0"."DestinationWindow" = 1; - "khotkeysrc"."Data_2_6Actions0"."Input" = "B"; - "khotkeysrc"."Data_2_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."Comment" = "XMMS window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow"."WindowsCount" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Class" = "XMMS_Player"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."ClassType" = 1; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Comment" = "XMMS Player window"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Role" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."RoleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Title" = ""; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."TitleType" = 0; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_6Actions0DestinationWindow0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_6Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_6Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_6Triggers0"."Key" = "Ctrl+Alt+B"; - "khotkeysrc"."Data_2_6Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_6Triggers0"."Uuid" = "{c6793be6-3845-4af5-97c0-3d09f9118e6b}"; - "khotkeysrc"."Data_2_7"."Comment" = "Konqueror in KDE3.1 has tabs, and now you can also have gestures.\n\nJust press the middle mouse button and start drawing one of the gestures, and after you are finished, release the mouse button. If you only need to paste the selection, it still works, just click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are the following gestures available:\nmove right and back left - Forward (Alt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle counterclockwise - Reload (F5)\n\nThe gesture shapes can be entered by performing them in the configuration dialog. You can also look at your numeric pad to help you: gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it is possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse movement more than once. For instance, 45654 or 74123 are simple to perform, but 1236987 may be already quite difficult.\n\nThe conditions for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror')."; - "khotkeysrc"."Data_2_7"."DataCount" = 4; - "khotkeysrc"."Data_2_7"."Enabled" = false; - "khotkeysrc"."Data_2_7"."Name" = "Konqi Gestures"; - "khotkeysrc"."Data_2_7"."SystemGroup" = 0; - "khotkeysrc"."Data_2_7"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_2_7Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_2_7Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_2_7Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Class" = "konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."ClassType" = 1; - "khotkeysrc"."Data_2_7Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_2_7Conditions0Window0"."Role" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Title" = ""; - "khotkeysrc"."Data_2_7Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_2_7Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_2_7Conditions0Window0"."WindowTypes" = 33; - "khotkeysrc"."Data_2_7_1"."Comment" = ""; - "khotkeysrc"."Data_2_7_1"."Enabled" = false; - "khotkeysrc"."Data_2_7_1"."Name" = "Back"; - "khotkeysrc"."Data_2_7_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_2_7_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_1Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_1Triggers0"."GesturePointData" = "0,0.0625,1,1,0.5,0.0625,0.0625,1,0.875,0.5,0.125,0.0625,1,0.75,0.5,0.1875,0.0625,1,0.625,0.5,0.25,0.0625,1,0.5,0.5,0.3125,0.0625,1,0.375,0.5,0.375,0.0625,1,0.25,0.5,0.4375,0.0625,1,0.125,0.5,0.5,0.0625,0,0,0.5,0.5625,0.0625,0,0.125,0.5,0.625,0.0625,0,0.25,0.5,0.6875,0.0625,0,0.375,0.5,0.75,0.0625,0,0.5,0.5,0.8125,0.0625,0,0.625,0.5,0.875,0.0625,0,0.75,0.5,0.9375,0.0625,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers1"."GesturePointData" = "0,0.0833333,1,0.5,0.5,0.0833333,0.0833333,1,0.375,0.5,0.166667,0.0833333,1,0.25,0.5,0.25,0.0833333,1,0.125,0.5,0.333333,0.0833333,0,0,0.5,0.416667,0.0833333,0,0.125,0.5,0.5,0.0833333,0,0.25,0.5,0.583333,0.0833333,0,0.375,0.5,0.666667,0.0833333,0,0.5,0.5,0.75,0.0833333,0,0.625,0.5,0.833333,0.0833333,0,0.75,0.5,0.916667,0.0833333,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_2_7_1Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_1Triggers2"."GesturePointData" = "0,0.0833333,1,1,0.5,0.0833333,0.0833333,1,0.875,0.5,0.166667,0.0833333,1,0.75,0.5,0.25,0.0833333,1,0.625,0.5,0.333333,0.0833333,1,0.5,0.5,0.416667,0.0833333,1,0.375,0.5,0.5,0.0833333,1,0.25,0.5,0.583333,0.0833333,1,0.125,0.5,0.666667,0.0833333,0,0,0.5,0.75,0.0833333,0,0.125,0.5,0.833333,0.0833333,0,0.25,0.5,0.916667,0.0833333,0,0.375,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_1Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2"."Comment" = ""; - "khotkeysrc"."Data_2_7_2"."Enabled" = false; - "khotkeysrc"."Data_2_7_2"."Name" = "Forward"; - "khotkeysrc"."Data_2_7_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_2Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_2_7_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_2Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_2Triggers0"."GesturePointData" = "0,0.0625,0,0,0.5,0.0625,0.0625,0,0.125,0.5,0.125,0.0625,0,0.25,0.5,0.1875,0.0625,0,0.375,0.5,0.25,0.0625,0,0.5,0.5,0.3125,0.0625,0,0.625,0.5,0.375,0.0625,0,0.75,0.5,0.4375,0.0625,0,0.875,0.5,0.5,0.0625,1,1,0.5,0.5625,0.0625,1,0.875,0.5,0.625,0.0625,1,0.75,0.5,0.6875,0.0625,1,0.625,0.5,0.75,0.0625,1,0.5,0.5,0.8125,0.0625,1,0.375,0.5,0.875,0.0625,1,0.25,0.5,0.9375,0.0625,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers1"."GesturePointData" = "0,0.0833333,0,0.5,0.5,0.0833333,0.0833333,0,0.625,0.5,0.166667,0.0833333,0,0.75,0.5,0.25,0.0833333,0,0.875,0.5,0.333333,0.0833333,1,1,0.5,0.416667,0.0833333,1,0.875,0.5,0.5,0.0833333,1,0.75,0.5,0.583333,0.0833333,1,0.625,0.5,0.666667,0.0833333,1,0.5,0.5,0.75,0.0833333,1,0.375,0.5,0.833333,0.0833333,1,0.25,0.5,0.916667,0.0833333,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_2_7_2Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_2Triggers2"."GesturePointData" = "0,0.0833333,0,0,0.5,0.0833333,0.0833333,0,0.125,0.5,0.166667,0.0833333,0,0.25,0.5,0.25,0.0833333,0,0.375,0.5,0.333333,0.0833333,0,0.5,0.5,0.416667,0.0833333,0,0.625,0.5,0.5,0.0833333,0,0.75,0.5,0.583333,0.0833333,0,0.875,0.5,0.666667,0.0833333,1,1,0.5,0.75,0.0833333,1,0.875,0.5,0.833333,0.0833333,1,0.75,0.5,0.916667,0.0833333,1,0.625,0.5,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_2Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3"."Comment" = ""; - "khotkeysrc"."Data_2_7_3"."Enabled" = false; - "khotkeysrc"."Data_2_7_3"."Name" = "Up"; - "khotkeysrc"."Data_2_7_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_3Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_2_7_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_3Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_3Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers1"."GesturePointData" = "0,0.0833333,-0.5,0.5,1,0.0833333,0.0833333,-0.5,0.5,0.875,0.166667,0.0833333,-0.5,0.5,0.75,0.25,0.0833333,-0.5,0.5,0.625,0.333333,0.0833333,-0.5,0.5,0.5,0.416667,0.0833333,-0.5,0.5,0.375,0.5,0.0833333,-0.5,0.5,0.25,0.583333,0.0833333,-0.5,0.5,0.125,0.666667,0.0833333,0.5,0.5,0,0.75,0.0833333,0.5,0.5,0.125,0.833333,0.0833333,0.5,0.5,0.25,0.916667,0.0833333,0.5,0.5,0.375,1,0,0,0.5,0.5"; - "khotkeysrc"."Data_2_7_3Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_3Triggers2"."GesturePointData" = "0,0.0833333,-0.5,0.5,0.5,0.0833333,0.0833333,-0.5,0.5,0.375,0.166667,0.0833333,-0.5,0.5,0.25,0.25,0.0833333,-0.5,0.5,0.125,0.333333,0.0833333,0.5,0.5,0,0.416667,0.0833333,0.5,0.5,0.125,0.5,0.0833333,0.5,0.5,0.25,0.583333,0.0833333,0.5,0.5,0.375,0.666667,0.0833333,0.5,0.5,0.5,0.75,0.0833333,0.5,0.5,0.625,0.833333,0.0833333,0.5,0.5,0.75,0.916667,0.0833333,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_3Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4"."Comment" = ""; - "khotkeysrc"."Data_2_7_4"."Enabled" = false; - "khotkeysrc"."Data_2_7_4"."Name" = "Reload"; - "khotkeysrc"."Data_2_7_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_7_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_7_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_2_7_4Actions0"."Input" = "F5"; - "khotkeysrc"."Data_2_7_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_2_7_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_7_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_7_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_2_7_4Triggers"."TriggersCount" = 3; - "khotkeysrc"."Data_2_7_4Triggers0"."GesturePointData" = "0,0.03125,0,0,1,0.03125,0.03125,0,0.125,1,0.0625,0.03125,0,0.25,1,0.09375,0.03125,0,0.375,1,0.125,0.03125,0,0.5,1,0.15625,0.03125,0,0.625,1,0.1875,0.03125,0,0.75,1,0.21875,0.03125,0,0.875,1,0.25,0.03125,-0.5,1,1,0.28125,0.03125,-0.5,1,0.875,0.3125,0.03125,-0.5,1,0.75,0.34375,0.03125,-0.5,1,0.625,0.375,0.03125,-0.5,1,0.5,0.40625,0.03125,-0.5,1,0.375,0.4375,0.03125,-0.5,1,0.25,0.46875,0.03125,-0.5,1,0.125,0.5,0.03125,1,1,0,0.53125,0.03125,1,0.875,0,0.5625,0.03125,1,0.75,0,0.59375,0.03125,1,0.625,0,0.625,0.03125,1,0.5,0,0.65625,0.03125,1,0.375,0,0.6875,0.03125,1,0.25,0,0.71875,0.03125,1,0.125,0,0.75,0.03125,0.5,0,0,0.78125,0.03125,0.5,0,0.125,0.8125,0.03125,0.5,0,0.25,0.84375,0.03125,0.5,0,0.375,0.875,0.03125,0.5,0,0.5,0.90625,0.03125,0.5,0,0.625,0.9375,0.03125,0.5,0,0.75,0.96875,0.03125,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers1"."GesturePointData" = "0,0.0277778,0,0,1,0.0277778,0.0277778,0,0.125,1,0.0555556,0.0277778,0,0.25,1,0.0833333,0.0277778,0,0.375,1,0.111111,0.0277778,0,0.5,1,0.138889,0.0277778,0,0.625,1,0.166667,0.0277778,0,0.75,1,0.194444,0.0277778,0,0.875,1,0.222222,0.0277778,-0.5,1,1,0.25,0.0277778,-0.5,1,0.875,0.277778,0.0277778,-0.5,1,0.75,0.305556,0.0277778,-0.5,1,0.625,0.333333,0.0277778,-0.5,1,0.5,0.361111,0.0277778,-0.5,1,0.375,0.388889,0.0277778,-0.5,1,0.25,0.416667,0.0277778,-0.5,1,0.125,0.444444,0.0277778,1,1,0,0.472222,0.0277778,1,0.875,0,0.5,0.0277778,1,0.75,0,0.527778,0.0277778,1,0.625,0,0.555556,0.0277778,1,0.5,0,0.583333,0.0277778,1,0.375,0,0.611111,0.0277778,1,0.25,0,0.638889,0.0277778,1,0.125,0,0.666667,0.0277778,0.5,0,0,0.694444,0.0277778,0.5,0,0.125,0.722222,0.0277778,0.5,0,0.25,0.75,0.0277778,0.5,0,0.375,0.777778,0.0277778,0.5,0,0.5,0.805556,0.0277778,0.5,0,0.625,0.833333,0.0277778,0.5,0,0.75,0.861111,0.0277778,0.5,0,0.875,0.888889,0.0277778,0,0,1,0.916667,0.0277778,0,0.125,1,0.944444,0.0277778,0,0.25,1,0.972222,0.0277778,0,0.375,1,1,0,0,0.5,1"; - "khotkeysrc"."Data_2_7_4Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_7_4Triggers2"."GesturePointData" = "0,0.0277778,0.5,0,0.5,0.0277778,0.0277778,0.5,0,0.625,0.0555556,0.0277778,0.5,0,0.75,0.0833333,0.0277778,0.5,0,0.875,0.111111,0.0277778,0,0,1,0.138889,0.0277778,0,0.125,1,0.166667,0.0277778,0,0.25,1,0.194444,0.0277778,0,0.375,1,0.222222,0.0277778,0,0.5,1,0.25,0.0277778,0,0.625,1,0.277778,0.0277778,0,0.75,1,0.305556,0.0277778,0,0.875,1,0.333333,0.0277778,-0.5,1,1,0.361111,0.0277778,-0.5,1,0.875,0.388889,0.0277778,-0.5,1,0.75,0.416667,0.0277778,-0.5,1,0.625,0.444444,0.0277778,-0.5,1,0.5,0.472222,0.0277778,-0.5,1,0.375,0.5,0.0277778,-0.5,1,0.25,0.527778,0.0277778,-0.5,1,0.125,0.555556,0.0277778,1,1,0,0.583333,0.0277778,1,0.875,0,0.611111,0.0277778,1,0.75,0,0.638889,0.0277778,1,0.625,0,0.666667,0.0277778,1,0.5,0,0.694444,0.0277778,1,0.375,0,0.722222,0.0277778,1,0.25,0,0.75,0.0277778,1,0.125,0,0.777778,0.0277778,0.5,0,0,0.805556,0.0277778,0.5,0,0.125,0.833333,0.0277778,0.5,0,0.25,0.861111,0.0277778,0.5,0,0.375,0.888889,0.0277778,0.5,0,0.5,0.916667,0.0277778,0.5,0,0.625,0.944444,0.0277778,0.5,0,0.75,0.972222,0.0277778,0.5,0,0.875,1,0,0,0,1"; - "khotkeysrc"."Data_2_7_4Triggers2"."Type" = "GESTURE"; - "khotkeysrc"."Data_2_8"."Comment" = "After pressing Win+E (Tux+E) a WWW browser will be launched, and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2)."; - "khotkeysrc"."Data_2_8"."Enabled" = false; - "khotkeysrc"."Data_2_8"."Name" = "Go to KDE Website"; - "khotkeysrc"."Data_2_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_2_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_2_8Actions0"."CommandURL" = "http://www.kde.org"; - "khotkeysrc"."Data_2_8Actions0"."Type" = "COMMAND_URL"; - "khotkeysrc"."Data_2_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_2_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_2_8Triggers"."Comment" = "Simple_action"; - "khotkeysrc"."Data_2_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_2_8Triggers0"."Key" = "Meta+E"; - "khotkeysrc"."Data_2_8Triggers0"."Type" = "SHORTCUT"; - "khotkeysrc"."Data_2_8Triggers0"."Uuid" = "{af8f36c3-5682-4153-869f-fe61c53dd3c3}"; - "khotkeysrc"."Data_3"."Comment" = "Basic Konqueror gestures."; - "khotkeysrc"."Data_3"."DataCount" = 14; - "khotkeysrc"."Data_3"."Enabled" = true; - "khotkeysrc"."Data_3"."ImportId" = "konqueror_gestures_kde321"; - "khotkeysrc"."Data_3"."Name" = "Konqueror Gestures"; - "khotkeysrc"."Data_3"."SystemGroup" = 0; - "khotkeysrc"."Data_3"."Type" = "ACTION_DATA_GROUP"; - "khotkeysrc"."Data_3Conditions"."Comment" = "Konqueror window"; - "khotkeysrc"."Data_3Conditions"."ConditionsCount" = 1; - "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; - "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors"; - "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; - "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; - "khotkeysrc"."Data_3Conditions0Window0"."RoleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Title" = "file:/ - Konqueror"; - "khotkeysrc"."Data_3Conditions0Window0"."TitleType" = 0; - "khotkeysrc"."Data_3Conditions0Window0"."Type" = "SIMPLE"; - "khotkeysrc"."Data_3Conditions0Window0"."WindowTypes" = 1; - "khotkeysrc"."Data_3_1"."Comment" = "Press, move left, release."; - "khotkeysrc"."Data_3_1"."Enabled" = true; - "khotkeysrc"."Data_3_1"."Name" = "Back"; - "khotkeysrc"."Data_3_1"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10"."Comment" = "Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default."; - "khotkeysrc"."Data_3_10"."Enabled" = false; - "khotkeysrc"."Data_3_10"."Name" = "Stop Loading"; - "khotkeysrc"."Data_3_10"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_10Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_10Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_10Actions0"."Input" = "Escape\n"; - "khotkeysrc"."Data_3_10Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_10Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_10Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_10Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_10Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_10Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_10Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_11"."Comment" = "Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release."; - "khotkeysrc"."Data_3_11"."Enabled" = true; - "khotkeysrc"."Data_3_11"."Name" = "Up"; - "khotkeysrc"."Data_3_11"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_11Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_11Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_11Actions0"."Input" = "Alt+Up"; - "khotkeysrc"."Data_3_11Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_11Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_11Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_11Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_11Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_11Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,1,1,0.5,0.3125,0.0625,1,0.875,0.5,0.375,0.0625,1,0.75,0.5,0.4375,0.0625,1,0.625,0.5,0.5,0.0625,1,0.5,0.5,0.5625,0.0625,1,0.375,0.5,0.625,0.0625,1,0.25,0.5,0.6875,0.0625,1,0.125,0.5,0.75,0.0625,-0.5,0,0.5,0.8125,0.0625,-0.5,0,0.375,0.875,0.0625,-0.5,0,0.25,0.9375,0.0625,-0.5,0,0.125,1,0,0,0,0"; - "khotkeysrc"."Data_3_11Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_12"."Comment" = "Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with \"Activate Previous Tab\", and as such is disabled by default."; - "khotkeysrc"."Data_3_12"."Enabled" = false; - "khotkeysrc"."Data_3_12"."Name" = "Up #2"; - "khotkeysrc"."Data_3_12"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_12Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_12Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_12Actions0"."Input" = "Alt+Up\n"; - "khotkeysrc"."Data_3_12Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_12Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_12Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_12Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_12Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_12Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_12Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_13"."Comment" = "Press, move up, move right, release."; - "khotkeysrc"."Data_3_13"."Enabled" = true; - "khotkeysrc"."Data_3_13"."Name" = "Activate Next Tab"; - "khotkeysrc"."Data_3_13"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_13Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_13Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_13Actions0"."Input" = "Ctrl+.\n"; - "khotkeysrc"."Data_3_13Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_13Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_13Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_13Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_13Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_13Triggers0"."GesturePointData" = "0,0.0625,-0.5,0,1,0.0625,0.0625,-0.5,0,0.875,0.125,0.0625,-0.5,0,0.75,0.1875,0.0625,-0.5,0,0.625,0.25,0.0625,-0.5,0,0.5,0.3125,0.0625,-0.5,0,0.375,0.375,0.0625,-0.5,0,0.25,0.4375,0.0625,-0.5,0,0.125,0.5,0.0625,0,0,0,0.5625,0.0625,0,0.125,0,0.625,0.0625,0,0.25,0,0.6875,0.0625,0,0.375,0,0.75,0.0625,0,0.5,0,0.8125,0.0625,0,0.625,0,0.875,0.0625,0,0.75,0,0.9375,0.0625,0,0.875,0,1,0,0,1,0"; - "khotkeysrc"."Data_3_13Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_14"."Comment" = "Press, move up, move left, release."; - "khotkeysrc"."Data_3_14"."Enabled" = true; - "khotkeysrc"."Data_3_14"."Name" = "Activate Previous Tab"; - "khotkeysrc"."Data_3_14"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_14Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_14Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_14Actions0"."Input" = "Ctrl+,"; - "khotkeysrc"."Data_3_14Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_14Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_14Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_14Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_14Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_14Triggers0"."GesturePointData" = "0,0.0625,-0.5,1,1,0.0625,0.0625,-0.5,1,0.875,0.125,0.0625,-0.5,1,0.75,0.1875,0.0625,-0.5,1,0.625,0.25,0.0625,-0.5,1,0.5,0.3125,0.0625,-0.5,1,0.375,0.375,0.0625,-0.5,1,0.25,0.4375,0.0625,-0.5,1,0.125,0.5,0.0625,1,1,0,0.5625,0.0625,1,0.875,0,0.625,0.0625,1,0.75,0,0.6875,0.0625,1,0.625,0,0.75,0.0625,1,0.5,0,0.8125,0.0625,1,0.375,0,0.875,0.0625,1,0.25,0,0.9375,0.0625,1,0.125,0,1,0,0,0,0"; - "khotkeysrc"."Data_3_14Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_1Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_1Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_1Actions0"."Input" = "Alt+Left"; - "khotkeysrc"."Data_3_1Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_1Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_1Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_1Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_1Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_1Triggers0"."GesturePointData" = "0,0.125,1,1,0.5,0.125,0.125,1,0.875,0.5,0.25,0.125,1,0.75,0.5,0.375,0.125,1,0.625,0.5,0.5,0.125,1,0.5,0.5,0.625,0.125,1,0.375,0.5,0.75,0.125,1,0.25,0.5,0.875,0.125,1,0.125,0.5,1,0,0,0,0.5"; - "khotkeysrc"."Data_3_1Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_2"."Comment" = "Press, move down, move up, move down, release."; - "khotkeysrc"."Data_3_2"."Enabled" = true; - "khotkeysrc"."Data_3_2"."Name" = "Duplicate Tab"; - "khotkeysrc"."Data_3_2"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_2Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_2Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_2Actions0"."Input" = "Ctrl+Shift+D\n"; - "khotkeysrc"."Data_3_2Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_2Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_2Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_2Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_2Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_2Triggers0"."GesturePointData" = "0,0.0416667,0.5,0.5,0,0.0416667,0.0416667,0.5,0.5,0.125,0.0833333,0.0416667,0.5,0.5,0.25,0.125,0.0416667,0.5,0.5,0.375,0.166667,0.0416667,0.5,0.5,0.5,0.208333,0.0416667,0.5,0.5,0.625,0.25,0.0416667,0.5,0.5,0.75,0.291667,0.0416667,0.5,0.5,0.875,0.333333,0.0416667,-0.5,0.5,1,0.375,0.0416667,-0.5,0.5,0.875,0.416667,0.0416667,-0.5,0.5,0.75,0.458333,0.0416667,-0.5,0.5,0.625,0.5,0.0416667,-0.5,0.5,0.5,0.541667,0.0416667,-0.5,0.5,0.375,0.583333,0.0416667,-0.5,0.5,0.25,0.625,0.0416667,-0.5,0.5,0.125,0.666667,0.0416667,0.5,0.5,0,0.708333,0.0416667,0.5,0.5,0.125,0.75,0.0416667,0.5,0.5,0.25,0.791667,0.0416667,0.5,0.5,0.375,0.833333,0.0416667,0.5,0.5,0.5,0.875,0.0416667,0.5,0.5,0.625,0.916667,0.0416667,0.5,0.5,0.75,0.958333,0.0416667,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_2Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_3"."Comment" = "Press, move down, move up, release."; - "khotkeysrc"."Data_3_3"."Enabled" = true; - "khotkeysrc"."Data_3_3"."Name" = "Duplicate Window"; - "khotkeysrc"."Data_3_3"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_3Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_3Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_3Actions0"."Input" = "Ctrl+D\n"; - "khotkeysrc"."Data_3_3Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_3Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_3Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_3Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_3Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_3Triggers0"."GesturePointData" = "0,0.0625,0.5,0.5,0,0.0625,0.0625,0.5,0.5,0.125,0.125,0.0625,0.5,0.5,0.25,0.1875,0.0625,0.5,0.5,0.375,0.25,0.0625,0.5,0.5,0.5,0.3125,0.0625,0.5,0.5,0.625,0.375,0.0625,0.5,0.5,0.75,0.4375,0.0625,0.5,0.5,0.875,0.5,0.0625,-0.5,0.5,1,0.5625,0.0625,-0.5,0.5,0.875,0.625,0.0625,-0.5,0.5,0.75,0.6875,0.0625,-0.5,0.5,0.625,0.75,0.0625,-0.5,0.5,0.5,0.8125,0.0625,-0.5,0.5,0.375,0.875,0.0625,-0.5,0.5,0.25,0.9375,0.0625,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_3Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_4"."Comment" = "Press, move right, release."; - "khotkeysrc"."Data_3_4"."Enabled" = true; - "khotkeysrc"."Data_3_4"."Name" = "Forward"; - "khotkeysrc"."Data_3_4"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_4Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_4Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_4Actions0"."Input" = "Alt+Right"; - "khotkeysrc"."Data_3_4Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_4Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_4Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_4Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_4Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_4Triggers0"."GesturePointData" = "0,0.125,0,0,0.5,0.125,0.125,0,0.125,0.5,0.25,0.125,0,0.25,0.5,0.375,0.125,0,0.375,0.5,0.5,0.125,0,0.5,0.5,0.625,0.125,0,0.625,0.5,0.75,0.125,0,0.75,0.5,0.875,0.125,0,0.875,0.5,1,0,0,1,0.5"; - "khotkeysrc"."Data_3_4Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5"."Comment" = "Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)"; - "khotkeysrc"."Data_3_5"."Enabled" = true; - "khotkeysrc"."Data_3_5"."Name" = "Home"; - "khotkeysrc"."Data_3_5"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_5Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_5Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_5Actions0"."Input" = "Alt+Home\n"; - "khotkeysrc"."Data_3_5Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_5Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_5Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_5Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_5Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_5Triggers0"."GesturePointData" = "0,0.0461748,0.5,0,0,0.0461748,0.0461748,0.5,0,0.125,0.0923495,0.0461748,0.5,0,0.25,0.138524,0.0461748,0.5,0,0.375,0.184699,0.0461748,0.5,0,0.5,0.230874,0.0461748,0.5,0,0.625,0.277049,0.0461748,0.5,0,0.75,0.323223,0.0461748,0.5,0,0.875,0.369398,0.065301,-0.25,0,1,0.434699,0.065301,-0.25,0.125,0.875,0.5,0.065301,-0.25,0.25,0.75,0.565301,0.065301,-0.25,0.375,0.625,0.630602,0.0461748,0,0.5,0.5,0.676777,0.0461748,0,0.625,0.5,0.722951,0.0461748,0,0.75,0.5,0.769126,0.0461748,0,0.875,0.5,0.815301,0.0461748,0.5,1,0.5,0.861476,0.0461748,0.5,1,0.625,0.90765,0.0461748,0.5,1,0.75,0.953825,0.0461748,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_5Triggers1"."GesturePointData" = "0,0.0416667,0.5,0,0,0.0416667,0.0416667,0.5,0,0.125,0.0833333,0.0416667,0.5,0,0.25,0.125,0.0416667,0.5,0,0.375,0.166667,0.0416667,0.5,0,0.5,0.208333,0.0416667,0.5,0,0.625,0.25,0.0416667,0.5,0,0.75,0.291667,0.0416667,0.5,0,0.875,0.333333,0.0416667,-0.5,0,1,0.375,0.0416667,-0.5,0,0.875,0.416667,0.0416667,-0.5,0,0.75,0.458333,0.0416667,-0.5,0,0.625,0.5,0.0416667,0,0,0.5,0.541667,0.0416667,0,0.125,0.5,0.583333,0.0416667,0,0.25,0.5,0.625,0.0416667,0,0.375,0.5,0.666667,0.0416667,0,0.5,0.5,0.708333,0.0416667,0,0.625,0.5,0.75,0.0416667,0,0.75,0.5,0.791667,0.0416667,0,0.875,0.5,0.833333,0.0416667,0.5,1,0.5,0.875,0.0416667,0.5,1,0.625,0.916667,0.0416667,0.5,1,0.75,0.958333,0.0416667,0.5,1,0.875,1,0,0,1,1"; - "khotkeysrc"."Data_3_5Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6"."Comment" = "Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release."; - "khotkeysrc"."Data_3_6"."Enabled" = true; - "khotkeysrc"."Data_3_6"."Name" = "Close Tab"; - "khotkeysrc"."Data_3_6"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_6Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_6Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_6Actions0"."Input" = "Ctrl+W\n"; - "khotkeysrc"."Data_3_6Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_6Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_6Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_6Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_6Triggers"."TriggersCount" = 2; - "khotkeysrc"."Data_3_6Triggers0"."GesturePointData" = "0,0.0625,0,0,0,0.0625,0.0625,0,0.125,0,0.125,0.0625,0,0.25,0,0.1875,0.0625,0,0.375,0,0.25,0.0625,0.5,0.5,0,0.3125,0.0625,0.5,0.5,0.125,0.375,0.0625,0.5,0.5,0.25,0.4375,0.0625,0.5,0.5,0.375,0.5,0.0625,0.5,0.5,0.5,0.5625,0.0625,0.5,0.5,0.625,0.625,0.0625,0.5,0.5,0.75,0.6875,0.0625,0.5,0.5,0.875,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_6Triggers1"."GesturePointData" = "0,0.0625,0.5,0,0,0.0625,0.0625,0.5,0,0.125,0.125,0.0625,0.5,0,0.25,0.1875,0.0625,0.5,0,0.375,0.25,0.0625,0.5,0,0.5,0.3125,0.0625,0.5,0,0.625,0.375,0.0625,0.5,0,0.75,0.4375,0.0625,0.5,0,0.875,0.5,0.0625,0,0,1,0.5625,0.0625,0,0.125,1,0.625,0.0625,0,0.25,1,0.6875,0.0625,0,0.375,1,0.75,0.0625,0,0.5,1,0.8125,0.0625,0,0.625,1,0.875,0.0625,0,0.75,1,0.9375,0.0625,0,0.875,1,1,0,0,1,1"; - "khotkeysrc"."Data_3_6Triggers1"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_7"."Comment" = "Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default."; - "khotkeysrc"."Data_3_7"."Enabled" = true; - "khotkeysrc"."Data_3_7"."Name" = "New Tab"; - "khotkeysrc"."Data_3_7"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_7Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_7Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_7Actions0"."Input" = "Ctrl+Shift+N"; - "khotkeysrc"."Data_3_7Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_7Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_7Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_7Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_7Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_7Triggers0"."GesturePointData" = "0,0.125,-0.5,0.5,1,0.125,0.125,-0.5,0.5,0.875,0.25,0.125,-0.5,0.5,0.75,0.375,0.125,-0.5,0.5,0.625,0.5,0.125,-0.5,0.5,0.5,0.625,0.125,-0.5,0.5,0.375,0.75,0.125,-0.5,0.5,0.25,0.875,0.125,-0.5,0.5,0.125,1,0,0,0.5,0"; - "khotkeysrc"."Data_3_7Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_8"."Comment" = "Press, move down, release."; - "khotkeysrc"."Data_3_8"."Enabled" = true; - "khotkeysrc"."Data_3_8"."Name" = "New Window"; - "khotkeysrc"."Data_3_8"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_8Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_8Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_8Actions0"."Input" = "Ctrl+N\n"; - "khotkeysrc"."Data_3_8Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_8Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_8Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_8Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_8Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_8Triggers0"."GesturePointData" = "0,0.125,0.5,0.5,0,0.125,0.125,0.5,0.5,0.125,0.25,0.125,0.5,0.5,0.25,0.375,0.125,0.5,0.5,0.375,0.5,0.125,0.5,0.5,0.5,0.625,0.125,0.5,0.5,0.625,0.75,0.125,0.5,0.5,0.75,0.875,0.125,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_8Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."Data_3_9"."Comment" = "Press, move up, move down, release."; - "khotkeysrc"."Data_3_9"."Enabled" = true; - "khotkeysrc"."Data_3_9"."Name" = "Reload"; - "khotkeysrc"."Data_3_9"."Type" = "SIMPLE_ACTION_DATA"; - "khotkeysrc"."Data_3_9Actions"."ActionsCount" = 1; - "khotkeysrc"."Data_3_9Actions0"."DestinationWindow" = 2; - "khotkeysrc"."Data_3_9Actions0"."Input" = "F5"; - "khotkeysrc"."Data_3_9Actions0"."Type" = "KEYBOARD_INPUT"; - "khotkeysrc"."Data_3_9Conditions"."Comment" = ""; - "khotkeysrc"."Data_3_9Conditions"."ConditionsCount" = 0; - "khotkeysrc"."Data_3_9Triggers"."Comment" = "Gesture_triggers"; - "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1; - "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; - "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; - "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions" = ""; - "khotkeysrc"."General"."BrowserApplication" = ""; - "khotkeysrc"."Gestures"."Disabled" = true; - "khotkeysrc"."Gestures"."MouseButton" = 2; - "khotkeysrc"."Gestures"."Timeout" = 300; - "khotkeysrc"."GesturesExclude"."Comment" = ""; - "khotkeysrc"."GesturesExclude"."WindowsCount" = 0; - "khotkeysrc"."KDE"."AnimationDurationFactor" = ""; - "khotkeysrc"."KDE"."ShowDeleteCommand" = ""; - "khotkeysrc"."KDE"."SingleClick" = ""; - "khotkeysrc"."KDE"."widgetStyle" = ""; - "khotkeysrc"."KFileDialog Settings"."Allow Expansion" = ""; - "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension" = ""; - "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation" = ""; - "khotkeysrc"."KFileDialog Settings"."Decoration position" = ""; - "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode" = ""; - "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Bookmarks" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Full Path" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Inline Previews" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Preview" = ""; - "khotkeysrc"."KFileDialog Settings"."Show Speedbar" = ""; - "khotkeysrc"."KFileDialog Settings"."Show hidden files" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort by" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort directories first" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort hidden files last" = ""; - "khotkeysrc"."KFileDialog Settings"."Sort reversed" = ""; - "khotkeysrc"."KFileDialog Settings"."Speedbar Width" = ""; - "khotkeysrc"."KFileDialog Settings"."View Style" = ""; - "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size" = ""; - "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; - "khotkeysrc"."Main"."Disabled" = false; - "khotkeysrc"."PreviewSettings"."MaximumRemoteSize" = ""; - "khotkeysrc"."Voice"."Shortcut" = ""; - "khotkeysrc"."WM"."activeBackground" = ""; - "khotkeysrc"."WM"."activeBlend" = ""; - "khotkeysrc"."WM"."activeForeground" = ""; - "khotkeysrc"."WM"."inactiveBackground" = ""; - "khotkeysrc"."WM"."inactiveBlend" = ""; - "khotkeysrc"."WM"."inactiveForeground" = ""; - "kiorc"."Confirmations"."ConfirmDelete" = true; - "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; - "kiorc"."Confirmations"."ConfirmTrash" = false; - "kiorc"."Executable scripts"."behaviourOnLaunch" = "alwaysAsk"; - "krunnerrc"."Plugins"."baloosearchEnabled" = false; - "krunnerrc"."Plugins"."locationsEnabled" = true; - "krunnerrc"."Plugins"."placesEnabled" = true; - "krunnerrc"."Plugins"."recentdocumentsEnabled" = true; - "kservicemenurc"."Show"."compressfileitemaction" = true; - "kservicemenurc"."Show"."extractfileitemaction" = true; - "kservicemenurc"."Show"."forgetfileitemaction" = true; - "kservicemenurc"."Show"."installFont" = true; - "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin" = true; - "kservicemenurc"."Show"."kdeconnectfileitemaction" = true; - "kservicemenurc"."Show"."kio-admin" = true; - "kservicemenurc"."Show"."mountisoaction" = true; - "kservicemenurc"."Show"."nextclouddolphinactionplugin" = true; - "kservicemenurc"."Show"."runInKonsole" = true; - "kservicemenurc"."Show"."setAsWallpaper" = true; - "kservicemenurc"."Show"."slideshowfileitemaction" = true; - "kservicemenurc"."Show"."tagsfileitemaction" = true; - "ksmserverrc"."General"."loginMode" = "restoreSavedSession"; - "kwalletrc"."Wallet"."First Use" = false; - "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; - "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; - "kwinrc"."Desktops"."Id_3" = "78f9d3d6-d0dd-4fd5-89fc-0157ada3dff5"; - "kwinrc"."Desktops"."Id_4" = "a0a9ef6d-975c-4379-8ca1-265e1938d8d1"; - "kwinrc"."Desktops"."Number" = 4; - "kwinrc"."Desktops"."Rows" = 2; - "kwinrc"."Effect-diminactive"."Strength" = 15; - "kwinrc"."Effect-magiclamp"."AnimationDuration" = 20; - "kwinrc"."NightColor"."Active" = true; - "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; - "kwinrc"."NightColor"."LongitudeFixed" = 5.44; - "kwinrc"."NightColor"."Mode" = "Location"; - "kwinrc"."NightColor"."NightTemperature" = 1400; - "kwinrc"."Plugins"."diminactiveEnabled" = true; - "kwinrc"."Plugins"."dimscreenEnabled" = true; - "kwinrc"."Plugins"."wobblywindowsEnabled" = true; - "kwinrc"."Tiling"."padding" = 0; - "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"layoutDirection\":\"vertical\",\"tiles\":x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d}x5d,\"width\":1}x5d}"; - "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; - "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}"; - "kwinrc"."Xwayland"."Scale" = 1; - "kxkbrc"."Layout"."Options" = "compose:caps"; - "kxkbrc"."Layout"."ResetOldOptions" = true; - "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; - "plasma-localerc"."Formats"."LC_ADDRESS" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MEASUREMENT" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_MONETARY" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NAME" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_NUMERIC" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; - "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; - "plasmanotifyrc"."Applications/firefox"."Seen" = true; - "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; - "plasmarc"."Wallpapers"."usersWallpapers" = ""; - "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; - "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; - "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; - }; - dataFile = { - "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; - "kate/anonymous.katesession"."Document 0"."Bookmarks" = ""; - "kate/anonymous.katesession"."Document 0"."Encoding" = "UTF-8"; - "kate/anonymous.katesession"."Document 0"."Highlighting" = "None"; - "kate/anonymous.katesession"."Document 0"."Highlighting Set By User" = false; - "kate/anonymous.katesession"."Document 0"."Indentation Mode" = "normal"; - "kate/anonymous.katesession"."Document 0"."Mode" = "Normal"; - "kate/anonymous.katesession"."Document 0"."Mode Set By User" = false; - "kate/anonymous.katesession"."Document 0"."URL" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; - "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."externaltoolsplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."formatplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katebacktracebrowserplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katebuildplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katecloseexceptplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katecolorpickerplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katectagsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katefilebrowserplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katefiletreeplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."kategdbplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."kategitblameplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katekonsoleplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."kateprojectplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."katereplicodeplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katesearchplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."katesnippetsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katesqlplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katesymbolviewerplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katexmlcheckplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katexmltoolsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."keyboardmacrosplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."ktexteditorpreviewplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."latexcompletionplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."lspclientplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."openlinkplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; - "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; - "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; - "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 929; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 929; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 1874; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 1634; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,927,0"; - "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; - "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 1874; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Active View" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":[]}"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; - "kate/anonymous.katesession"."Open Documents"."Count" = 1; - "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; - "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentExcludeFilter" = "-1"; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentFilter" = "-1"; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExcludeFilters" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExpandSearchResults" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Filters" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."FollowSymLink" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."HiddenFiles" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."MatchCase" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Place" = 1; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Recursive" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Replaces" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Search" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeAllProjects" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeCurrentFile" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeFolder" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeOpenFiles" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeProject" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiles" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiless" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."UseRegExp" = false; - }; - }; -} From aba983b5f0548661e8b6ccc8f953e206a0939309 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:30:54 +0200 Subject: [PATCH 086/395] Set panels for kde plasma --- .../package-configs/plasma-desktop.nix | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 1ccfab8..9783942 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -1,6 +1,52 @@ { programs.plasma = { enable = true; + desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; + kwin.nightLight = { + enable = true; + latitude = "52.32"; + longitude = "5.44"; + mode = "location"; + night = 1400; + }; + panels = { + top = { + alignment = "left"; + floating = true; + height = 38; + location = "top"; + screen = "all"; + widgets = [ + "org.kde.plasma.appmenu" + "org.kde.plasma.panelspacer" + "org.kde.milou" + "org.kde.plasma.panelspacer" + "org.kde.plasma.colorpicker" + "org.kde.plasma.systemtray" + "org.kde.plasma.digitalclock" + "org.kde.plasma.lock_logout" + ]; + }; + bottom = { + alignment = "left"; + floating = true; + height = 44; + hiding = "autohide"; + maxLength = 1000; + minLength = 1000; + location = "bottom"; + screen = "all"; + widgets = [ + "org.kde.plasma.kickoff" + "org.kde.plasma.pager" + "org.kde.plasma.panelspacer" + "org.kde.plasma.icontasks" + "org.kde.plasma.panelspacer" + "org.kde.plasma.minimizeall" + ]; + }; + }; + shortcuts = { "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; From 4d29395bd17a383153420c069f441358bf04d648 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:32:53 +0200 Subject: [PATCH 087/395] kwin.nightlight.location for latitude and longitude --- home-manager/desktop/package-configs/plasma-desktop.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 9783942..527809b 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -4,8 +4,10 @@ desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; kwin.nightLight = { enable = true; - latitude = "52.32"; - longitude = "5.44"; + location = { + latitude = "52.32"; + longitude = "5.44"; + }; mode = "location"; night = 1400; }; From 7c74d8b07b16e28292fcc256872cda5790754e7e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:33:33 +0200 Subject: [PATCH 088/395] temperature.night instead of night as well --- home-manager/desktop/package-configs/plasma-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 527809b..5682fa0 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -9,7 +9,7 @@ longitude = "5.44"; }; mode = "location"; - night = 1400; + temperature.night = 1400; }; panels = { top = { From e921bd0132c65fae8a859a20beb13d8faec0206c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:39:38 +0200 Subject: [PATCH 089/395] Fix the list format --- .../package-configs/plasma-desktop.nix | 78 ++++++++++--------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 5682fa0..9cfe89e 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -11,43 +11,47 @@ mode = "location"; temperature.night = 1400; }; - panels = { - top = { - alignment = "left"; - floating = true; - height = 38; - location = "top"; - screen = "all"; - widgets = [ - "org.kde.plasma.appmenu" - "org.kde.plasma.panelspacer" - "org.kde.milou" - "org.kde.plasma.panelspacer" - "org.kde.plasma.colorpicker" - "org.kde.plasma.systemtray" - "org.kde.plasma.digitalclock" - "org.kde.plasma.lock_logout" - ]; - }; - bottom = { - alignment = "left"; - floating = true; - height = 44; - hiding = "autohide"; - maxLength = 1000; - minLength = 1000; - location = "bottom"; - screen = "all"; - widgets = [ - "org.kde.plasma.kickoff" - "org.kde.plasma.pager" - "org.kde.plasma.panelspacer" - "org.kde.plasma.icontasks" - "org.kde.plasma.panelspacer" - "org.kde.plasma.minimizeall" - ]; - }; - }; + panels = [ + { + top = { + alignment = "left"; + floating = true; + height = 38; + location = "top"; + screen = "all"; + widgets = [ + "org.kde.plasma.appmenu" + "org.kde.plasma.panelspacer" + "org.kde.milou" + "org.kde.plasma.panelspacer" + "org.kde.plasma.colorpicker" + "org.kde.plasma.systemtray" + "org.kde.plasma.digitalclock" + "org.kde.plasma.lock_logout" + ]; + }; + } + { + bottom = { + alignment = "left"; + floating = true; + height = 44; + hiding = "autohide"; + maxLength = 1000; + minLength = 1000; + location = "bottom"; + screen = "all"; + widgets = [ + "org.kde.plasma.kickoff" + "org.kde.plasma.pager" + "org.kde.plasma.panelspacer" + "org.kde.plasma.icontasks" + "org.kde.plasma.panelspacer" + "org.kde.plasma.minimizeall" + ]; + }; + } + ]; shortcuts = { "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; From 86106bdaed70c57e0e6e394eb4ecfaf5c8d88645 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:41:08 +0200 Subject: [PATCH 090/395] We already had night light configured oops --- home-manager/desktop/package-configs/plasma-desktop.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 9cfe89e..f785cb0 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -2,15 +2,6 @@ programs.plasma = { enable = true; desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; - kwin.nightLight = { - enable = true; - location = { - latitude = "52.32"; - longitude = "5.44"; - }; - mode = "location"; - temperature.night = 1400; - }; panels = [ { top = { From 90d86534cf98e18ba30954ccfa62f4dde56aa75c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 17:43:15 +0200 Subject: [PATCH 091/395] No names for panels --- .../package-configs/plasma-desktop.nix | 66 +++++++++---------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index f785cb0..e94d279 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -4,43 +4,39 @@ desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; panels = [ { - top = { - alignment = "left"; - floating = true; - height = 38; - location = "top"; - screen = "all"; - widgets = [ - "org.kde.plasma.appmenu" - "org.kde.plasma.panelspacer" - "org.kde.milou" - "org.kde.plasma.panelspacer" - "org.kde.plasma.colorpicker" - "org.kde.plasma.systemtray" - "org.kde.plasma.digitalclock" - "org.kde.plasma.lock_logout" - ]; - }; + alignment = "left"; + floating = true; + height = 38; + location = "top"; + screen = "all"; + widgets = [ + "org.kde.plasma.appmenu" + "org.kde.plasma.panelspacer" + "org.kde.milou" + "org.kde.plasma.panelspacer" + "org.kde.plasma.colorpicker" + "org.kde.plasma.systemtray" + "org.kde.plasma.digitalclock" + "org.kde.plasma.lock_logout" + ]; } { - bottom = { - alignment = "left"; - floating = true; - height = 44; - hiding = "autohide"; - maxLength = 1000; - minLength = 1000; - location = "bottom"; - screen = "all"; - widgets = [ - "org.kde.plasma.kickoff" - "org.kde.plasma.pager" - "org.kde.plasma.panelspacer" - "org.kde.plasma.icontasks" - "org.kde.plasma.panelspacer" - "org.kde.plasma.minimizeall" - ]; - }; + alignment = "left"; + floating = true; + height = 44; + hiding = "autohide"; + maxLength = 1000; + minLength = 1000; + location = "bottom"; + screen = "all"; + widgets = [ + "org.kde.plasma.kickoff" + "org.kde.plasma.pager" + "org.kde.plasma.panelspacer" + "org.kde.plasma.icontasks" + "org.kde.plasma.panelspacer" + "org.kde.plasma.minimizeall" + ]; } ]; From 7a9293810ce6f7d73a9d9cbcfdfdef47b7122f8f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 18:11:51 +0200 Subject: [PATCH 092/395] Set up the panels fully including application launcher and activities --- .../package-configs/plasma-desktop.nix | 68 ++++++++++++++++++- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index e94d279..c89665b 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -15,8 +15,50 @@ "org.kde.milou" "org.kde.plasma.panelspacer" "org.kde.plasma.colorpicker" - "org.kde.plasma.systemtray" - "org.kde.plasma.digitalclock" + { + systemTray.items = { + # We explicitly show bluetooth and battery + shown = [ + "org.kde.plasma.volume" + "org.kde.plasma.bluetooth" + "org.kde.plasma.brightness" + "org.kde.plasma.devicenotifier" + "org.kde.kscreen" + "org.kde.kdeconnect" + "org.kde.plasma.networkmanagement" + "org.kde.plasma.battery" + "org.kde.plasma.clipboard" + "org.kde.plasma.mediacontroller" + "org.kde.plasma.notifications" + "org.kde.plasma.weather" + ]; + # And explicitly hide networkmanagement and volume + hidden = [ + "Xwayland Video Bridge_pipewireToXProxy" + "org.kde.plasma.devicenotifier" + "org.kde.kscreen" + "org.kde.plasma.printmanager" + "chrome_status_icon_1" + "proton-vpn-app" + "Nitrokey App" + "qBittorrent" + "vlc" + "steam" + ]; + }; + } + { + digitalClock = { + calendar.firstDayOfWeek = "monday"; + time.format = "24h"; + date = { + enable = true; + format = "isoDate"; + position = "belowTime"; + }; + timeZone = ["Europe/Amsterdam"]; + }; + } "org.kde.plasma.lock_logout" ]; } @@ -33,7 +75,27 @@ "org.kde.plasma.kickoff" "org.kde.plasma.pager" "org.kde.plasma.panelspacer" - "org.kde.plasma.icontasks" + { + name = "org.kde.plasma.icontasks"; + config = { + General = { + launchers = [ + "applications:firefox.desktop" + "applications:systemsettings.desktop" + "applications:org.kde.dolphin.desktop" + "applications:signal-desktop.desktop" + "applications:webcord.desktop" + "applications:steam.desktop" + "applications:noisetorch.desktop" + "applications:org.kde.plasma-systemmonitor.desktop" + "applications:org.codeberg.dnkl.foot.desktop" + "applications:nitrokey-app.desktop" + "applications:codium.desktop" + "applications:freetube.desktop" + ]; + }; + }; + } "org.kde.plasma.panelspacer" "org.kde.plasma.minimizeall" ]; From aa9e9bfa3ab9613db9297137c85c750d26566ccf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 18:14:25 +0200 Subject: [PATCH 093/395] timezone.selected not just timezone --- home-manager/desktop/package-configs/plasma-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index c89665b..2a34492 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -56,7 +56,7 @@ format = "isoDate"; position = "belowTime"; }; - timeZone = ["Europe/Amsterdam"]; + timeZone.selected = ["Europe/Amsterdam"]; }; } "org.kde.plasma.lock_logout" From 38bd6a6e49d278b60efe089e365c74a3a31ac532 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 19:10:05 +0200 Subject: [PATCH 094/395] Center the bottom panel and make it a bit bigger --- home-manager/desktop/package-configs/plasma-desktop.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 2a34492..21fe5b9 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -63,12 +63,12 @@ ]; } { - alignment = "left"; + alignment = "center"; floating = true; height = 44; hiding = "autohide"; - maxLength = 1000; - minLength = 1000; + maxLength = 1920; + minLength = 1200; location = "bottom"; screen = "all"; widgets = [ From d380c932bb7a73c78de729d0eea88004cbcd99f4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 19:17:26 +0200 Subject: [PATCH 095/395] remove the pager --- home-manager/desktop/package-configs/plasma-desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 21fe5b9..8757568 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -73,7 +73,6 @@ screen = "all"; widgets = [ "org.kde.plasma.kickoff" - "org.kde.plasma.pager" "org.kde.plasma.panelspacer" { name = "org.kde.plasma.icontasks"; From 21abdc4c1f06bfb92d4e9d02b79cde6ed39c0653 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 19:26:11 +0200 Subject: [PATCH 096/395] Added the command to open krunner that I use by default --- .../package-configs/plasma-desktop.nix | 303 +++++++++--------- 1 file changed, 159 insertions(+), 144 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 8757568..28c5057 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -108,7 +108,7 @@ "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; @@ -116,28 +116,28 @@ "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; + "kmix"."mic_mute" = ["Microphone Mute" "" "Meta+Volume Mute\\, ,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; + "ksmserver"."Halt Without Confirmation" = []; + "ksmserver"."Lock Session" = ["Meta+L" "" "Screensaver\\, ,Meta+L" "Screensaver,Lock Session"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; - "ksmserver"."LogOut" = "none,,Log Out"; - "ksmserver"."Reboot" = "none,,Reboot"; - "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; - "ksmserver"."Shut Down" = "none,,Shut Down"; + "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."LogOut" = []; + "ksmserver"."Reboot" = []; + "ksmserver"."Reboot Without Confirmation" = []; + "ksmserver"."Shut Down" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cube" = "Meta+C,none"; + "kwin"."Cube" = "Meta+C\\, ,none"; "kwin"."Cycle Overview" = []; "kwin"."Cycle Overview Opposite" = []; - "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; + "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "" "Launch (C)\\, ,Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; + "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; @@ -147,10 +147,10 @@ "kwin"."MoveZoomRight" = []; "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; + "kwin"."Setup Window Shortcut" = []; "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8,none"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12,none"; + "kwin"."ShowDesktopGrid" = "Meta+F8\\, ,none"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12\\, ,none"; "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; @@ -160,136 +160,136 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; - "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; - "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; - "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; - "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; - "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; - "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; - "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; - "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; - "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; + "kwin"."Switch to Desktop 10" = []; + "kwin"."Switch to Desktop 11" = []; + "kwin"."Switch to Desktop 12" = []; + "kwin"."Switch to Desktop 13" = []; + "kwin"."Switch to Desktop 14" = []; + "kwin"."Switch to Desktop 15" = []; + "kwin"."Switch to Desktop 16" = []; + "kwin"."Switch to Desktop 17" = []; + "kwin"."Switch to Desktop 18" = []; + "kwin"."Switch to Desktop 19" = []; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; + "kwin"."Switch to Desktop 20" = []; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; - "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; - "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; - "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; - "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; - "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; - "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; - "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; - "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; - "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; - "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; - "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; - "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; - "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; - "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; - "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; - "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; - "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; - "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; - "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; - "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; + "kwin"."Switch to Desktop 5" = []; + "kwin"."Switch to Desktop 6" = []; + "kwin"."Switch to Desktop 7" = []; + "kwin"."Switch to Desktop 8" = []; + "kwin"."Switch to Desktop 9" = []; + "kwin"."Switch to Next Desktop" = []; + "kwin"."Switch to Next Screen" = []; + "kwin"."Switch to Previous Desktop" = []; + "kwin"."Switch to Previous Screen" = []; + "kwin"."Switch to Screen 0" = []; + "kwin"."Switch to Screen 1" = []; + "kwin"."Switch to Screen 2" = []; + "kwin"."Switch to Screen 3" = []; + "kwin"."Switch to Screen 4" = []; + "kwin"."Switch to Screen 5" = []; + "kwin"."Switch to Screen 6" = []; + "kwin"."Switch to Screen 7" = []; + "kwin"."Switch to Screen Above" = []; + "kwin"."Switch to Screen Below" = []; + "kwin"."Switch to Screen to the Left" = []; + "kwin"."Switch to Screen to the Right" = []; "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; + "kwin"."Toggle Window Raise/Lower" = []; "kwin"."Walk Through Desktop List" = []; "kwin"."Walk Through Desktop List (Reverse)" = []; "kwin"."Walk Through Desktops" = []; "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab,Alt+Shift+Tab,Walk Through Windows (Reverse)"; - "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; - "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; - "kwin"."Walk Through Windows of Current Application" = "none,Alt+`,Walk Through Windows of Current Application"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab\\, Alt+Shift+Tab\\, ,Alt+Shift+Tab,Walk Through Windows (Reverse)"; + "kwin"."Walk Through Windows Alternative" = []; + "kwin"."Walk Through Windows Alternative (Reverse)" = []; + "kwin"."Walk Through Windows of Current Application" = "\\, Alt+`\\, ,Alt+`,Walk Through Windows of Current Application"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; - "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; - "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; + "kwin"."Walk Through Windows of Current Application Alternative" = []; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; + "kwin"."Window Above Other Windows" = []; + "kwin"."Window Below Other Windows" = []; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; - "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; - "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; - "kwin"."Window Lower" = "none,,Lower Window"; + "kwin"."Window Fullscreen" = []; + "kwin"."Window Grow Horizontal" = []; + "kwin"."Window Grow Vertical" = []; + "kwin"."Window Lower" = []; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; - "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; + "kwin"."Window Maximize Horizontal" = []; + "kwin"."Window Maximize Vertical" = []; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = "none,,Move Window"; - "kwin"."Window Move Center" = "none,,Move Window to the Center"; - "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; - "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; + "kwin"."Window Move" = []; + "kwin"."Window Move Center" = []; + "kwin"."Window No Border" = []; + "kwin"."Window On All Desktops" = []; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; - "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; - "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; - "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; + "kwin"."Window One Screen Down" = []; + "kwin"."Window One Screen Up" = []; + "kwin"."Window One Screen to the Left" = []; + "kwin"."Window One Screen to the Right" = []; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = "none,,Move Window Down"; - "kwin"."Window Pack Left" = "none,,Move Window Left"; - "kwin"."Window Pack Right" = "none,,Move Window Right"; - "kwin"."Window Pack Up" = "none,,Move Window Up"; + "kwin"."Window Pack Down" = []; + "kwin"."Window Pack Left" = []; + "kwin"."Window Pack Right" = []; + "kwin"."Window Pack Up" = []; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; - "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; + "kwin"."Window Quick Tile Bottom Left" = []; + "kwin"."Window Quick Tile Bottom Right" = []; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; - "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; - "kwin"."Window Raise" = "none,,Raise Window"; - "kwin"."Window Resize" = "none,,Resize Window"; - "kwin"."Window Shade" = "none,,Shade Window"; - "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; - "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; - "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; - "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; - "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; - "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; - "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; - "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; - "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; - "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; - "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; - "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; - "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; - "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; - "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; - "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; - "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; - "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; - "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; - "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; - "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; - "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; - "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; - "kwin"."Window to Next Screen" = "none,Meta+Shift+Right,Move Window to Next Screen"; - "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; - "kwin"."Window to Previous Screen" = "none,Meta+Shift+Left,Move Window to Previous Screen"; - "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; - "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; - "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; - "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; - "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; - "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; - "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; - "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; - "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["Meta++,Meta++" "Meta+=,Zoom In"]; + "kwin"."Window Quick Tile Top Left" = []; + "kwin"."Window Quick Tile Top Right" = []; + "kwin"."Window Raise" = []; + "kwin"."Window Resize" = []; + "kwin"."Window Shade" = []; + "kwin"."Window Shrink Horizontal" = []; + "kwin"."Window Shrink Vertical" = []; + "kwin"."Window to Desktop 1" = []; + "kwin"."Window to Desktop 10" = []; + "kwin"."Window to Desktop 11" = []; + "kwin"."Window to Desktop 12" = []; + "kwin"."Window to Desktop 13" = []; + "kwin"."Window to Desktop 14" = []; + "kwin"."Window to Desktop 15" = []; + "kwin"."Window to Desktop 16" = []; + "kwin"."Window to Desktop 17" = []; + "kwin"."Window to Desktop 18" = []; + "kwin"."Window to Desktop 19" = []; + "kwin"."Window to Desktop 2" = []; + "kwin"."Window to Desktop 20" = []; + "kwin"."Window to Desktop 3" = []; + "kwin"."Window to Desktop 4" = []; + "kwin"."Window to Desktop 5" = []; + "kwin"."Window to Desktop 6" = []; + "kwin"."Window to Desktop 7" = []; + "kwin"."Window to Desktop 8" = []; + "kwin"."Window to Desktop 9" = []; + "kwin"."Window to Next Desktop" = []; + "kwin"."Window to Next Screen" = "\\, Meta+Shift+Right\\, ,Meta+Shift+Right,Move Window to Next Screen"; + "kwin"."Window to Previous Desktop" = []; + "kwin"."Window to Previous Screen" = "\\, Meta+Shift+Left\\, ,Meta+Shift+Left,Move Window to Previous Screen"; + "kwin"."Window to Screen 0" = []; + "kwin"."Window to Screen 1" = []; + "kwin"."Window to Screen 2" = []; + "kwin"."Window to Screen 3" = []; + "kwin"."Window to Screen 4" = []; + "kwin"."Window to Screen 5" = []; + "kwin"."Window to Screen 6" = []; + "kwin"."Window to Screen 7" = []; + "kwin"."view_actual_size" = ",Meta+0,Zoom to Actual Size"; + "kwin"."view_zoom_in" = ["Meta++\\, Meta++" "Meta+=\\, Zoom In,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = "none,,Media volume down"; - "mediacontrol"."mediavolumeup" = "none,,Media volume up"; + "mediacontrol"."mediavolumedown" = "\\, ,,Media volume down"; + "mediacontrol"."mediavolumeup" = []; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = "none,,Play media playback"; + "mediacontrol"."playmedia" = []; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; @@ -305,10 +305,10 @@ "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; - "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "" "Meta+B\\, ,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta" "" "Alt+F1\\, ,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10"; + "plasmashell"."activate task manager entry 10" = "\\, Meta+0\\, ,Meta+0,Activate Task Manager Entry 10"; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -317,23 +317,24 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = "none,,Clear Clipboard History"; + "plasmashell"."clear-history" = []; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = "none,,Next History Item"; - "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; + "plasmashell"."cycleNextAction" = []; + "plasmashell"."cyclePrevAction" = []; "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = "Meta+Tab,none,Walk through activities"; - "plasmashell"."previous activity" = "Meta+Shift+Tab,none,Walk through activities (Reverse)"; + "plasmashell"."next activity" = ",none,Walk through activities"; + "plasmashell"."previous activity" = ",none,Walk through activities (Reverse)"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = "none,,Show Barcode…"; + "plasmashell"."show-barcode" = []; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; - "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; - "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; + "plasmashell"."switch to next activity" = []; + "plasmashell"."switch to previous activity" = []; + "plasmashell"."toggle do not disturb" = []; + "services/org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Ctrl+Shift+Space" "Search"]; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; @@ -346,22 +347,22 @@ "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { @@ -373,6 +374,7 @@ "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; + "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; @@ -447,7 +449,7 @@ "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; "katerc"."KTextEditor View"."Bracket Match Preview" = false; - "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}[]'\""; + "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}\x5b\x5d'\""; "katerc"."KTextEditor View"."Default Mark Type" = 1; "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; @@ -522,6 +524,9 @@ "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; + "kdeglobals"."General"."XftAntialias" = true; + "kdeglobals"."General"."XftHintStyle" = "hintslight"; + "kdeglobals"."General"."XftSubPixel" = "rgb"; "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; "kdeglobals"."KDE"."ShowDeleteCommand" = false; "kdeglobals"."KDE"."SingleClick" = false; @@ -1116,8 +1121,9 @@ "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"layoutDirection\":\"vertical\",\"tiles\":x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d}x5d,\"width\":1}x5d}"; + "kwinrc"."Tiling/250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.4989583333333353},{\"width\":0.5010416666666646}]}"; "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; + "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}"; "kwinrc"."Xwayland"."Scale" = 1; @@ -1134,6 +1140,7 @@ "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; "plasmanotifyrc"."Applications/firefox"."Seen" = true; "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; + "plasmanotifyrc"."Applications/webcord"."Seen" = true; "plasmarc"."Wallpapers"."usersWallpapers" = ""; "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; @@ -1181,6 +1188,7 @@ "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; @@ -1232,6 +1240,7 @@ "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; + "kate/anonymous.katesession"."MainWindow0 Settings"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; @@ -1242,11 +1251,17 @@ "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorColumn" = 33; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorLine" = 350; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."Dynamic Word Wrap" = true; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."JumpList" = ""; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."TextFolding" = "{\"checksum\":\"74be57c9991161c81bdaf706a15a5e808c32f8ba\",\"ranges\":[]}"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."ViMarks" = ""; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":[]}"; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":\x5b\x5d}"; "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; "kate/anonymous.katesession"."Open Documents"."Count" = 1; "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; From a401d6300cfd23bbe031c5ae8f59e9baccdd884a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 30 Sep 2024 19:26:52 +0200 Subject: [PATCH 097/395] Removed the error from the autogenerated code --- home-manager/desktop/package-configs/plasma-desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 28c5057..8c3af51 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -373,7 +373,6 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; - "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; From 431e922ee4c76675f08543f309fd36a389c12e9d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:22:16 +0200 Subject: [PATCH 098/395] Add cinny desktop to desktop home manager and pin it on the taskbar --- home-manager/desktop/default.nix | 1 + home-manager/desktop/package-configs/plasma-desktop.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 8349ffb..0d7f74d 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -88,6 +88,7 @@ # Chat applications: signal-desktop webcord-vencord + cinny-desktop # Gaming: prismlauncher diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 8c3af51..a9d61e3 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -84,6 +84,7 @@ "applications:org.kde.dolphin.desktop" "applications:signal-desktop.desktop" "applications:webcord.desktop" + "applications:cinny.desktop" "applications:steam.desktop" "applications:noisetorch.desktop" "applications:org.kde.plasma-systemmonitor.desktop" From 358c76b152cfc44ed0459bbdaa25551a0fbbc34b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:25:13 +0200 Subject: [PATCH 099/395] Allow cinny even though libolm is insecure --- nixos/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1138ad2..f7a4aa3 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -17,6 +17,7 @@ #TODO: remove this when unneeded for freetube nixpkgs.config.permittedInsecurePackages = [ "python3.12-youtube-dl-2021.12.17" + "cinny-4.2.1" ]; nix = { package = pkgs.lix; From d4ead53badd406e6e9f6c3e0f1252534190280fb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:27:17 +0200 Subject: [PATCH 100/395] Let's try and do that in home manager instead --- home-manager/desktop/default.nix | 1 + nixos/shared/default.nix | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 0d7f74d..958e3b0 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -22,6 +22,7 @@ ./package-configs/foot ]; nixpkgs = { + config.permittedInsecurePackages = ["cinny-4.2.1"]; # You can add overlays here overlays = [ # You can also add overlays exported from other flakes: diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index f7a4aa3..7964b40 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -16,8 +16,7 @@ #TODO: remove this when unneeded for freetube nixpkgs.config.permittedInsecurePackages = [ - "python3.12-youtube-dl-2021.12.17" - "cinny-4.2.1" + #"python3.12-youtube-dl-2021.12.17" ]; nix = { package = pkgs.lix; From 10da4d52a61efb04e921276d3943ed21f24e0976 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:28:22 +0200 Subject: [PATCH 101/395] also allow cinny-unwrapped for the same reason --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 958e3b0..7a0bf0a 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -22,7 +22,7 @@ ./package-configs/foot ]; nixpkgs = { - config.permittedInsecurePackages = ["cinny-4.2.1"]; + config.permittedInsecurePackages = ["cinny-4.2.1" "cinny-unwrapped-4.2.1"]; # You can add overlays here overlays = [ # You can also add overlays exported from other flakes: From ccf4a7a5af4e01acf610b7d31a66ab0a4863aed0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:30:42 +0200 Subject: [PATCH 102/395] Still need the insecure youtube-dl for freetube it seems --- nixos/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 7964b40..1138ad2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -16,7 +16,7 @@ #TODO: remove this when unneeded for freetube nixpkgs.config.permittedInsecurePackages = [ - #"python3.12-youtube-dl-2021.12.17" + "python3.12-youtube-dl-2021.12.17" ]; nix = { package = pkgs.lix; From 0ecc82d0f63a26918fda0e4bc3c7caed781db6c2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 2 Oct 2024 18:30:55 +0200 Subject: [PATCH 103/395] update flake lock --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 379aed3..fe3ef12 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725762345, - "narHash": "sha256-e2He1FFN35H3uVeUYO9+2fbG7IPoOSGub9oEKc1S0eQ=", + "lastModified": 1727662698, + "narHash": "sha256-HA1EYeH7SUDF6id4g3nY6krv/vUQldJuzahb7RFRzk4=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "bc5d903fdae933fad017d370764e2ae38d58b42d", + "rev": "9f20109509c553feeb57600a8a3b5e3177b43f6d", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1727249977, - "narHash": "sha256-lAqOCDI4B6hA+t+KHSm/Go8hQF/Ob5sgXaIRtMAnMKw=", + "lastModified": 1727872461, + "narHash": "sha256-4Pw3fVhN6xey5+2gUBm9nQJAjBqivffr+a5ZsXYjzJ8=", "owner": "nix-community", "repo": "disko", - "rev": "c1c472f4cd91e4b0703e02810a8c7ed30186b6fa", + "rev": "568727a884ae7cd9f266bd19aea655def8cafd78", "type": "github" }, "original": { @@ -558,11 +558,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -764,11 +764,11 @@ ] }, "locked": { - "lastModified": 1727246346, - "narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1727071274, - "narHash": "sha256-xG83n8zvL+fMFArU1ikcUpw0bhRkrzkSTDJPpBCLlUA=", + "lastModified": 1727865565, + "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "03aa054340528d300711253a98f7dccca9378604", + "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", "type": "github" }, "original": { @@ -807,11 +807,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725379389, - "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "lastModified": 1727792571, + "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", "type": "github" }, "original": { @@ -936,11 +936,11 @@ ] }, "locked": { - "lastModified": 1726975622, - "narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=", + "lastModified": 1727658919, + "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417", + "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", "type": "github" }, "original": { @@ -982,11 +982,11 @@ }, "nixlib": { "locked": { - "lastModified": 1726966855, - "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", + "lastModified": 1727571693, + "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", + "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1727312535, - "narHash": "sha256-exnTgS6OBYvEa8v5x8UsLQK2ERdDFwXNFQHoT2cqycY=", + "lastModified": 1727702862, + "narHash": "sha256-4ai7yRN8b2i43gNTAXfAuOw/uIzGqMLON1IXtIRrwOM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f31447cd3f8e54674bd1675969e97e6043a309bc", + "rev": "f7eb021d9dfd61f0e0075e483f3579c6f8453bb3", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1727665282, + "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1727343478, - "narHash": "sha256-oswVBH+Nzbfn6Qfq52uKBgDtMiYZUyl5bLEaGrpNWqY=", + "lastModified": 1727885193, + "narHash": "sha256-900otYvwsCSQk9eiCUvdeJ5PGx+i8YhTvN1kohFDGTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dec1098ad00f65a42e06eb2affdb0ee265e88cd5", + "rev": "ce76e7aa78ace4a8cc96582f6d9d2b12eb7606a1", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1727210241, - "narHash": "sha256-lufS6uzSbSrggNCSgubymMQWnQMh7PvQ+lRZ8qH9Uoc=", + "lastModified": 1727463368, + "narHash": "sha256-5glMknkwQejUrKy28iy/kCFlSMwHcVyf/whmxqD0ggk=", "owner": "pjones", "repo": "plasma-manager", - "rev": "a02fef2ece8084aff0b41700bb57d24d73574cd1", + "rev": "29ad64f0ac4ae84710dfeb1d37572d95c94cbfd8", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1726524647, - "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", + "lastModified": 1727734513, + "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", + "rev": "3198a242e547939c5e659353551b0668ec150268", "type": "github" }, "original": { From 1fb59d8d58e20c37e2013da04d590e441fcdb542 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:11:30 +0200 Subject: [PATCH 104/395] Enable catppuccin in home manager too --- home-manager/shared/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 5f9116c..dd81af8 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -19,6 +19,8 @@ homeDirectory = "/home/lillian"; }; + catppuccin.enable = true; + home.packages = with pkgs; [ # System tools: vscode-langservers-extracted From 13bad8a31a0a7993f75405c4cd93efd17eb2a790 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:25:26 +0200 Subject: [PATCH 105/395] Seems the zellij package makes the standard config file by default now, let's just fill that with the option --- home-manager/shared/shell/zellij/default.nix | 45 +++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 540cfec..36b811f 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -90,6 +90,39 @@ in { # TODO find specific settings for vscode to avoid enable = true; enableZshIntegration = true; + settings = { + session_serialization = true; + theme = "catppuccin-macchiato"; + + themes = { + catppuccin-mocha = { + bg = "#585b70"; + fg = "#cdd6f4"; + red = "#f38ba8"; + green = "#a6e3a1"; + blue = "#89b4fa"; + yellow = "#f9e2af"; + magenta = "#f5c2e7"; + orange = "#fab387"; + cyan = "#89dceb"; + black = "#181825"; + white = "#cdd6f4"; + }; + catppuccin-macchiato = { + bg = "#5b6078"; + fg = "#cad3f5"; + red = "#ed8796"; + green = "#a6da95"; + blue = "#8aadf4"; + yellow = "#eed49f"; + magenta = "#f5bde6"; + orange = "#f5a97f"; + cyan = "#91d7e3"; + black = "#1e2030"; + white = "#cad3f5"; + }; + }; + }; }; home.file = { @@ -98,10 +131,10 @@ in { target = ".config/zellij/layouts/default.kdl"; }; }; - home.file = { - "config" = { - source = ./zellij.kdl; - target = ".config/zellij/config.kdl"; - }; - }; + #home.file = { + # "config" = { + # source = ./zellij.kdl; + # target = ".config/zellij/config.kdl"; + # }; + #}; } From 4692f9a544aeead3163e7b156349b7eaf9c6094a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:28:54 +0200 Subject: [PATCH 106/395] Set home manager catppuccin to macchiato --- home-manager/shared/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index dd81af8..8e548d7 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -19,7 +19,10 @@ homeDirectory = "/home/lillian"; }; - catppuccin.enable = true; + catppuccin = { + enable = true; + catppuccin.flavor = "macchiato"; + }; home.packages = with pkgs; [ # System tools: From bd6fb261ca6e2daced10a9e64f0667d79f5b4940 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:29:41 +0200 Subject: [PATCH 107/395] Not catppuccin.catppuccin.flavor just catppuccin.flavor --- home-manager/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 8e548d7..4a6ced0 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -21,7 +21,7 @@ catppuccin = { enable = true; - catppuccin.flavor = "macchiato"; + flavor = "macchiato"; }; home.packages = with pkgs; [ From bd8ee02f3ef1f564e8e7c57618484b6b36226e5e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:31:27 +0200 Subject: [PATCH 108/395] Disable manual helix theming --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 018d614..ab4b3f3 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -9,7 +9,7 @@ defaultEditor = true; settings = { - theme = "catppuccin_macchiato"; + # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us editor = { line-number = "relative"; lsp.display-messages = true; From ee581afacc4a768a179e09c7cbdad23377e2ff1c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:36:25 +0200 Subject: [PATCH 109/395] Add kvantum for better catppuccin integration in the desktop --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 2997f89..5a7f2b1 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -83,6 +83,7 @@ kdePackages.plasma-pa kdePackages.sddm-kcm kdePackages.dolphin-plugins + kdepackages.qtstyleplugin-kvantum libportal-qt5 libportal From 5297100d4d9f0a6f5a8191777df8a0c078e8cd51 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:36:59 +0200 Subject: [PATCH 110/395] Forgot the capital letter in packages --- nixos/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 5a7f2b1..4b0123a 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -83,7 +83,7 @@ kdePackages.plasma-pa kdePackages.sddm-kcm kdePackages.dolphin-plugins - kdepackages.qtstyleplugin-kvantum + kdePackages.qtstyleplugin-kvantum libportal-qt5 libportal From f64d3674e04992bb2789d3bd639ac34edd5ce878 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:49:16 +0200 Subject: [PATCH 111/395] Let's try enabling kvantum theming manually --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 4a6ced0..54396bf 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -23,6 +23,7 @@ enable = true; flavor = "macchiato"; }; + qt.style.catppuccin.enable = true; home.packages = with pkgs; [ # System tools: From d36dbeb618c297355663760ef116d439eaa1a294 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 11:51:55 +0200 Subject: [PATCH 112/395] Have it overwrite kvantum settings --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 54396bf..9ad9cf9 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -24,6 +24,7 @@ flavor = "macchiato"; }; qt.style.catppuccin.enable = true; + qt.style.catppuccin.apply = true; home.packages = with pkgs; [ # System tools: From 5a09545d58e400ef473f98e4671d4b2ae934ddcb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 12:17:03 +0200 Subject: [PATCH 113/395] Manually enable macchiato theme for freetube --- home-manager/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 9ad9cf9..7add06a 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -23,8 +23,8 @@ enable = true; flavor = "macchiato"; }; - qt.style.catppuccin.enable = true; qt.style.catppuccin.apply = true; + programs.freetube.catppuccin.flavor = "macchiato"; home.packages = with pkgs; [ # System tools: From 3d39f6198de8cf516b079157ca656307398181fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 12:18:47 +0200 Subject: [PATCH 114/395] Move those options from shared to desktop --- home-manager/desktop/default.nix | 2 ++ home-manager/shared/default.nix | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 7a0bf0a..4b23059 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -76,6 +76,8 @@ # Add stuff for your user as you see fit: # programs.neovim.enable = true; # home.packages = with pkgs; [ steam ]; + qt.style.catppuccin.apply = true; + programs.freetube.catppuccin.flavor = "macchiato"; home.packages = with pkgs; [ # Coding: diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 7add06a..4a6ced0 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -23,8 +23,6 @@ enable = true; flavor = "macchiato"; }; - qt.style.catppuccin.apply = true; - programs.freetube.catppuccin.flavor = "macchiato"; home.packages = with pkgs; [ # System tools: From fbf4aa343978c7e2e6c1460079ab56b65af87e71 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 3 Oct 2024 13:47:14 +0200 Subject: [PATCH 115/395] remove black formatter from vscode --- home-manager/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 4b23059..0f2d8fe 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -156,7 +156,6 @@ mkhl.direnv ms-toolsai.jupyter ms-pyright.pyright - ms-python.black-formatter oderwat.indent-rainbow rust-lang.rust-analyzer yzhang.markdown-all-in-one From 75d88d5a28594b8629eab8a9bb4ab326b91ee8f0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 16:57:31 +0200 Subject: [PATCH 116/395] Let's try and replace firefox with floorp --- home-manager/desktop/default.nix | 2 - .../desktop/package-configs/firefox.nix | 341 +----------------- .../package-configs/firefox/default.nix | 29 +- 3 files changed, 17 insertions(+), 355 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 0f2d8fe..172248b 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -144,8 +144,6 @@ enable = true; package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons charliermarsh.ruff diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 0da278d..43f4854 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -6,7 +6,7 @@ programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; - package = pkgs.firefox; + package = pkgs.floorp; profiles.lillian = { isDefault = true; settings = { @@ -28,345 +28,6 @@ "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo"; }; - userChrome = '' - /* - Title: Drannex42's FirefoxSidebar / Vertical Tabs - Description: Vertical tab design for Firefox with dynamic indentation:: - Sideberry and TreeStyleTabs (Legacy) themes available! - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: 12022.04.17 - */ - - :root { - --sidebar-width: 50px; - --toolbar-height: 10px; - --menubar-height: 100px; - --sidebar-padding: calc(var(--sidebar-width) + 5px); - --toolbar-start-end-padding: 5px !important; - - /* Custom Sidebar/Header Backround :: - This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly - */ - /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */ - /* --custom-sidebar-header-bg: #000; */ - - /* ====== Extension Settings ====== */ - - /* Window Control / Client Side Display Settings === - If you are putting this on the left or right side uncomment the side - preferences below and comment the other - ========================================================================= - */ - --csd-width: 100px; - --csd-top: 8px; - - /* - CSD - Left Side === - Default: --csd-left: 50px; --csd-margin-left: 92px; - */ - - /* - --csd-left: 50px; - --csd-margin-left: 92px; - */ - - /* - CSD - Right Side === - Defaults: --csd-right: 0px; --csd-margin-right: 95px; - */ - - --csd-right: 36px; - --csd-margin-right: 130px; - - /* === END: Window Control / Client Side Display Settings === */ - - /* === END: Extension Settings === */ - - } - - - /* ========================================================================= */ - - /* - Extension (Core): Sidebar - Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Version: v12024.05.15 (YYYYY.MM.DD) - */ - - #main-window #TabsToolbar { - visibility: collapse; - } - - /* As of v12024.05.15 we updated to using this one by MrOtherGuy, with modifications */ - /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0 */ - - /* Show sidebar only when the cursor is over it */ - /* The border controlling sidebar width will be removed so you'll need to modify these values to change width */ - - #sidebar-box { - --uc-sidebar-width: 50px; - --uc-sidebar-hover-width: 260px; - --uc-autohide-sidebar-delay: 10ms; - /* Wait 0.6s before hiding sidebar */ - --uc-autohide-transition-duration: 115ms; - --uc-autohide-transition-type: linear; - position: relative; - min-width: var(--uc-sidebar-width) !important; - width: var(--uc-sidebar-width) !important; - max-width: var(--uc-sidebar-width) !important; - z-index: 1; - margin-top: -40px; - } - - - #sidebar-box[positionend] { - direction: rtl - } - - #sidebar-box[positionend]>* { - direction: ltr - } - - #sidebar-box[positionend]:-moz-locale-dir(rtl) { - direction: ltr - } - - #sidebar-box[positionend]:-moz-locale-dir(rtl)>* { - direction: rtl - } - - #main-window[sizemode="fullscreen"] #sidebar-box { - --uc-sidebar-width: 1px; - } - - #sidebar-splitter { - display: none - } - - #sidebar-header { - overflow: hidden; - color: var(--chrome-color, inherit) !important; - padding-inline: 0 !important; - background: var(--custom-sidebar-header-bg, inherit) !important; - padding: 8px 12px !important; - padding-top: 9px !important; - border-bottom: none !Important; - } - - #sidebar-header::before, - #sidebar-header::after { - content: ""; - display: flex; - padding-left: 0px; - } - - #sidebar-header, - #sidebar { - transition: min-width var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important; - min-width: var(--uc-sidebar-width) !important; - will-change: min-width; - } - - #sidebar-box:hover>#sidebar-header, - #sidebar-box:hover>#sidebar { - min-width: var(--uc-sidebar-hover-width) !important; - width: var(--uc-sidebar-hover-width) !important; - transition-delay: 0ms !important; - } - - #sidebar-box>#sidebar-header #sidebar-title { - opacity: 0; - } - - #sidebar-box:hover>#sidebar-header #sidebar-title { - opacity: 1; - } - - .sidebar-panel { - background-color: transparent !important; - color: var(--newtab-text-primary-color) !important; - } - - .sidebar-panel #search-box { - -moz-appearance: none !important; - background-color: rgba(249, 249, 250, 0.1) !important; - color: inherit !important; - } - - /* Add sidebar divider and give it background */ - - #sidebar, - #sidebar-header { - background-color: inherit !important; - border-right: 1px solid var(--sidebar-border-color); - border-inline-width: 0px 1px; - } - - #sidebar-box:not([positionend])> :-moz-locale-dir(rtl), - #sidebar-box[positionend]>* { - border-inline-width: 1px 0px; - } - - - /* Move statuspanel to the other side when sidebar is hovered so it doesn't get covered by sidebar */ - - #sidebar-box:not([positionend]):hover~#appcontent #statuspanel { - inset-inline: auto 0px !important; - } - - #sidebar-box:not([positionend]):hover~#appcontent #statuspanel-label { - margin-inline: 0px !important; - border-left-style: solid !important; - } - - - .browser-toolbar { - padding-left: var(--sidebar-width) !important; - position: relative !important; - } - - #PersonalToolbar { - padding: 2px 5px !important; - padding-top: 0px !important; - margin-top: 0px !important; - padding-left: calc(var(--sidebar-width) + 6px) !important; - } - - - /* - Extensions :: - To enable/disable specific extensions just comment/uncomment the line below. - ========================================================================= - */ - - /* - Extension: Window Controls / Client Side Decorations (CSD) - Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. - Repository URL: https://github.com/drannex42/FirefoxSidebar - Contributors: Mr-nUUb, Xanaxus, Drannex42 - Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 - */ - - /* allow the buttons to appear */ - .browser-toolbar { - position: unset !important; - } - - /* reserve space for buttons */ - #nav-bar { - padding-right: var(--csd-margin-right) !important; - margin-left: var(--csd-margin-left) !important; - } - - /* move buttons next to menu button */ - .titlebar-buttonbox-container { - visibility: visible !important; - position: fixed !important; - display: block; - z-index: 999999999; - top: var(--csd-top, inherit); - right: var(--csd-right, inherit); - left: var(--csd-left, inherit); - max-width: var(--csd-width); - } - - /* hide buttons in fullscreen mode (video player and F11) */ - #main-window[inFullscreen="true"] .titlebar-buttonbox-container, - #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container { - visibility: hidden !important; - } - - /* remove empty space when in fullscreen mode (F11) */ - #main-window[inFullscreen="true"] #nav-bar { - padding-right: 0px !important; - margin-left: 0px !important; - } - - /* END Client Side Decorations / Window Controls */ - - - - /* - Extension: Superbox Removal (and compaction) - Description: This removes the superbox and fixes some padding around the urlbar. - Repository URL: https://github.com/drannex42/FirefoxSidebar - */ - - /* --- Prevent enlargement */ - #urlbar[breakout-extend] { - /* top: calc( */ - /* (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 */ - /* ) !important; */ - /* Fix due to deprecation https://www.reddit.com/r/firefox/comments/1cs3g49/address_bar_suggestions_going_up_instead_of_down/ */ - top: calc((var(--urlbar-container-height, --urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important; - left: 0 !important; - width: 100% !important; - } - - #urlbar[breakout-extend] #urlbar-input-container { - height: var(--urlbar-height) !important; - /* padding: 0px !important; */ - padding-block: 0px !important; - padding-inline: 0px !important; - } - - .urlbarView-row { - padding: 0px 2px 0px 2px; - } - - /* END Prevent enlargement --- */ - - /*/* --- Reduce row paddings to make them more compact */ - .urlbarView-row { - padding: 2px 0px !important; - line-height: 1.2em !important; - margin: -1px; - margin-bottom: 0px; - } - - .urlbarView-row-inner { - padding-bottom: 6px !important; - } - - .urlbarView { - margin: 0px !important; - width: 100% !important; - } - - /* END Reduce row paddings to make them more compact --- */ - - /* Disable Urlbar Animation */ - #urlbar[breakout][breakout-extend][breakout-extend-animate]>#urlbar-background { - animation-name: none !important; - animation: none !important; - } - - /* END Disable Urlbar Animation */ - - /* --- More compact "Search with Google" rows */ - .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner { - min-height: auto !important; - width: auto !important; - } - - .urlbarView-row[dynamicType="onboardTabToSearch"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon { - margin-bottom: -1px; - } - - /* END More compact "Search with Google" rows --- */ - - /* Remove active border on the addressbar when in focus */ - #nav-bar { - --toolbar-field-focus-border-color: #ccc; - } - - /* Remove box shadow on address bar */ - #urlbar-background, - #searchbar { - box-shadow: none !important; - } - ''; bookmarks = [ { name = "estrogen production"; diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 394788b..432111e 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -5,7 +5,7 @@ }: { programs.firefox = { enable = true; - package = pkgs.firefox; + package = pkgs.floorp; policies = { DisableTelemetry = true; DisableFirefoxStudies = true; @@ -28,16 +28,16 @@ }; ExtensionSettings = { # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below - # Catppuccin Macchiato - Lavender theme: - "{6396519b-0923-41a4-948a-3cb54a3918b3}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-lavender/latest.xpi"; + # Catppuccin Macchiato - Mauve theme: + "{55750c61-e5f3-4d9a-898d-0643b3093678}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-mauve/latest.xpi"; installation_mode = "force_installed"; }; # Sideberry: - "{3c078156-979c-498b-8990-85f7987dd929}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; - installation_mode = "force_installed"; - }; + #"{3c078156-979c-498b-8990-85f7987dd929}" = { + # install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; + # installation_mode = "force_installed"; + #}; # Privacy Badger: "jid1-MnnxcxisBPnSXQ@jetpack" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; @@ -118,10 +118,6 @@ install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi"; installation_mode = "force_installed"; }; - "frankerfacez@frankerfacez.com" = { - install_url = "https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"; - installation_mode = "force_installed"; - }; }; FirefoxHome = { Search = true; @@ -141,11 +137,18 @@ "browser.compactmode.show" = true; "browser.uidensity" = 0; # "browser.newtabpage.activity-stream.feeds.topsites" = false; - # "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; "font.name.serif.x-western" = "Crimson"; "font.name.sans-serif.x-western" = "Atkinson Hyperlegible"; "font.name.monospace.x-western" = "FiraCode Nerd Font"; "font.size.variable.x-western" = 14; + "floorp.browser.sidebar.useIconProvider" = "duckduckgo"; + "floorp.browser.tabbar.settings" = 2; + "floorp.browser.tabs.verticaltab" = true; + "floorp.tabbar.style" = 2; + "floorp.browser.user.interface" = 8; "signon.rememberSignons" = true; }; # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks From 359e192ee6499b3d621a87a608d9958f410ca8bb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 17:29:18 +0200 Subject: [PATCH 117/395] Replace firefox with floorp on the hotbar --- home-manager/desktop/package-configs/plasma-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index a9d61e3..8113fef 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -79,7 +79,7 @@ config = { General = { launchers = [ - "applications:firefox.desktop" + "applications:floorp.desktop" "applications:systemsettings.desktop" "applications:org.kde.dolphin.desktop" "applications:signal-desktop.desktop" From 88b5d34202e8bb01981b530c95e898e33201819b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 18:44:14 +0200 Subject: [PATCH 118/395] add search engine options in firefox/floorp options and have the other disk in GLaDOS auto-mount --- disko/GLaDOS/default.nix | 17 +++++++++++++++++ .../desktop/package-configs/firefox.nix | 8 ++++++++ 2 files changed, 25 insertions(+) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index b418785..a44d858 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -41,6 +41,23 @@ }; }; }; + sda2 = { + device = "/dev/sda2"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + root = { + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/media"; + }; + }; + }; + }; + }; }; lvm_vg = { pool = { diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 43f4854..02e9159 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -7,6 +7,14 @@ enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; package = pkgs.floorp; + search = { + default = "DuckDuckGo"; + force = true; + engines = { + "Google".metaData.hidden = true; + "Bing".metaData.hidden = true; + }; + }; profiles.lillian = { isDefault = true; settings = { From df8210bcc9c66f812aae02438693f8cb0f1b0e3d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 18:45:49 +0200 Subject: [PATCH 119/395] Apparently not a thing :( --- home-manager/desktop/package-configs/firefox.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 02e9159..43f4854 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -7,14 +7,6 @@ enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; package = pkgs.floorp; - search = { - default = "DuckDuckGo"; - force = true; - engines = { - "Google".metaData.hidden = true; - "Bing".metaData.hidden = true; - }; - }; profiles.lillian = { isDefault = true; settings = { From b108e8a1ac29cacabff027a12c6e20d8f67d7cdf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 18:47:04 +0200 Subject: [PATCH 120/395] Oops that's the wrong disk --- disko/GLaDOS/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index a44d858..89c6396 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -41,8 +41,8 @@ }; }; }; - sda2 = { - device = "/dev/sda2"; + sdc = { + device = "/dev/sdc"; type = "disk"; content = { type = "gpt"; From dba9cffb913fa1bd847e24d93787ba70c21e2f08 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Oct 2024 19:09:29 +0200 Subject: [PATCH 121/395] This disko config is not working, corrupts the system, let's just comment it out for now :) --- disko/GLaDOS/default.nix | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index 89c6396..c605347 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -41,23 +41,23 @@ }; }; }; - sdc = { - device = "/dev/sdc"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/media"; - }; - }; - }; - }; - }; + #sdc = { + #device = "/dev/disk/by-path/pci-0000:06:00.0-ata-2"; + #type = "disk"; + #content = { + #type = "gpt"; + #partitions = { + #root = { + #size = "100%"; + #content = { + #type = "filesystem"; + #format = "ext4"; + #mountpoint = "/media"; + #}; + #}; + #}; + #}; + #}; }; lvm_vg = { pool = { From fe7949cbed0d180d19c05e3b753e7d09135be60d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Oct 2024 15:10:38 +0200 Subject: [PATCH 122/395] update flake lock --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index fe3ef12..92d64ea 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727662698, - "narHash": "sha256-HA1EYeH7SUDF6id4g3nY6krv/vUQldJuzahb7RFRzk4=", + "lastModified": 1728096501, + "narHash": "sha256-qtF5+wGoGeq83ISH6hWgyaWn5ErhEuYuI3MFnPXCcPc=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "9f20109509c553feeb57600a8a3b5e3177b43f6d", + "rev": "3829e49167eebfb763217b464c98f075ba78a06e", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1726952185, - "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", + "lastModified": 1727910534, + "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=", "owner": "catppuccin", "repo": "nix", - "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", + "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1727872461, - "narHash": "sha256-4Pw3fVhN6xey5+2gUBm9nQJAjBqivffr+a5ZsXYjzJ8=", + "lastModified": 1728109432, + "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", "owner": "nix-community", "repo": "disko", - "rev": "568727a884ae7cd9f266bd19aea655def8cafd78", + "rev": "48ebb577855fb2398653f033b3b2208a9249203d", "type": "github" }, "original": { @@ -764,11 +764,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1727865565, - "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", + "lastModified": 1728017225, + "narHash": "sha256-lLV+OMkMeFqTEmoIZhpWtw6H+ebghupckhrCO+K0MdU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", + "rev": "cb63dc934ba512b2d56d89b94c5da7894f6a7809", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1727702862, - "narHash": "sha256-4ai7yRN8b2i43gNTAXfAuOw/uIzGqMLON1IXtIRrwOM=", + "lastModified": 1727917377, + "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f7eb021d9dfd61f0e0075e483f3579c6f8453bb3", + "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1727885193, - "narHash": "sha256-900otYvwsCSQk9eiCUvdeJ5PGx+i8YhTvN1kohFDGTQ=", + "lastModified": 1728133552, + "narHash": "sha256-xTDvuHN/Q682ZD8lm8pXeYeL5L4qYyBVKdEZZCetY7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce76e7aa78ace4a8cc96582f6d9d2b12eb7606a1", + "rev": "0c0a393832517a75e87d66ed5828af92a547ba26", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -1224,11 +1224,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1727463368, - "narHash": "sha256-5glMknkwQejUrKy28iy/kCFlSMwHcVyf/whmxqD0ggk=", + "lastModified": 1727917089, + "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "29ad64f0ac4ae84710dfeb1d37572d95c94cbfd8", + "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", "type": "github" }, "original": { From 78e8fb1dbf0f6de6d92d162a97bdefcee34e85fa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Oct 2024 15:19:52 +0200 Subject: [PATCH 123/395] Enable kde connect in home manager --- home-manager/desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 172248b..d909827 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -201,6 +201,8 @@ no-autostart = true; }; + services.kdeconnect.enable = true; + # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; } From 22ba8683484ddf15da6d13ec16abe3d0e0feef2d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Oct 2024 15:22:22 +0200 Subject: [PATCH 124/395] It seem to pull kde connect for QT5 by default, let's set the package and see if that fixes it --- home-manager/desktop/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index d909827..9a46c42 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -201,7 +201,10 @@ no-autostart = true; }; - services.kdeconnect.enable = true; + services.kdeconnect = { + package = pkgs.kdePackages.kdeconnect-kde; + enable = true; + }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; From 0aee85833db03a5795c1954aff1f368749716854 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 10 Oct 2024 15:22:27 +0200 Subject: [PATCH 125/395] update flake lock --- flake.lock | 132 ++++++++++++++++++++++++++--------------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 92d64ea..63d14af 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728096501, - "narHash": "sha256-qtF5+wGoGeq83ISH6hWgyaWn5ErhEuYuI3MFnPXCcPc=", + "lastModified": 1728525495, + "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "3829e49167eebfb763217b464c98f075ba78a06e", + "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1727910534, - "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1726444589, - "narHash": "sha256-dWKVjS4wvyZxRjhUICTnnw8mHYwJij4SGvXIG/U5oRo=", + "lastModified": 1728182038, + "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "032b199129f8648a77bde285f755a78e9ec349a7", + "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "crane_5": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1728109432, - "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", + "lastModified": 1728334376, + "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", "owner": "nix-community", "repo": "disko", - "rev": "48ebb577855fb2398653f033b3b2208a9249203d", + "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", "type": "github" }, "original": { @@ -670,11 +670,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -764,11 +764,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1728017225, - "narHash": "sha256-lLV+OMkMeFqTEmoIZhpWtw6H+ebghupckhrCO+K0MdU=", + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cb63dc934ba512b2d56d89b94c5da7894f6a7809", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", "type": "github" }, "original": { @@ -807,11 +807,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727792571, - "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", + "lastModified": 1728199407, + "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", + "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", "type": "github" }, "original": { @@ -936,11 +936,11 @@ ] }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1728263287, + "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "type": "github" }, "original": { @@ -982,11 +982,11 @@ }, "nixlib": { "locked": { - "lastModified": 1727571693, - "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", + "lastModified": 1728176478, + "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", + "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1727917377, - "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", + "lastModified": 1728522165, + "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", + "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728133552, - "narHash": "sha256-xTDvuHN/Q682ZD8lm8pXeYeL5L4qYyBVKdEZZCetY7o=", + "lastModified": 1728565888, + "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0a393832517a75e87d66ed5828af92a547ba26", + "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", "type": "github" }, "original": { @@ -1160,11 +1160,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1287,11 +1287,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", + "lastModified": 1728093190, + "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", + "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", "type": "github" }, "original": { @@ -1303,11 +1303,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1726481836, - "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", "type": "github" }, "original": { @@ -1497,11 +1497,11 @@ ] }, "locked": { - "lastModified": 1726453838, - "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", + "lastModified": 1728095260, + "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", + "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -1655,11 +1655,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1726515093, - "narHash": "sha256-Y2OHV3QfLPQj3Q4+TmrMeRXthwigU/YSBv2g8y8GWWU=", + "lastModified": 1728141581, + "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", "owner": "dj95", "repo": "zjstatus", - "rev": "d1c662c1052adec6f14f3ee8a51cecebe4a29ffa", + "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", "type": "github" }, "original": { From 9f2d428e2fc4862d11aeab04fabe89afdbca113f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 16 Oct 2024 10:52:16 +0200 Subject: [PATCH 126/395] Add a helix layout file to zellij --- home-manager/shared/shell/zellij/default.nix | 89 ++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 36b811f..1565979 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -54,6 +54,89 @@ } } + default_tab_template { + pane size=1 borderless=true { + plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" + + mode_locked "#[fg=magenta,bold] {name} " + mode_normal "#[fg=green,bold] {name} " + mode_resize "#[fg=orange,bold] {name} " + mode_default_to_mode "resize" + + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" + + tab_sync_indicator " " + tab_fullscreen_indicator "□ " + tab_floating_indicator "󰉈 " + + datetime "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} " + datetime_format "%Y-%m-%d %H:%M" + datetime_timezone "Europe/Amsterdam" + } + } + children + pane size=2 borderless=true { + plugin location="status-bar" + } + } + } + ''; + helix_zellij = + pkgs.writeText "helix.kdl" + '' + layout { + tab { + pane { + command "hx" + args "." + } + pane split_direction="vertical" size="20%" {} + } + swap_tiled_layout name="vertical" { + tab max_panes=5 { + pane split_direction="vertical" { + pane + pane { children; } + } + } + tab max_panes=8 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + pane { pane; pane; pane; pane; } + } + } + } + + swap_tiled_layout name="horizontal" { + tab max_panes=5 { + pane + pane + } + tab max_panes=8 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + } + default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { @@ -131,6 +214,12 @@ in { target = ".config/zellij/layouts/default.kdl"; }; }; + home.file = { + "helix_zellij" = { + source = "${helix_zellij}"; + target = ".config/zellij/layouts/helix.kdl"; + }; + }; #home.file = { # "config" = { # source = ./zellij.kdl; From a5f4745bf8e12e814cb95a819c63d6a533c926ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 16 Oct 2024 21:47:40 +0200 Subject: [PATCH 127/395] do the correct zsh and zellij magics --- home-manager/shared/default.nix | 2 + home-manager/shared/shell/helix/default.nix | 7 ++ home-manager/shared/shell/zellij/default.nix | 89 ++++++++++++++++++++ home-manager/shared/shell/zsh.nix | 1 + 4 files changed, 99 insertions(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 4a6ced0..9841353 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -31,5 +31,7 @@ zsh bat btop + broot + lazygit ]; } diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index ab4b3f3..0362579 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -10,6 +10,13 @@ settings = { # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us + keys.normal.backspace = { + b = ":run-shell-command zellij run -f -- just build"; + r = ":run-shell-command zellij run -f -- just run"; + t = ":run-shell-command zellij run -f -- just test"; + g = ":run-shell-command zellij run -fc -- lazygit"; + f = ":run-shell-command zellij run -fc -- broot"; + }; editor = { line-number = "relative"; lsp.display-messages = true; diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 36b811f..1565979 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -54,6 +54,89 @@ } } + default_tab_template { + pane size=1 borderless=true { + plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" + + mode_locked "#[fg=magenta,bold] {name} " + mode_normal "#[fg=green,bold] {name} " + mode_resize "#[fg=orange,bold] {name} " + mode_default_to_mode "resize" + + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" + + tab_sync_indicator " " + tab_fullscreen_indicator "□ " + tab_floating_indicator "󰉈 " + + datetime "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} " + datetime_format "%Y-%m-%d %H:%M" + datetime_timezone "Europe/Amsterdam" + } + } + children + pane size=2 borderless=true { + plugin location="status-bar" + } + } + } + ''; + helix_zellij = + pkgs.writeText "helix.kdl" + '' + layout { + tab { + pane { + command "hx" + args "." + } + pane split_direction="vertical" size="20%" {} + } + swap_tiled_layout name="vertical" { + tab max_panes=5 { + pane split_direction="vertical" { + pane + pane { children; } + } + } + tab max_panes=8 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + pane { pane; pane; pane; pane; } + } + } + } + + swap_tiled_layout name="horizontal" { + tab max_panes=5 { + pane + pane + } + tab max_panes=8 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + } + default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { @@ -131,6 +214,12 @@ in { target = ".config/zellij/layouts/default.kdl"; }; }; + home.file = { + "helix_zellij" = { + source = "${helix_zellij}"; + target = ".config/zellij/layouts/helix.kdl"; + }; + }; #home.file = { # "config" = { # source = ./zellij.kdl; diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index cc38d8f..55878f2 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -71,6 +71,7 @@ initExtra = '' eval "$(zoxide init --cmd cd zsh)" tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; } + zhx() { command zellij action new-tab --layout $HOME/.config/zellij/layouts/helix.kdl; } ''; }; } From 20ae80fb0d315ff865bd0dd36673055f016f9d1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 16 Oct 2024 21:54:19 +0200 Subject: [PATCH 128/395] add just to system packages --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 307e099..ff3e59c 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -36,6 +36,7 @@ helix home-manager htop + just killall oh-my-zsh rsync From 7429a32a06e4faf74609a8259c8e43ecf1fc52b1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 16 Oct 2024 22:32:19 +0200 Subject: [PATCH 129/395] added direnv exec to the run and compile commands so zellij can see the direnv --- home-manager/shared/shell/helix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 0362579..1222c51 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -11,9 +11,9 @@ settings = { # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us keys.normal.backspace = { - b = ":run-shell-command zellij run -f -- just build"; - r = ":run-shell-command zellij run -f -- just run"; - t = ":run-shell-command zellij run -f -- just test"; + b = ":run-shell-command zellij run -f -- direnv exec . just build"; + r = ":run-shell-command zellij run -f -- direnv exec . just run"; + t = ":run-shell-command zellij run -f -- direnv exec . just test"; g = ":run-shell-command zellij run -fc -- lazygit"; f = ":run-shell-command zellij run -fc -- broot"; }; From c31a2f29740873197aa59a80bfab843a93eaa266 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 17 Oct 2024 15:19:49 +0200 Subject: [PATCH 130/395] replace webcord with vesktop --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 9a46c42..ddc43a0 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -90,7 +90,7 @@ # Chat applications: signal-desktop - webcord-vencord + vesktop cinny-desktop # Gaming: From bddd7e8a31cd22a409430717ca77b5e5b29b6e30 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 17 Oct 2024 15:27:40 +0200 Subject: [PATCH 131/395] added justfile and edited plasma to have vesktop instead of webcord --- .../desktop/package-configs/plasma-desktop.nix | 2 +- justfile | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 justfile diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 8113fef..f1d9252 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -83,7 +83,7 @@ "applications:systemsettings.desktop" "applications:org.kde.dolphin.desktop" "applications:signal-desktop.desktop" - "applications:webcord.desktop" + "applications:vesktop.desktop" "applications:cinny.desktop" "applications:steam.desktop" "applications:noisetorch.desktop" diff --git a/justfile b/justfile new file mode 100644 index 0000000..d454135 --- /dev/null +++ b/justfile @@ -0,0 +1,11 @@ +build: + sudo nixos-rebuild switch --flake .# + +run: + nix-repl -f flake:nixpkgs + +test: + sudo nix flake check + +update: + nix flake update From df3dbf356e22b01f88cdc768db9eeb0147cb5d4b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 17 Oct 2024 16:52:50 +0200 Subject: [PATCH 132/395] remove bottom pane from editor prompt --- home-manager/shared/shell/zellij/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 1565979..10a600e 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -93,7 +93,6 @@ command "hx" args "." } - pane split_direction="vertical" size="20%" {} } swap_tiled_layout name="vertical" { tab max_panes=5 { From 7b8d516b6a60da435c6618e537248caba359575a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 17 Oct 2024 17:05:30 +0200 Subject: [PATCH 133/395] Added and enabled navi on all systems --- home-manager/shared/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 9841353..9bac4a0 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -33,5 +33,7 @@ btop broot lazygit + navi ]; + programs.navi.enable = true; } From cb87a12ad25ee2a3e36f4ccff48d6fd2f2307cc3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 18 Oct 2024 17:43:10 +0200 Subject: [PATCH 134/395] added yazi as a fancy file picker to helix with a simple backspace + f command :) --- home-manager/shared/default.nix | 1 + home-manager/shared/shell/helix/default.nix | 32 +++++++++++++++++---- home-manager/shared/shell/zsh.nix | 2 +- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 9bac4a0..799caca 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -34,6 +34,7 @@ broot lazygit navi + yazi ]; programs.navi.enable = true; } diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 1222c51..76304ef 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -3,7 +3,20 @@ lib, pkgs, ... -}: { +}: let + yazi = + pkgs.writeText "open_in_helix_from_yazi.zsh" + '' + #! ~/.nix-profile/bin/zsh + files=(''${(fqq)"$( yazi --chooser-file=/dev/stdout | cat )"}) + zellij action toggle-floating-panes + zellij action write 27 # send escape-key + zellij action write-chars ":open $files" + zellij action write 13 # send enter-key + zellij action toggle-floating-panes + zellij action close-pane + ''; +in { programs.helix = { enable = true; defaultEditor = true; @@ -11,11 +24,11 @@ settings = { # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us keys.normal.backspace = { - b = ":run-shell-command zellij run -f -- direnv exec . just build"; - r = ":run-shell-command zellij run -f -- direnv exec . just run"; - t = ":run-shell-command zellij run -f -- direnv exec . just test"; - g = ":run-shell-command zellij run -fc -- lazygit"; - f = ":run-shell-command zellij run -fc -- broot"; + b = ":sh zellij run -f -n 'build code' -- direnv exec . just build"; + r = ":sh zellij run -f -n 'run code' -- direnv exec . just run"; + t = ":sh zellij run -f -n 'test code' -- direnv exec . just test"; + g = ":sh zellij run -fc -n 'lazygit' -- lazygit"; + f = ":sh zellij run --floating -n 'yazi picker' -- zsh ~/.config/helix/open_in_helix_from_yazi.zsh "; }; editor = { line-number = "relative"; @@ -165,4 +178,11 @@ target = ".config/helix/external-snippets.toml"; }; }; + + home.file = { + "yazi" = { + source = "${yazi}"; + target = ".config/helix/open_in_helix_from_yazi.zsh"; + }; + }; } diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index 55878f2..a3108ff 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -67,7 +67,7 @@ "zsh-navigation-tools" ]; }; - # stuff for zoxide & tre + # Extra commands that take more complex forms initExtra = '' eval "$(zoxide init --cmd cd zsh)" tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; } From d1447a650de7ff1a38da4737989e9a3b63a2cf99 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 15:07:13 +0200 Subject: [PATCH 135/395] update cinny and nextcloud package versions and update flake lock --- flake.lock | 180 +++++++++--------- home-manager/desktop/default.nix | 2 +- .../package-configs/nextcloud/default.nix | 2 +- 3 files changed, 89 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index 92d64ea..0af5b3e 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728096501, - "narHash": "sha256-qtF5+wGoGeq83ISH6hWgyaWn5ErhEuYuI3MFnPXCcPc=", + "lastModified": 1728768056, + "narHash": "sha256-nDz1+eO5ziimxiyqtKVT3Gj9OZfk3WVhC4czo6EGec8=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "3829e49167eebfb763217b464c98f075ba78a06e", + "rev": "4f9293b045cf32dfc629ce300180d311aba8f53a", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1727910534, - "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1726444589, - "narHash": "sha256-dWKVjS4wvyZxRjhUICTnnw8mHYwJij4SGvXIG/U5oRo=", + "lastModified": 1728182038, + "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "032b199129f8648a77bde285f755a78e9ec349a7", + "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", "type": "github" }, "original": { @@ -247,18 +247,12 @@ } }, "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1728776144, + "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "f876e3d905b922502f031aeec1a84490122254b7", "type": "github" }, "original": { @@ -269,11 +263,11 @@ }, "crane_5": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -358,11 +352,11 @@ ] }, "locked": { - "lastModified": 1728109432, - "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", + "lastModified": 1729281548, + "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", "owner": "nix-community", "repo": "disko", - "rev": "48ebb577855fb2398653f033b3b2208a9249203d", + "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", "type": "github" }, "original": { @@ -579,11 +573,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -670,11 +664,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -764,11 +758,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1729321331, + "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", "type": "github" }, "original": { @@ -784,11 +778,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1728017225, - "narHash": "sha256-lLV+OMkMeFqTEmoIZhpWtw6H+ebghupckhrCO+K0MdU=", + "lastModified": 1729177642, + "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cb63dc934ba512b2d56d89b94c5da7894f6a7809", + "rev": "bb69165ff372ddbd3228a03513922acd783040e8", "type": "github" }, "original": { @@ -807,11 +801,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727792571, - "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", + "lastModified": 1729064530, + "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", + "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", "type": "github" }, "original": { @@ -936,11 +930,11 @@ ] }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1728790083, + "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "type": "github" }, "original": { @@ -982,11 +976,11 @@ }, "nixlib": { "locked": { - "lastModified": 1727571693, - "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", + "lastModified": 1728781282, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", + "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", "type": "github" }, "original": { @@ -1003,11 +997,11 @@ ] }, "locked": { - "lastModified": 1727917377, - "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", + "lastModified": 1729127034, + "narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", + "rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f", "type": "github" }, "original": { @@ -1018,11 +1012,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1729333370, + "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "type": "github" }, "original": { @@ -1065,11 +1059,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728133552, - "narHash": "sha256-xTDvuHN/Q682ZD8lm8pXeYeL5L4qYyBVKdEZZCetY7o=", + "lastModified": 1729342391, + "narHash": "sha256-T89yRYGbO4/8gDn7ttuaX9Mxi71D4Q9h8danhqm4CiY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0a393832517a75e87d66ed5828af92a547ba26", + "rev": "0708033e05433075a518c60245207c9eeea0c628", "type": "github" }, "original": { @@ -1160,11 +1154,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -1176,11 +1170,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -1224,11 +1218,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1240,11 +1234,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", + "lastModified": 1728897630, + "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc", "type": "github" }, "original": { @@ -1256,11 +1250,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -1287,11 +1281,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", + "lastModified": 1728093190, + "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", + "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", "type": "github" }, "original": { @@ -1303,11 +1297,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1726481836, - "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", "type": "github" }, "original": { @@ -1327,11 +1321,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1729243807, + "narHash": "sha256-YxS3wU1cdhK/aYaj9ODukmg451uMCdCVlOhjtFh9YJc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "30d186abf38f8dd248ed9046c45b422ed21bdbb0", "type": "github" }, "original": { @@ -1381,11 +1375,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -1476,11 +1470,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1728959392, + "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "type": "github" }, "original": { @@ -1497,11 +1491,11 @@ ] }, "locked": { - "lastModified": 1726453838, - "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", + "lastModified": 1728095260, + "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", + "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", "type": "github" }, "original": { @@ -1538,11 +1532,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -1655,11 +1649,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1726515093, - "narHash": "sha256-Y2OHV3QfLPQj3Q4+TmrMeRXthwigU/YSBv2g8y8GWWU=", + "lastModified": 1728141581, + "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", "owner": "dj95", "repo": "zjstatus", - "rev": "d1c662c1052adec6f14f3ee8a51cecebe4a29ffa", + "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", "type": "github" }, "original": { diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index ddc43a0..3d59b2c 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -22,7 +22,7 @@ ./package-configs/foot ]; nixpkgs = { - config.permittedInsecurePackages = ["cinny-4.2.1" "cinny-unwrapped-4.2.1"]; + config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2"]; # You can add overlays here overlays = [ # You can also add overlays exported from other flakes: diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 483401b..a3ed25a 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -49,7 +49,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; # Use HTTPS for links https = true; From c42c7a684a87d7277b3bc56bad788e6aef1c7136 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 18:47:20 +0200 Subject: [PATCH 136/395] added show trace to the justfile commands --- justfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index d454135..b0aad0e 100644 --- a/justfile +++ b/justfile @@ -1,11 +1,11 @@ build: - sudo nixos-rebuild switch --flake .# + sudo nixos-rebuild switch --flake .# --show-trace run: nix-repl -f flake:nixpkgs test: - sudo nix flake check + sudo nix flake check --show-trace update: nix flake update From f7bc2a5635b788b1572e856ce7dad416ce4f934c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 19:17:40 +0200 Subject: [PATCH 137/395] replace webcord with vesktop in shodan too, and update plasma manager file --- .../package-configs/plasma-desktop.nix | 356 +++++++++--------- home-manager/hosts/shodan/lillian.nix | 2 +- 2 files changed, 169 insertions(+), 189 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index f1d9252..a0c23f2 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -103,55 +103,52 @@ ]; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."decrease_volume_small" = "Shift+Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "" "Meta+Volume Mute\\, ,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = []; - "ksmserver"."Lock Session" = ["Meta+L" "" "Screensaver\\, ,Meta+L" "Screensaver,Lock Session"]; + "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = []; - "ksmserver"."LogOut" = []; - "ksmserver"."Reboot" = []; - "ksmserver"."Reboot Without Confirmation" = []; - "ksmserver"."Shut Down" = []; + "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; + "ksmserver"."LogOut" = "none,,Log Out"; + "ksmserver"."Reboot" = "none,,Reboot"; + "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; + "ksmserver"."Shut Down" = "none,,Shut Down"; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cube" = "Meta+C\\, ,none"; - "kwin"."Cycle Overview" = []; - "kwin"."Cycle Overview Opposite" = []; - "kwin"."Decrease Opacity" = []; + "kwin"."Cycle Overview" = [ ]; + "kwin"."Cycle Overview Opposite" = [ ]; + "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "" "Launch (C)\\, ,Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."ExposeClassCurrentDesktop" = [ ]; "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = []; + "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = []; + "kwin"."Move Tablet to Next Output" = [ ]; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = []; - "kwin"."MoveZoomLeft" = []; - "kwin"."MoveZoomRight" = []; - "kwin"."MoveZoomUp" = []; + "kwin"."MoveZoomDown" = [ ]; + "kwin"."MoveZoomLeft" = [ ]; + "kwin"."MoveZoomRight" = [ ]; + "kwin"."MoveZoomUp" = [ ]; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = []; + "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; "kwin"."Show Desktop" = "Meta+D"; - "kwin"."ShowDesktopGrid" = "Meta+F8\\, ,none"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12\\, ,none"; "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; @@ -161,136 +158,136 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = []; - "kwin"."Switch to Desktop 11" = []; - "kwin"."Switch to Desktop 12" = []; - "kwin"."Switch to Desktop 13" = []; - "kwin"."Switch to Desktop 14" = []; - "kwin"."Switch to Desktop 15" = []; - "kwin"."Switch to Desktop 16" = []; - "kwin"."Switch to Desktop 17" = []; - "kwin"."Switch to Desktop 18" = []; - "kwin"."Switch to Desktop 19" = []; + "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; + "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; + "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; + "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; + "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; + "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; + "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; + "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; + "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; + "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = []; + "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = []; - "kwin"."Switch to Desktop 6" = []; - "kwin"."Switch to Desktop 7" = []; - "kwin"."Switch to Desktop 8" = []; - "kwin"."Switch to Desktop 9" = []; - "kwin"."Switch to Next Desktop" = []; - "kwin"."Switch to Next Screen" = []; - "kwin"."Switch to Previous Desktop" = []; - "kwin"."Switch to Previous Screen" = []; - "kwin"."Switch to Screen 0" = []; - "kwin"."Switch to Screen 1" = []; - "kwin"."Switch to Screen 2" = []; - "kwin"."Switch to Screen 3" = []; - "kwin"."Switch to Screen 4" = []; - "kwin"."Switch to Screen 5" = []; - "kwin"."Switch to Screen 6" = []; - "kwin"."Switch to Screen 7" = []; - "kwin"."Switch to Screen Above" = []; - "kwin"."Switch to Screen Below" = []; - "kwin"."Switch to Screen to the Left" = []; - "kwin"."Switch to Screen to the Right" = []; - "kwin"."Toggle Night Color" = []; - "kwin"."Toggle Window Raise/Lower" = []; - "kwin"."Walk Through Desktop List" = []; - "kwin"."Walk Through Desktop List (Reverse)" = []; - "kwin"."Walk Through Desktops" = []; - "kwin"."Walk Through Desktops (Reverse)" = []; + "kwin"."Switch to Desktop 5" = "none,,Switch to Desktop 5"; + "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; + "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; + "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; + "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; + "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; + "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; + "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; + "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; + "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; + "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; + "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; + "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; + "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; + "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; + "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; + "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; + "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; + "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; + "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; + "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; + "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; + "kwin"."Walk Through Desktop List" = [ ]; + "kwin"."Walk Through Desktop List (Reverse)" = [ ]; + "kwin"."Walk Through Desktops" = [ ]; + "kwin"."Walk Through Desktops (Reverse)" = [ ]; "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab\\, Alt+Shift+Tab\\, ,Alt+Shift+Tab,Walk Through Windows (Reverse)"; - "kwin"."Walk Through Windows Alternative" = []; - "kwin"."Walk Through Windows Alternative (Reverse)" = []; - "kwin"."Walk Through Windows of Current Application" = "\\, Alt+`\\, ,Alt+`,Walk Through Windows of Current Application"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab"; + "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; + "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = []; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; - "kwin"."Window Above Other Windows" = []; - "kwin"."Window Below Other Windows" = []; + "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; + "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; + "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; "kwin"."Window Close" = "Alt+F4"; - "kwin"."Window Fullscreen" = []; - "kwin"."Window Grow Horizontal" = []; - "kwin"."Window Grow Vertical" = []; - "kwin"."Window Lower" = []; + "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; + "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; + "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; + "kwin"."Window Lower" = "none,,Lower Window"; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = []; - "kwin"."Window Maximize Vertical" = []; + "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; + "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; "kwin"."Window Minimize" = "Meta+PgDown"; - "kwin"."Window Move" = []; - "kwin"."Window Move Center" = []; - "kwin"."Window No Border" = []; - "kwin"."Window On All Desktops" = []; + "kwin"."Window Move" = "none,,Move Window"; + "kwin"."Window Move Center" = "none,,Move Window to the Center"; + "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame"; + "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = []; - "kwin"."Window One Screen Up" = []; - "kwin"."Window One Screen to the Left" = []; - "kwin"."Window One Screen to the Right" = []; + "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; + "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; + "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; + "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = []; - "kwin"."Window Pack Left" = []; - "kwin"."Window Pack Right" = []; - "kwin"."Window Pack Up" = []; + "kwin"."Window Pack Down" = "none,,Move Window Down"; + "kwin"."Window Pack Left" = "none,,Move Window Left"; + "kwin"."Window Pack Right" = "none,,Move Window Right"; + "kwin"."Window Pack Up" = "none,,Move Window Up"; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; - "kwin"."Window Quick Tile Bottom Left" = []; - "kwin"."Window Quick Tile Bottom Right" = []; + "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; + "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right"; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window Quick Tile Top Left" = []; - "kwin"."Window Quick Tile Top Right" = []; - "kwin"."Window Raise" = []; - "kwin"."Window Resize" = []; - "kwin"."Window Shade" = []; - "kwin"."Window Shrink Horizontal" = []; - "kwin"."Window Shrink Vertical" = []; - "kwin"."Window to Desktop 1" = []; - "kwin"."Window to Desktop 10" = []; - "kwin"."Window to Desktop 11" = []; - "kwin"."Window to Desktop 12" = []; - "kwin"."Window to Desktop 13" = []; - "kwin"."Window to Desktop 14" = []; - "kwin"."Window to Desktop 15" = []; - "kwin"."Window to Desktop 16" = []; - "kwin"."Window to Desktop 17" = []; - "kwin"."Window to Desktop 18" = []; - "kwin"."Window to Desktop 19" = []; - "kwin"."Window to Desktop 2" = []; - "kwin"."Window to Desktop 20" = []; - "kwin"."Window to Desktop 3" = []; - "kwin"."Window to Desktop 4" = []; - "kwin"."Window to Desktop 5" = []; - "kwin"."Window to Desktop 6" = []; - "kwin"."Window to Desktop 7" = []; - "kwin"."Window to Desktop 8" = []; - "kwin"."Window to Desktop 9" = []; - "kwin"."Window to Next Desktop" = []; - "kwin"."Window to Next Screen" = "\\, Meta+Shift+Right\\, ,Meta+Shift+Right,Move Window to Next Screen"; - "kwin"."Window to Previous Desktop" = []; - "kwin"."Window to Previous Screen" = "\\, Meta+Shift+Left\\, ,Meta+Shift+Left,Move Window to Previous Screen"; - "kwin"."Window to Screen 0" = []; - "kwin"."Window to Screen 1" = []; - "kwin"."Window to Screen 2" = []; - "kwin"."Window to Screen 3" = []; - "kwin"."Window to Screen 4" = []; - "kwin"."Window to Screen 5" = []; - "kwin"."Window to Screen 6" = []; - "kwin"."Window to Screen 7" = []; - "kwin"."view_actual_size" = ",Meta+0,Zoom to Actual Size"; - "kwin"."view_zoom_in" = ["Meta++\\, Meta++" "Meta+=\\, Zoom In,Meta++" "Meta+=,Zoom In"]; + "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left"; + "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; + "kwin"."Window Raise" = "none,,Raise Window"; + "kwin"."Window Resize" = "none,,Resize Window"; + "kwin"."Window Shade" = "none,,Shade Window"; + "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; + "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; + "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1"; + "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; + "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; + "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; + "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; + "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; + "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; + "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; + "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; + "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; + "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; + "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2"; + "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; + "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3"; + "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4"; + "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; + "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; + "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; + "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; + "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; + "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; + "kwin"."Window to Next Screen" = "Meta+Shift+Right"; + "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; + "kwin"."Window to Previous Screen" = "Meta+Shift+Left"; + "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; + "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; + "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; + "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; + "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; + "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; + "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; + "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; + "kwin"."view_actual_size" = "\\, Meta+0\\, ,Meta+0,Zoom to Actual Size"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = "\\, ,,Media volume down"; - "mediacontrol"."mediavolumeup" = []; + "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumeup" = "none,,Media volume up"; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = []; + "mediacontrol"."playmedia" = "none,,Play media playback"; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; @@ -305,11 +302,11 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = []; - "org_kde_powerdevil"."powerProfile" = ["Battery" "" "Meta+B\\, ,Battery" "Meta+B,Switch Power Profile"]; - "plasmashell"."activate application launcher" = ["Meta" "" "Alt+F1\\, ,Meta" "Alt+F1,Activate Application Launcher"]; + "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = "\\, Meta+0\\, ,Meta+0,Activate Task Manager Entry 10"; + "plasmashell"."activate task manager entry 10" = ",Meta+0,Activate Task Manager Entry 10"; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -318,32 +315,32 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = []; + "plasmashell"."clear-history" = "none,,Clear Clipboard History"; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = []; - "plasmashell"."cyclePrevAction" = []; - "plasmashell"."edit_clipboard" = []; + "plasmashell"."cycleNextAction" = "none,,Next History Item"; + "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; + "plasmashell"."edit_clipboard" = [ ]; "plasmashell"."manage activities" = "Meta+Q"; - "plasmashell"."next activity" = ",none,Walk through activities"; + "plasmashell"."next activity" = "\\, \\, ,none,Walk through activities"; "plasmashell"."previous activity" = ",none,Walk through activities (Reverse)"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = []; + "plasmashell"."show-barcode" = "none,,Show Barcode…"; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = []; - "plasmashell"."switch to previous activity" = []; - "plasmashell"."toggle do not disturb" = []; + "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; + "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; + "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; "services/org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Ctrl+Shift+Space" "Search"]; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/org.kde.spectacle.desktop"."RecordRegion" = []; - "services/org.kde.spectacle.desktop"."RecordScreen" = []; - "services/org.kde.spectacle.desktop"."RecordWindow" = []; + "services/org.kde.spectacle.desktop"."RecordRegion" = [ ]; + "services/org.kde.spectacle.desktop"."RecordScreen" = [ ]; + "services/org.kde.spectacle.desktop"."RecordWindow" = [ ]; "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; @@ -352,7 +349,7 @@ "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.org.kde.spectacle.desktop"."RecordWindow" = [ ]; "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; @@ -361,7 +358,7 @@ "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; + "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = [ ]; "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; @@ -374,6 +371,7 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; + "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; @@ -449,7 +447,7 @@ "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; "katerc"."KTextEditor View"."Bracket Match Preview" = false; - "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}\x5b\x5d'\""; + "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}x5bx5d'\""; "katerc"."KTextEditor View"."Default Mark Type" = 1; "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; @@ -524,6 +522,8 @@ "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; + "kdeglobals"."General"."TerminalApplication" = "foot"; + "kdeglobals"."General"."TerminalService" = "org.codeberg.dnkl.foot.desktop"; "kdeglobals"."General"."XftAntialias" = true; "kdeglobals"."General"."XftHintStyle" = "hintslight"; "kdeglobals"."General"."XftSubPixel" = "rgb"; @@ -1139,23 +1139,19 @@ "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; "plasmanotifyrc"."Applications/firefox"."Seen" = true; + "plasmanotifyrc"."Applications/floorp"."Seen" = true; "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; + "plasmanotifyrc"."Applications/vesktop"."Seen" = true; "plasmanotifyrc"."Applications/webcord"."Seen" = true; "plasmarc"."Wallpapers"."usersWallpapers" = ""; + "spectaclerc"."Annotations"."annotationToolType" = 9; + "spectaclerc"."ImageSave"."lastImageSaveLocation" = "file:///home/lillian/Pictures/Screenshots/Screenshot_20241017_154815.png"; "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; dataFile = { "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; - "kate/anonymous.katesession"."Document 0"."Bookmarks" = ""; - "kate/anonymous.katesession"."Document 0"."Encoding" = "UTF-8"; - "kate/anonymous.katesession"."Document 0"."Highlighting" = "None"; - "kate/anonymous.katesession"."Document 0"."Highlighting Set By User" = false; - "kate/anonymous.katesession"."Document 0"."Indentation Mode" = "normal"; - "kate/anonymous.katesession"."Document 0"."Mode" = "Normal"; - "kate/anonymous.katesession"."Document 0"."Mode Set By User" = false; - "kate/anonymous.katesession"."Document 0"."URL" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; @@ -1187,26 +1183,25 @@ "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; - "kate/anonymous.katesession"."MainWindow0"."1920x1080 screen: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,1874,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,2514,0"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 1287; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 929; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 1287; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 1874; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 2514; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 1634; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 2560; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; @@ -1236,34 +1231,19 @@ "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,927,0"; + "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,1285,0"; "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."1920x1080 screen: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0 Settings"."2 screens: Window-Maximized" = true; "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 1874; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Active View" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 1; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."View 0" = "file:///run/media/lillian/46a00cf0-3041-4358-b489-344fe2cf6fbf/libraryfolder.vdf"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorColumn" = 33; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."CursorLine" = 350; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."Dynamic Word Wrap" = true; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."TextFolding" = "{\"checksum\":\"74be57c9991161c81bdaf706a15a5e808c32f8ba\",\"ranges\":[]}"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/home\\/lillian\\/.config\\/plasma-org.kde.plasma.desktop-appletsrc"."ViMarks" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorColumn" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."CursorLine" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."Dynamic Word Wrap" = true; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."JumpList" = ""; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."TextFolding" = "{\"checksum\":\"f5613e44db950aa2dd0b0ddcb25af701642f2f7b\",\"ranges\":\x5b\x5d}"; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0 file:\\/\\/\\/run\\/media\\/lillian\\/46a00cf0-3041-4358-b489-344fe2cf6fbf\\/libraryfolder.vdf"."ViMarks" = ""; - "kate/anonymous.katesession"."Open Documents"."Count" = 1; + "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 2514; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 0; + "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = ""; + "kate/anonymous.katesession"."Open Documents"."Count" = 0; "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index f0a5c0d..232f5d7 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -52,7 +52,7 @@ home.packages = with pkgs; [ #Chat: - webcord-vencord + vesktop #Gaming: prismlauncher From ff1ea30d3538698f15efc47008f07b9deafc9c1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 19:23:24 +0200 Subject: [PATCH 138/395] remove the double option --- .../package-configs/plasma-desktop.nix | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index a0c23f2..5b52ea1 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -103,14 +103,14 @@ ]; shortcuts = { - "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [ ]; + "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; - "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; + "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."decrease_volume_small" = "Shift+Volume Down"; @@ -128,24 +128,24 @@ "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; "ksmserver"."Shut Down" = "none,,Shut Down"; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Cycle Overview" = [ ]; - "kwin"."Cycle Overview Opposite" = [ ]; + "kwin"."Cycle Overview" = []; + "kwin"."Cycle Overview Opposite" = []; "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; - "kwin"."ExposeClassCurrentDesktop" = [ ]; + "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; - "kwin"."Move Tablet to Next Output" = [ ]; + "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; - "kwin"."MoveZoomDown" = [ ]; - "kwin"."MoveZoomLeft" = [ ]; - "kwin"."MoveZoomRight" = [ ]; - "kwin"."MoveZoomUp" = [ ]; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; "kwin"."Show Desktop" = "Meta+D"; @@ -193,12 +193,12 @@ "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; - "kwin"."Toggle Night Color" = [ ]; + "kwin"."Toggle Night Color" = []; "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; - "kwin"."Walk Through Desktop List" = [ ]; - "kwin"."Walk Through Desktop List (Reverse)" = [ ]; - "kwin"."Walk Through Desktops" = [ ]; - "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab"; "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; @@ -283,7 +283,7 @@ "kwin"."view_actual_size" = "\\, Meta+0\\, ,Meta+0,Zoom to Actual Size"; "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = [ ]; + "mediacontrol"."mediavolumedown" = []; "mediacontrol"."mediavolumeup" = "none,,Media volume up"; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; @@ -302,7 +302,7 @@ "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."Turn Off Screen" = [ ]; + "org_kde_powerdevil"."Turn Off Screen" = []; "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; @@ -320,7 +320,7 @@ "plasmashell"."cycle-panels" = "Meta+Alt+P"; "plasmashell"."cycleNextAction" = "none,,Next History Item"; "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; - "plasmashell"."edit_clipboard" = [ ]; + "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; "plasmashell"."next activity" = "\\, \\, ,none,Walk through activities"; "plasmashell"."previous activity" = ",none,Walk through activities (Reverse)"; @@ -338,9 +338,9 @@ "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/org.kde.spectacle.desktop"."RecordRegion" = [ ]; - "services/org.kde.spectacle.desktop"."RecordScreen" = [ ]; - "services/org.kde.spectacle.desktop"."RecordWindow" = [ ]; + "services/org.kde.spectacle.desktop"."RecordRegion" = []; + "services/org.kde.spectacle.desktop"."RecordScreen" = []; + "services/org.kde.spectacle.desktop"."RecordWindow" = []; "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; @@ -349,7 +349,7 @@ "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.org.kde.spectacle.desktop"."RecordWindow" = [ ]; + "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; @@ -358,7 +358,7 @@ "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; - "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = [ ]; + "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; @@ -373,7 +373,6 @@ "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; - "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; "dolphinrc"."IconsMode"."PreviewSize" = 80; From 05695869294ebd90b9ef7c6711ff3de8fabe84b2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 19:25:27 +0200 Subject: [PATCH 139/395] and this one too --- home-manager/desktop/package-configs/plasma-desktop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 5b52ea1..b1f5c6a 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -371,7 +371,6 @@ "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; - "dolphinrc"."ExtractDialog"."DirHistory\x5b$e\x5d" = "/home/"; "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; "dolphinrc"."General"."RememberOpenedTabs" = false; "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; From 7dc88f7d179a0366b7568aea3fa09032634f79fc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 20:22:51 +0200 Subject: [PATCH 140/395] added binary cache for conduwuit --- nixos/shared/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1138ad2..a845b75 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -43,12 +43,14 @@ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://0uptime.cachix.org" + "https://attic.kennel.juneis.dog/conduit" ]; trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + "conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" ]; }; }; From 6bb1eacee5a1a0d4d3c18372bf1cd96ecfa1ec46 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 20:24:20 +0200 Subject: [PATCH 141/395] get conduwuit from nixpkgs instead of the flake to see if that helps --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 95a8488..ad54e13 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - conduwuit = { - url = "github:girlbossceo/conduwuit"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # conduwuit = { + # url = "github:girlbossceo/conduwuit"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; From 740a5569ed3a56d807ece99aef8da04022cf2fe7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 20:32:10 +0200 Subject: [PATCH 142/395] that wasn't the issue, the module is just broken for conduwuit --- flake.lock | 82 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 0af5b3e..3a35b0a 100644 --- a/flake.lock +++ b/flake.lock @@ -168,23 +168,19 @@ "flake-utils": "flake-utils_3", "liburing": "liburing", "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_4", "rocksdb": "rocksdb" }, "locked": { "lastModified": 1728182038, "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", - "owner": "girlbossceo", - "repo": "conduwuit", + "path": "/nix/store/csa59jjycsli8iv9yzf9fcch9dyqza4f-source", "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", - "type": "github" + "type": "path" }, "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" + "id": "conduwuit", + "type": "indirect" } }, "crane": { @@ -775,7 +771,7 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1729177642, @@ -796,7 +792,7 @@ "crane": "crane_4", "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -1184,6 +1180,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1692808169, @@ -1217,6 +1229,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -1232,7 +1260,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1728897630, "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", @@ -1248,7 +1276,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1729256560, "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", @@ -1264,7 +1292,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1279,7 +1307,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1728093190, "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", @@ -1295,22 +1323,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1419,7 +1431,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1508,7 +1520,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1528,7 +1540,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { @@ -1645,7 +1657,7 @@ "inputs": { "crane": "crane_5", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { From 3cac203b34ed7f080ae9a19a63201292bf1060f4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 20:36:26 +0200 Subject: [PATCH 143/395] Wait what was that last commit? Strange, this is the uncommenting of using the main brainch of conduwuit --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index ad54e13..95a8488 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - # conduwuit = { - # url = "github:girlbossceo/conduwuit"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + conduwuit = { + url = "github:girlbossceo/conduwuit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; From 2d049fc3380eba096df67874199a8525662d65c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 22:22:38 +0200 Subject: [PATCH 144/395] add fira code nerdfonts --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index ff3e59c..da14be4 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -67,6 +67,7 @@ twemoji-color-font font-awesome atkinson-hyperlegible + fira-code-nerdfont ]; enableDefaultPackages = false; }; From fadac90c9e57febe3dc2cc720bf5fa48f8f12036 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Oct 2024 22:25:06 +0200 Subject: [PATCH 145/395] update flake lock for conduwuit --- flake.lock | 88 +++++++++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 3a35b0a..4e6720b 100644 --- a/flake.lock +++ b/flake.lock @@ -168,19 +168,23 @@ "flake-utils": "flake-utils_3", "liburing": "liburing", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", - "path": "/nix/store/csa59jjycsli8iv9yzf9fcch9dyqza4f-source", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", - "type": "path" + "lastModified": 1729355720, + "narHash": "sha256-WRUhmmQznBwm2pcD5uHgmwcExLX04zY5kf3cPL8VWA8=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "8428e7cdf739fc1ce2dd34b96b6ff95b22d0d4b7", + "type": "github" }, "original": { - "id": "conduwuit", - "type": "indirect" + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" } }, "crane": { @@ -771,7 +775,7 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1729177642, @@ -792,7 +796,7 @@ "crane": "crane_4", "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -1180,22 +1184,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1692808169, @@ -1229,22 +1217,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -1260,7 +1232,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1728897630, "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", @@ -1276,7 +1248,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1729256560, "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", @@ -1292,7 +1264,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1307,7 +1279,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1728093190, "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", @@ -1323,6 +1295,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1431,7 +1419,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1520,7 +1508,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1540,7 +1528,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { @@ -1657,7 +1645,7 @@ "inputs": { "crane": "crane_5", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "rust-overlay": "rust-overlay_2" }, "locked": { From bb12b48232d701cf628c122c859122dee459d7cf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 20 Oct 2024 18:56:59 +0200 Subject: [PATCH 146/395] add colour emoji --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index da14be4..6f28f40 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -54,6 +54,7 @@ fonts = { packages = with pkgs; [ + noto-fonts-emoji-blob-bin cantarell-fonts dejavu_fonts fira-code From 35aa76ffd5d3b07c757c88dcb9c99055316b52b4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 20 Oct 2024 19:30:10 +0200 Subject: [PATCH 147/395] enable waydroid by default on glados --- nixos/hosts/GLaDOS/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 9b79122..998fdde 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -84,6 +84,7 @@ }; }; + virtualisation.waydroid.enable = true; networking.hostName = "GLaDOS"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From 3fd49033d8040a864bc6ee8fa0e86b3a9be35962 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 22 Oct 2024 14:00:31 +0200 Subject: [PATCH 148/395] disable global mangohud to not crash nms --- home-manager/hosts/GLaDOS/lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index c71456a..ce503f7 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -29,7 +29,7 @@ programs.mangohud = { enable = true; - enableSessionWide = true; + # enableSessionWide = true; }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From eda608dac0d6af2b9a57de72b0d5de8a6a3a336b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 13:58:45 +0200 Subject: [PATCH 149/395] This probably doesn't work as I don't pass stdin through just, but as a draft, run jupyter in helix! --- home-manager/shared/shell/helix/default.nix | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 76304ef..444f72b 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -16,6 +16,31 @@ zellij action toggle-floating-panes zellij action close-pane ''; + jupyter = + pkgs.writeText "run_jupyter_from_helix.zsh" + '' + #! ~/.nix-profile/bin/zsh + function new() { + new=true; + touch /tmp/rjh; + cat /tmp/rjh | while read line + do + if $(pwd) = line; then + new=false; + fi + done + echo new; + } + + function send_to_jupyter() { + if $(new); then + zellij run -f -n "jupyter console" jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' + pwd >> /tmp/rjh + fi + zellij write 29 25 # send ctr + w + just send + } + ''; in { programs.helix = { enable = true; @@ -29,6 +54,7 @@ in { t = ":sh zellij run -f -n 'test code' -- direnv exec . just test"; g = ":sh zellij run -fc -n 'lazygit' -- lazygit"; f = ":sh zellij run --floating -n 'yazi picker' -- zsh ~/.config/helix/open_in_helix_from_yazi.zsh "; + j = ":pipe-to just jupyter"; }; editor = { line-number = "relative"; From adbeee4fd22f7a9da37ddf0b6429991f99ac4675 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:07:47 +0200 Subject: [PATCH 150/395] This might work to pipe through stdin --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 444f72b..a68728a 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -38,7 +38,7 @@ pwd >> /tmp/rjh fi zellij write 29 25 # send ctr + w - just send + cat | just send } ''; in { From 85a08aba596e20b247699cdedc4fb980594767d2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:11:21 +0200 Subject: [PATCH 151/395] Update flake lock --- flake.lock | 144 +++++++++++++++++++++++++---------------------------- 1 file changed, 69 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index 63d14af..0d571b2 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728525495, - "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", + "lastModified": 1728768056, + "narHash": "sha256-nDz1+eO5ziimxiyqtKVT3Gj9OZfk3WVhC4czo6EGec8=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", + "rev": "4f9293b045cf32dfc629ce300180d311aba8f53a", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", + "lastModified": 1729355720, + "narHash": "sha256-WRUhmmQznBwm2pcD5uHgmwcExLX04zY5kf3cPL8VWA8=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", + "rev": "8428e7cdf739fc1ce2dd34b96b6ff95b22d0d4b7", "type": "github" }, "original": { @@ -247,18 +247,12 @@ } }, "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1728776144, + "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "f876e3d905b922502f031aeec1a84490122254b7", "type": "github" }, "original": { @@ -358,11 +352,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1729588208, + "narHash": "sha256-PNONdMd+sG7JWzNIDerX7oVZXL8FTVlSAZ1BmUo2HjE=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "4be2aadf13b67ffbb993deb73adff77c46b728fc", "type": "github" }, "original": { @@ -579,11 +573,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -764,11 +758,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1729551526, + "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", "type": "github" }, "original": { @@ -784,11 +778,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1729492135, + "narHash": "sha256-yXmCZaw0Pe4H9Xv3BDSoQdSulevJMH34XrtQD3v7aoY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "82bdda12079fbbe40cd1e26d3cbbf5093ea052c0", "type": "github" }, "original": { @@ -807,11 +801,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1729064530, + "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", "type": "github" }, "original": { @@ -936,11 +930,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1729394935, + "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "type": "github" }, "original": { @@ -982,11 +976,11 @@ }, "nixlib": { "locked": { - "lastModified": 1728176478, - "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1003,11 +997,11 @@ ] }, "locked": { - "lastModified": 1728522165, - "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -1018,11 +1012,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1729624485, + "narHash": "sha256-iEffyT68tEU5kHQuyP05QRH+JhWNNLAwHfgZAzXFS7o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "22e8de2729f40d29a445c8baeaf22740b8b25daf", "type": "github" }, "original": { @@ -1065,11 +1059,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728565888, - "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", + "lastModified": 1729684406, + "narHash": "sha256-ogE0sFjMltcKiuLnP/yBhRfQhw00LE69E1ARgAV18Kg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", + "rev": "148aa178a9ab4c98b55b85d2935f3e1722130c51", "type": "github" }, "original": { @@ -1160,11 +1154,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729357638, + "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", "type": "github" }, "original": { @@ -1176,11 +1170,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1224,11 +1218,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1240,11 +1234,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", + "lastModified": 1728897630, + "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc", "type": "github" }, "original": { @@ -1256,11 +1250,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1287,11 +1281,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -1327,11 +1321,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1729372184, + "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1", "type": "github" }, "original": { @@ -1381,11 +1375,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -1476,11 +1470,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1728959392, + "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "type": "github" }, "original": { @@ -1538,11 +1532,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729669122, + "narHash": "sha256-SpS3rSwYcskdOpx+jeCv1lcZDdkT/K5qT8dlenCBQ8c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "a4c33bfecb93458d90f9eb26f1cf695b47285243", "type": "github" }, "original": { From 872aefb0ad25e156c0391176d7db1598b07ded90 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:16:49 +0200 Subject: [PATCH 152/395] downgrade flake.lock --- flake.lock | 144 ++++++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 0d571b2..63d14af 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728768056, - "narHash": "sha256-nDz1+eO5ziimxiyqtKVT3Gj9OZfk3WVhC4czo6EGec8=", + "lastModified": 1728525495, + "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "4f9293b045cf32dfc629ce300180d311aba8f53a", + "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1729355720, - "narHash": "sha256-WRUhmmQznBwm2pcD5uHgmwcExLX04zY5kf3cPL8VWA8=", + "lastModified": 1728182038, + "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8428e7cdf739fc1ce2dd34b96b6ff95b22d0d4b7", + "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", "type": "github" }, "original": { @@ -247,12 +247,18 @@ } }, "crane_4": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1728776144, - "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", + "lastModified": 1721842668, + "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", "owner": "ipetkov", "repo": "crane", - "rev": "f876e3d905b922502f031aeec1a84490122254b7", + "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", "type": "github" }, "original": { @@ -352,11 +358,11 @@ ] }, "locked": { - "lastModified": 1729588208, - "narHash": "sha256-PNONdMd+sG7JWzNIDerX7oVZXL8FTVlSAZ1BmUo2HjE=", + "lastModified": 1728334376, + "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", "owner": "nix-community", "repo": "disko", - "rev": "4be2aadf13b67ffbb993deb73adff77c46b728fc", + "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", "type": "github" }, "original": { @@ -573,11 +579,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -758,11 +764,11 @@ ] }, "locked": { - "lastModified": 1729551526, - "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -778,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1729492135, - "narHash": "sha256-yXmCZaw0Pe4H9Xv3BDSoQdSulevJMH34XrtQD3v7aoY=", + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "82bdda12079fbbe40cd1e26d3cbbf5093ea052c0", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", "type": "github" }, "original": { @@ -801,11 +807,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1729064530, - "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", + "lastModified": 1728199407, + "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", + "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", "type": "github" }, "original": { @@ -930,11 +936,11 @@ ] }, "locked": { - "lastModified": 1729394935, - "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", + "lastModified": 1728263287, + "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", + "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "type": "github" }, "original": { @@ -976,11 +982,11 @@ }, "nixlib": { "locked": { - "lastModified": 1729386149, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1728176478, + "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", + "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "type": "github" }, "original": { @@ -997,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1729472750, - "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", + "lastModified": 1728522165, + "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", + "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", "type": "github" }, "original": { @@ -1012,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729624485, - "narHash": "sha256-iEffyT68tEU5kHQuyP05QRH+JhWNNLAwHfgZAzXFS7o=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "22e8de2729f40d29a445c8baeaf22740b8b25daf", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { @@ -1059,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1729684406, - "narHash": "sha256-ogE0sFjMltcKiuLnP/yBhRfQhw00LE69E1ARgAV18Kg=", + "lastModified": 1728565888, + "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "148aa178a9ab4c98b55b85d2935f3e1722130c51", + "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", "type": "github" }, "original": { @@ -1154,11 +1160,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1729357638, - "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -1170,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1218,11 +1224,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1234,11 +1240,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1728897630, - "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", + "lastModified": 1722264024, + "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc", + "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", "type": "github" }, "original": { @@ -1250,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1281,11 +1287,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1728093190, + "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", "type": "github" }, "original": { @@ -1321,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1729372184, - "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=", + "lastModified": 1727917089, + "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1", + "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", "type": "github" }, "original": { @@ -1375,11 +1381,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -1470,11 +1476,11 @@ ] }, "locked": { - "lastModified": 1728959392, - "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", + "lastModified": 1722219664, + "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", + "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", "type": "github" }, "original": { @@ -1532,11 +1538,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1729669122, - "narHash": "sha256-SpS3rSwYcskdOpx+jeCv1lcZDdkT/K5qT8dlenCBQ8c=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a4c33bfecb93458d90f9eb26f1cf695b47285243", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { From 8a84837169ce0ff1cc94153b7593a1e814203472 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:19:04 +0200 Subject: [PATCH 153/395] Add the old cinny to allowed insecure packages as well --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 3d59b2c..947d6dd 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -22,7 +22,7 @@ ./package-configs/foot ]; nixpkgs = { - config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2"]; + config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2" "cinny-4.2.1" "cinny-unwrapped-4.2.1"]; # You can add overlays here overlays = [ # You can also add overlays exported from other flakes: From c85e43022936e621aa6ede2388ed8f96df634133 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:24:05 +0200 Subject: [PATCH 154/395] maybe write the zsh file too haha --- home-manager/shared/shell/helix/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index a68728a..40f6f00 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -211,4 +211,10 @@ in { target = ".config/helix/open_in_helix_from_yazi.zsh"; }; }; + home.file = { + "jupyter" = { + source = "${jupyter}"; + target = ".config/helix/run_jupyter_from_helix.zsh"; + }; + }; } From 91a3bab42a895601ddeb956929e0601d55ae3f64 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:35:05 +0200 Subject: [PATCH 155/395] make it into a basic bash file --- home-manager/shared/shell/helix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 40f6f00..62f6ad5 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -17,7 +17,7 @@ zellij action close-pane ''; jupyter = - pkgs.writeText "run_jupyter_from_helix.zsh" + pkgs.writeText "run_jupyter_from_helix.sh" '' #! ~/.nix-profile/bin/zsh function new() { @@ -214,7 +214,7 @@ in { home.file = { "jupyter" = { source = "${jupyter}"; - target = ".config/helix/run_jupyter_from_helix.zsh"; + target = ".config/helix/run_jupyter_from_helix.sh"; }; }; } From c71d150b9bbe6e7e6c262c5d77680d81664e623b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:39:05 +0200 Subject: [PATCH 156/395] maybe add a function call to at least run the damn thing --- home-manager/shared/shell/helix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 62f6ad5..6ee0596 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -40,6 +40,7 @@ zellij write 29 25 # send ctr + w cat | just send } + send_to_jupyter ''; in { programs.helix = { From c3717a09912282ea62c7b4977f3dcb4871935c2d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:42:22 +0200 Subject: [PATCH 157/395] the sh zsh thing was a red herring undo that --- home-manager/shared/shell/helix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 6ee0596..a5b274f 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -17,7 +17,7 @@ zellij action close-pane ''; jupyter = - pkgs.writeText "run_jupyter_from_helix.sh" + pkgs.writeText "run_jupyter_from_helix.zsh" '' #! ~/.nix-profile/bin/zsh function new() { @@ -215,7 +215,7 @@ in { home.file = { "jupyter" = { source = "${jupyter}"; - target = ".config/helix/run_jupyter_from_helix.sh"; + target = ".config/helix/run_jupyter_from_helix.zsh"; }; }; } From b65674b143a7dda5aaa6bdb78ab9d250abf3415f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 14:59:54 +0200 Subject: [PATCH 158/395] the jupyter command was wrong oopsie --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index a5b274f..6b8d06d 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -34,7 +34,7 @@ function send_to_jupyter() { if $(new); then - zellij run -f -n "jupyter console" jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' + zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' pwd >> /tmp/rjh fi zellij write 29 25 # send ctr + w From 990596e7672098c1e339f7493794eff2d8691c16 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 17:42:51 +0200 Subject: [PATCH 159/395] change the / in the pwd for the json file to - --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 6b8d06d..eebddc4 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -34,7 +34,7 @@ function send_to_jupyter() { if $(new); then - zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' + zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr\"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' pwd >> /tmp/rjh fi zellij write 29 25 # send ctr + w From 418e6d7b0161e7eb474a87844b7b82a65f7366d4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 17:45:15 +0200 Subject: [PATCH 160/395] needs a space there --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index eebddc4..8d539d4 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -34,7 +34,7 @@ function send_to_jupyter() { if $(new); then - zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr\"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' + zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' pwd >> /tmp/rjh fi zellij write 29 25 # send ctr + w From 9fa6c2e95a38c3ccbe5f56a29b4cc592303712f2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 17:48:11 +0200 Subject: [PATCH 161/395] maybe the names conflict --- home-manager/shared/shell/helix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 8d539d4..55e0684 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -20,7 +20,7 @@ pkgs.writeText "run_jupyter_from_helix.zsh" '' #! ~/.nix-profile/bin/zsh - function new() { + function is_new() { new=true; touch /tmp/rjh; cat /tmp/rjh | while read line @@ -33,7 +33,7 @@ } function send_to_jupyter() { - if $(new); then + if $(is_new); then zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' pwd >> /tmp/rjh fi From 6bf5b9dd086aea982e3a3c10fd488af590e4dc32 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 17:51:22 +0200 Subject: [PATCH 162/395] this might need braces actually --- home-manager/shared/shell/helix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 55e0684..5e13503 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -25,7 +25,7 @@ touch /tmp/rjh; cat /tmp/rjh | while read line do - if $(pwd) = line; then + if [$(pwd) = line]; then new=false; fi done From 8d04d9c64963065940ebfbc9e68a365de317522f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 19:13:18 +0200 Subject: [PATCH 163/395] Gotta commit before battery runs out, almost finished! --- home-manager/shared/shell/helix/default.nix | 25 +++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 5e13503..32a2672 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -20,24 +20,21 @@ pkgs.writeText "run_jupyter_from_helix.zsh" '' #! ~/.nix-profile/bin/zsh - function is_new() { - new=true; + is_new() { + new=1; touch /tmp/rjh; - cat /tmp/rjh | while read line - do - if [$(pwd) = line]; then - new=false; + while IFS="" read -r p || [ -n "$p" ]; do + if [ $(pwd) = $p ]; then + new=0; fi - done - echo new; + done < /tmp/rjh + return $new } - function send_to_jupyter() { - if $(is_new); then - zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' - pwd >> /tmp/rjh - fi - zellij write 29 25 # send ctr + w + send_to_jupyter() { + is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 + pwd >> /tmp/rjh + zellij action write 29 25 cat | just send } send_to_jupyter From 13dce0eae81b1cf42b3314a99912144d1d446dec Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 25 Oct 2024 13:20:35 +0200 Subject: [PATCH 164/395] add clean command to just --- justfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/justfile b/justfile index b0aad0e..f349229 100644 --- a/justfile +++ b/justfile @@ -9,3 +9,6 @@ test: update: nix flake update + +clean: + sudo nix-collect-garbage From 5d3515f9a5fa99947d07cded14f0aa54e8d79bcc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 25 Oct 2024 13:21:02 +0200 Subject: [PATCH 165/395] still not working but some updates to the helix jupyter script --- home-manager/shared/shell/helix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 32a2672..a50bfd2 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -32,9 +32,10 @@ } send_to_jupyter() { - is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 + is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 && zellij action write 17 pwd >> /tmp/rjh zellij action write 29 25 + zellij action write 17 cat | just send } send_to_jupyter From 810547052063429d7649fc9967b1e780070a09c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 25 Oct 2024 13:23:48 +0200 Subject: [PATCH 166/395] add optimise to the clean command --- justfile | 1 + 1 file changed, 1 insertion(+) diff --git a/justfile b/justfile index f349229..a6da660 100644 --- a/justfile +++ b/justfile @@ -12,3 +12,4 @@ update: clean: sudo nix-collect-garbage + sudo nix-store --optimise From 654e81ed02ae2defb4f00fbe4d75c0ae115a5406 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 27 Oct 2024 19:05:36 +0100 Subject: [PATCH 167/395] Remove and disable waydroid, it's too laggy and weird --- nixos/desktop/default.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 4b0123a..d5e185f 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -61,7 +61,7 @@ tpm2-tss virtualgl vulkan-tools - waydroid + # waydroid waypipe wayland-utils xwaylandvideobridge diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 998fdde..5128343 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -84,7 +84,7 @@ }; }; - virtualisation.waydroid.enable = true; + # virtualisation.waydroid.enable = false; networking.hostName = "GLaDOS"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion From 441a7dcb60a4fc8aaa7f53fb671c918f2ee3d7fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 27 Oct 2024 23:52:40 +0100 Subject: [PATCH 168/395] add nil (nix language server) to shared home manager --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 799caca..f21747d 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -35,6 +35,7 @@ lazygit navi yazi + nil ]; programs.navi.enable = true; } From 415903451f90a69b1cf9a0875e94bfdf2d6832f7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 28 Oct 2024 00:17:05 +0100 Subject: [PATCH 169/395] remove all unecessary imports for cleaner code :) --- home-manager/desktop/package-configs/firefox.nix | 6 +----- home-manager/desktop/package-configs/foot/default.nix | 7 +------ home-manager/desktop/package-configs/konsole/default.nix | 7 +------ home-manager/hosts/EDI/default.nix | 9 +-------- home-manager/hosts/EDI/lillian.nix | 9 +-------- home-manager/hosts/GLaDOS/default.nix | 9 +-------- home-manager/hosts/GLaDOS/lillian.nix | 9 +-------- home-manager/hosts/iso/default.nix | 9 +-------- home-manager/hosts/iso/lillian.nix | 9 +-------- home-manager/hosts/iso_server/default.nix | 9 +-------- home-manager/hosts/iso_server/lillian.nix | 9 +-------- home-manager/hosts/queen/default.nix | 9 +-------- home-manager/hosts/queen/lillian.nix | 9 +-------- home-manager/hosts/shodan/default.nix | 9 +-------- home-manager/hosts/shodan/lillian.nix | 9 +-------- home-manager/hosts/wheatley/default.nix | 9 +-------- home-manager/hosts/wheatley/lillian.nix | 9 +-------- home-manager/shared/default.nix | 9 +-------- home-manager/shared/shell/bat.nix | 6 +----- home-manager/shared/shell/eza.nix | 2 +- home-manager/shared/shell/helix/default.nix | 7 +------ home-manager/shared/shell/hyfetch.nix | 7 +------ home-manager/shared/shell/zellij/default.nix | 1 - home-manager/shared/shell/zsh.nix | 9 +-------- nixos/board/package-configs/pi-hole/default.nix | 9 +-------- nixos/desktop/default.nix | 1 - nixos/desktop/package-configs/default.nix | 9 +-------- nixos/hosts/EDI/configuration.nix | 1 - nixos/hosts/EDI/hardware-configuration.nix | 1 - nixos/hosts/GLaDOS/configuration.nix | 2 -- nixos/hosts/GLaDOS/hardware-configuration.nix | 1 - nixos/hosts/iso/configuration.nix | 2 -- nixos/hosts/iso_server/configuration.nix | 2 -- nixos/hosts/queen/configuration.nix | 2 -- nixos/hosts/queen/hardware-configuration.nix | 2 -- nixos/hosts/shodan/auto-mount.nix | 9 +-------- nixos/hosts/shodan/configuration.nix | 1 - nixos/hosts/shodan/hardware-configuration.nix | 1 - nixos/hosts/wheatley/armv7l.nix | 6 +----- nixos/hosts/wheatley/hardware-configuration.nix | 2 -- nixos/server/default.nix | 9 +-------- nixos/server/package-configs/akkoma/default.nix | 3 --- nixos/server/package-configs/aria2/container.nix | 6 +----- nixos/server/package-configs/aria2/default.nix | 8 +------- nixos/server/package-configs/cinny/default.nix | 8 +------- nixos/server/package-configs/conduit/default.nix | 1 - nixos/server/package-configs/coturn/default.nix | 6 +----- nixos/server/package-configs/dashboard/default.nix | 9 +-------- .../server/package-configs/dashboard/grafana/default.nix | 6 +----- nixos/server/package-configs/dashboard/loki/default.nix | 6 +----- .../package-configs/dashboard/prometheus/default.nix | 6 +----- .../package-configs/dashboard/telegraf/default.nix | 9 +-------- nixos/server/package-configs/default.nix | 9 +-------- nixos/server/package-configs/forgejo/default.nix | 9 +-------- nixos/server/package-configs/gotosocial/default.nix | 9 +-------- nixos/server/package-configs/jellyfin/default.nix | 9 +-------- nixos/server/package-configs/mail-server/default.nix | 9 +-------- nixos/server/package-configs/ombi/default.nix | 6 +----- nixos/server/package-configs/phanpy/default.nix | 8 +------- nixos/server/package-configs/postgres/default.nix | 6 +----- nixos/server/package-configs/roundcube/default.nix | 1 - nixos/shared/default.nix | 2 -- nixos/shared/locale/default.nix | 9 +-------- nixos/shared/packages/default.nix | 3 --- pkgs/auto-mount/default.nix | 5 ----- pkgs/dvd/default.nix | 2 -- pkgs/dvt/default.nix | 2 -- pkgs/install-nix-no-inhibit/default.nix | 2 -- pkgs/install-nix/default.nix | 6 +----- pkgs/rebuild-no-inhibit/default.nix | 6 +----- pkgs/rebuild/default.nix | 6 +----- pkgs/restart/default.nix | 6 +----- pkgs/update/default.nix | 6 +----- pkgs/upgrade/default.nix | 6 +----- 74 files changed, 52 insertions(+), 390 deletions(-) diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 43f4854..16ad709 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix index 464925f..f1839dc 100644 --- a/home-manager/desktop/package-configs/foot/default.nix +++ b/home-manager/desktop/package-configs/foot/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - inputs, - ... -}: { +{...}: { programs.foot = { enable = true; catppuccin.enable = true; diff --git a/home-manager/desktop/package-configs/konsole/default.nix b/home-manager/desktop/package-configs/konsole/default.nix index a704737..e8d5f29 100644 --- a/home-manager/desktop/package-configs/konsole/default.nix +++ b/home-manager/desktop/package-configs/konsole/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - inputs, - ... -}: { +{...}: { home.file = { "profile" = { source = ./Catppuccin.profile; diff --git a/home-manager/hosts/EDI/default.nix b/home-manager/hosts/EDI/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/EDI/default.nix +++ b/home-manager/hosts/EDI/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 351470d..f0cd853 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/GLaDOS/default.nix b/home-manager/hosts/GLaDOS/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/GLaDOS/default.nix +++ b/home-manager/hosts/GLaDOS/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index ce503f7..0841ff3 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/iso/default.nix b/home-manager/hosts/iso/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/iso/default.nix +++ b/home-manager/hosts/iso/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index 351470d..f0cd853 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/iso_server/default.nix b/home-manager/hosts/iso_server/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/iso_server/default.nix +++ b/home-manager/hosts/iso_server/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/iso_server/lillian.nix b/home-manager/hosts/iso_server/lillian.nix index 9acd9c2..278806e 100644 --- a/home-manager/hosts/iso_server/lillian.nix +++ b/home-manager/hosts/iso_server/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/queen/default.nix b/home-manager/hosts/queen/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/queen/default.nix +++ b/home-manager/hosts/queen/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index 680ef4e..5acc4b0 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/shodan/default.nix b/home-manager/hosts/shodan/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/shodan/default.nix +++ b/home-manager/hosts/shodan/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 232f5d7..52f1d3d 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/wheatley/default.nix b/home-manager/hosts/wheatley/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/wheatley/default.nix +++ b/home-manager/hosts/wheatley/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/wheatley/lillian.nix b/home-manager/hosts/wheatley/lillian.nix index c3778c3..afb1b42 100644 --- a/home-manager/hosts/wheatley/lillian.nix +++ b/home-manager/hosts/wheatley/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index f21747d..07f7fde 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = [ ./shell/helix ./shell/zellij diff --git a/home-manager/shared/shell/bat.nix b/home-manager/shared/shell/bat.nix index 21acc30..2afdce3 100644 --- a/home-manager/shared/shell/bat.nix +++ b/home-manager/shared/shell/bat.nix @@ -1,8 +1,4 @@ -{ - lib, - pkgs, - ... -}: { +{pkgs, ...}: { programs.bat = { enable = true; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; diff --git a/home-manager/shared/shell/eza.nix b/home-manager/shared/shell/eza.nix index b0c72f2..df2968b 100644 --- a/home-manager/shared/shell/eza.nix +++ b/home-manager/shared/shell/eza.nix @@ -1,4 +1,4 @@ -{lib, ...}: { +{...}: { programs.eza = { enable = true; enableZshIntegration = true; diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index a50bfd2..bba04a9 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: let +{pkgs, ...}: let yazi = pkgs.writeText "open_in_helix_from_yazi.zsh" '' diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix index 0945e59..774a3d7 100644 --- a/home-manager/shared/shell/hyfetch.nix +++ b/home-manager/shared/shell/hyfetch.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{...}: { programs.hyfetch = { enable = true; settings = { diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 1565979..6e154ec 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -1,5 +1,4 @@ { - lib, pkgs, inputs, ... diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index a3108ff..3c814c1 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { programs.zoxide = { enable = true; }; diff --git a/nixos/board/package-configs/pi-hole/default.nix b/nixos/board/package-configs/pi-hole/default.nix index 7ce2716..0596d3b 100644 --- a/nixos/board/package-configs/pi-hole/default.nix +++ b/nixos/board/package-configs/pi-hole/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { services.pihole = { enable = true; hostConfig = { diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index d5e185f..44e3892 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -1,7 +1,6 @@ # This is your system's configuration file. # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { - inputs, outputs, lib, config, diff --git a/nixos/desktop/package-configs/default.nix b/nixos/desktop/package-configs/default.nix index 95564cd..372d666 100644 --- a/nixos/desktop/package-configs/default.nix +++ b/nixos/desktop/package-configs/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./firefox ]; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 78ee9f7..a71f2fb 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -4,7 +4,6 @@ inputs, outputs, lib, - config, pkgs, ... }: { diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 081b9c8..40ca9e0 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 5128343..f4e7041 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -3,8 +3,6 @@ { inputs, outputs, - lib, - config, pkgs, ... }: { diff --git a/nixos/hosts/GLaDOS/hardware-configuration.nix b/nixos/hosts/GLaDOS/hardware-configuration.nix index c4ee5ec..7c7fcbd 100644 --- a/nixos/hosts/GLaDOS/hardware-configuration.nix +++ b/nixos/hosts/GLaDOS/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index becff32..1c45890 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -2,9 +2,7 @@ inputs, outputs, lib, - config, pkgs, - nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/iso_server/configuration.nix b/nixos/hosts/iso_server/configuration.nix index a38c7d0..9f0cd35 100644 --- a/nixos/hosts/iso_server/configuration.nix +++ b/nixos/hosts/iso_server/configuration.nix @@ -2,9 +2,7 @@ inputs, outputs, lib, - config, pkgs, - nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 9c9ba8b..8ba1916 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -2,9 +2,7 @@ inputs, outputs, lib, - config, pkgs, - nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/queen/hardware-configuration.nix b/nixos/hosts/queen/hardware-configuration.nix index 3357ba6..cf6fbc9 100644 --- a/nixos/hosts/queen/hardware-configuration.nix +++ b/nixos/hosts/queen/hardware-configuration.nix @@ -1,7 +1,5 @@ { - config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 1c4a376..2924824 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { services.udev.extraRules = '' KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f7e0c3e..6120091 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -2,7 +2,6 @@ inputs, outputs, lib, - config, pkgs, ... }: { diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix index fdfefac..fb0baa3 100644 --- a/nixos/hosts/shodan/hardware-configuration.nix +++ b/nixos/hosts/shodan/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/wheatley/armv7l.nix b/nixos/hosts/wheatley/armv7l.nix index e6a9f37..d908a24 100644 --- a/nixos/hosts/wheatley/armv7l.nix +++ b/nixos/hosts/wheatley/armv7l.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { boot.kernelPatches = [ rec { name = "compat_uts_machine"; diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index f7ea389..efbc691 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -2,9 +2,7 @@ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { - config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/server/default.nix b/nixos/server/default.nix index 75e56d1..99a5736 100644 --- a/nixos/server/default.nix +++ b/nixos/server/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./package-configs diff --git a/nixos/server/package-configs/akkoma/default.nix b/nixos/server/package-configs/akkoma/default.nix index bd68ba9..d0495bf 100644 --- a/nixos/server/package-configs/akkoma/default.nix +++ b/nixos/server/package-configs/akkoma/default.nix @@ -1,7 +1,4 @@ { - inputs, - outputs, - lib, config, pkgs, ... diff --git a/nixos/server/package-configs/aria2/container.nix b/nixos/server/package-configs/aria2/container.nix index 6d2fc82..c76c97c 100644 --- a/nixos/server/package-configs/aria2/container.nix +++ b/nixos/server/package-configs/aria2/container.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { users.users.aria2.group = "aria2"; users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; diff --git a/nixos/server/package-configs/aria2/default.nix b/nixos/server/package-configs/aria2/default.nix index f2a075c..e7d15bd 100644 --- a/nixos/server/package-configs/aria2/default.nix +++ b/nixos/server/package-configs/aria2/default.nix @@ -1,10 +1,4 @@ -{ - inputs, - outputs, - config, - pkgs, - ... -}: { +{config, ...}: { users.users.aria2.group = "aria2"; users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 6079856..63891b4 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -1,10 +1,4 @@ -{ - config, - pkgs, - inputs, - lib, - ... -}: { +{pkgs, ...}: { services.nginx = { enable = true; virtualHosts = { diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 2ea9053..b9debce 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -2,7 +2,6 @@ config, pkgs, inputs, - lib, ... }: let # You'll need to edit these values diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index 4539247..5bae63e 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { sops.secrets."coturn-auth-secret".mode = "0440"; sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name; users.users.nginx.extraGroups = ["turnserver"]; diff --git a/nixos/server/package-configs/dashboard/default.nix b/nixos/server/package-configs/dashboard/default.nix index 6cb610e..7bbb7fc 100644 --- a/nixos/server/package-configs/dashboard/default.nix +++ b/nixos/server/package-configs/dashboard/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./grafana #./loki diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index 5589873..2ea84c6 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { # grafana configuration services.grafana = { enable = true; diff --git a/nixos/server/package-configs/dashboard/loki/default.nix b/nixos/server/package-configs/dashboard/loki/default.nix index 6e68716..e83159b 100644 --- a/nixos/server/package-configs/dashboard/loki/default.nix +++ b/nixos/server/package-configs/dashboard/loki/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { services.loki = { enable = true; configFile = ./loki.yaml; diff --git a/nixos/server/package-configs/dashboard/prometheus/default.nix b/nixos/server/package-configs/dashboard/prometheus/default.nix index 5ea9535..36710a1 100644 --- a/nixos/server/package-configs/dashboard/prometheus/default.nix +++ b/nixos/server/package-configs/dashboard/prometheus/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { services.prometheus = { enable = true; port = 9001; diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index 0c6e6ba..591e279 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - lib, - config, - pkgs, - user, - ... -}: { +{config, ...}: { sops.secrets."grafana-telegraf-key".mode = "0440"; sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name; services.telegraf = { diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 6384555..4dd970f 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./conduit ./forgejo diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index da7b467..b4efc44 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = []; #sops.secrets."mailpassunhash".mode = "0440"; diff --git a/nixos/server/package-configs/gotosocial/default.nix b/nixos/server/package-configs/gotosocial/default.nix index 9e3afdf..3740c15 100644 --- a/nixos/server/package-configs/gotosocial/default.nix +++ b/nixos/server/package-configs/gotosocial/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { users.users.gotosocial.extraGroups = ["virtualMail"]; services.nginx = { diff --git a/nixos/server/package-configs/jellyfin/default.nix b/nixos/server/package-configs/jellyfin/default.nix index f61461e..cc492d4 100644 --- a/nixos/server/package-configs/jellyfin/default.nix +++ b/nixos/server/package-configs/jellyfin/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { users.users.jellyfin.extraGroups = ["nextcloud" "aria2"]; services.nginx = { diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index e43a5c6..878be36 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{config, ...}: { sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; diff --git a/nixos/server/package-configs/ombi/default.nix b/nixos/server/package-configs/ombi/default.nix index 7065ae5..c82156c 100644 --- a/nixos/server/package-configs/ombi/default.nix +++ b/nixos/server/package-configs/ombi/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { users.users = { ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"]; }; diff --git a/nixos/server/package-configs/phanpy/default.nix b/nixos/server/package-configs/phanpy/default.nix index 216412e..362f8f7 100644 --- a/nixos/server/package-configs/phanpy/default.nix +++ b/nixos/server/package-configs/phanpy/default.nix @@ -1,10 +1,4 @@ -{ - config, - pkgs, - inputs, - lib, - ... -}: { +{pkgs, ...}: { services.nginx = { enable = true; virtualHosts = { diff --git a/nixos/server/package-configs/postgres/default.nix b/nixos/server/package-configs/postgres/default.nix index 92b9478..0a3e4f6 100644 --- a/nixos/server/package-configs/postgres/default.nix +++ b/nixos/server/package-configs/postgres/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql package = pkgs.postgresql_16; diff --git a/nixos/server/package-configs/roundcube/default.nix b/nixos/server/package-configs/roundcube/default.nix index d33c621..59ee43d 100644 --- a/nixos/server/package-configs/roundcube/default.nix +++ b/nixos/server/package-configs/roundcube/default.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, ... }: { # TODO: Figure out how to create packages for some plugins for roundcube! diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index a845b75..b664165 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -1,10 +1,8 @@ { inputs, - outputs, lib, config, pkgs, - pkgs-edge, ... }: { imports = [ diff --git a/nixos/shared/locale/default.nix b/nixos/shared/locale/default.nix index 2444204..ea9e4e8 100644 --- a/nixos/shared/locale/default.nix +++ b/nixos/shared/locale/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 6f28f40..b59dcc2 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -1,8 +1,5 @@ { - inputs, outputs, - lib, - config, pkgs, pkgs-edge, ... diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 3a27c32..b7a8a26 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -1,10 +1,5 @@ { - lib, - stdenv, - system, pkgs, - util-linux, - jq, writeShellApplication, }: writeShellApplication diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index 7c6f81f..0973487 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -1,6 +1,4 @@ { - lib, - stdenv, direnv, writeShellApplication, }: diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index eabc160..7a9424c 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -1,6 +1,4 @@ { - lib, - stdenv, direnv, writeShellApplication, }: diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index f9365fe..622170a 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -1,6 +1,4 @@ { - lib, - stdenv, git, gum, writeShellApplication, diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index bfcf17e..51bd530 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "install-nix"; diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix index 4503fcc..e4bd280 100644 --- a/pkgs/rebuild-no-inhibit/default.nix +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "rebuild-no-inhibit"; diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 8b59258..8c61e66 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "rebuild"; diff --git a/pkgs/restart/default.nix b/pkgs/restart/default.nix index c3fe9c1..2405faa 100644 --- a/pkgs/restart/default.nix +++ b/pkgs/restart/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "restart"; diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix index a965b8c..7f1b3e4 100644 --- a/pkgs/update/default.nix +++ b/pkgs/update/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "update"; diff --git a/pkgs/upgrade/default.nix b/pkgs/upgrade/default.nix index d72c480..7ab662b 100644 --- a/pkgs/upgrade/default.nix +++ b/pkgs/upgrade/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "upgrade"; From 02ae4f69a68c6db3e92873bd9d3f4ae184b723b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 30 Oct 2024 10:16:13 +0100 Subject: [PATCH 170/395] Remove the binary cache for conduwuit for now as it seems to be down --- nixos/shared/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index a845b75..1138ad2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -43,14 +43,12 @@ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://0uptime.cachix.org" - "https://attic.kennel.juneis.dog/conduit" ]; trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" - "conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk=" ]; }; }; From 3236096a8173bc4dc99145aa33d9babebefa9edb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 30 Oct 2024 10:26:47 +0100 Subject: [PATCH 171/395] Let's try disabling all this conduwuit stuff? It's still querying the binary cache for some reason --- flake.lock | 1006 ++--------------- flake.nix | 10 +- pkgs/simple-completion-language-server/result | 1 - 3 files changed, 110 insertions(+), 907 deletions(-) delete mode 120000 pkgs/simple-completion-language-server/result diff --git a/flake.lock b/flake.lock index 63d14af..408d326 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1725300620, - "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -38,11 +14,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728525495, - "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", + "lastModified": 1730060100, + "narHash": "sha256-wTO5qAjMopgEv5GSuFfY432SOCiIHE12n6OPgADLF8U=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", + "rev": "511a714ed34e89a9957b657c38c39ff182fe9da7", "type": "github" }, "original": { @@ -67,71 +43,13 @@ "type": "gitlab" } }, - "cachix": { - "inputs": { - "devenv": "devenv", - "flake-compat": "flake-compat_4", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1724232775, - "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", - "owner": "cachix", - "repo": "cachix", - "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "master", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": "devenv_2", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1712055811, - "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", - "owner": "cachix", - "repo": "cachix", - "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "lastModified": 1730036420, + "narHash": "sha256-rv2bz7J6Wo7AenPiu4+ptCB1AFyaMcS77y89zbRAtI8=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "0b7bf04628414a402d255924f65e9a0d1a53d92b", "type": "github" }, "original": { @@ -140,53 +58,6 @@ "type": "github" } }, - "complement": { - "flake": false, - "locked": { - "lastModified": 1724347376, - "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", - "owner": "matrix-org", - "repo": "complement", - "rev": "39733c1b2f8314800776748cc7164f9a34650686", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic", - "cachix": "cachix", - "complement": "complement", - "crane": "crane_3", - "fenix": "fenix_2", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_3", - "liburing": "liburing", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -209,19 +80,12 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -231,43 +95,6 @@ } }, "crane_3": { - "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_5": { "locked": { "lastModified": 1727974419, "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", @@ -282,75 +109,6 @@ "type": "github" } }, - "devenv": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "nix": "nix_2", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1723156315, - "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", - "owner": "cachix", - "repo": "devenv", - "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_2": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix", - "nixpkgs": "nixpkgs_2", - "poetry2nix": "poetry2nix", - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1708704632, - "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", - "owner": "cachix", - "repo": "devenv", - "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "python-rewrite", - "repo": "devenv", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -358,11 +116,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -393,29 +151,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1725690497, - "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -449,71 +184,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -530,28 +200,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -571,7 +219,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -579,11 +227,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -597,11 +245,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -614,43 +262,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -665,77 +276,7 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -764,11 +305,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -780,15 +321,15 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_4" + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1730248099, + "narHash": "sha256-Fl7BSdpLk0uTXF6ol/MR0q1EB4XQ8tn0ftig0pyYh5Y=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "c11bab124fc55a37cbd854ed28ea121ed609231f", "type": "github" }, "original": { @@ -799,19 +340,19 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1730107060, + "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", "type": "github" }, "original": { @@ -820,94 +361,7 @@ "type": "github" } }, - "liburing": { - "flake": false, - "locked": { - "lastModified": 1725659644, - "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", - "owner": "axboe", - "repo": "liburing", - "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", - "type": "github" - }, - "original": { - "owner": "axboe", - "ref": "master", - "repo": "liburing", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -915,11 +369,11 @@ ] }, "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { @@ -936,11 +390,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -949,44 +403,13 @@ "type": "github" } }, - "nix_2": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { - "lastModified": 1728176478, - "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1003,11 +426,11 @@ ] }, "locked": { - "lastModified": 1728522165, - "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -1018,11 +441,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1730161780, + "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", "type": "github" }, "original": { @@ -1034,16 +457,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724999960, - "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1065,11 +488,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728565888, - "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", + "lastModified": 1730280180, + "narHash": "sha256-/nJhORYGNnwU4zcBpV6szxceBbqsVerHacFuboij2Iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", + "rev": "a053f605262f05827024bc7603ee5040788fb3ba", "type": "github" }, "original": { @@ -1078,45 +501,13 @@ "type": "indirect" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -1128,43 +519,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -1176,11 +535,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1192,59 +551,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1692808169, - "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "lastModified": 1730025694, + "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", "type": "github" }, "original": { @@ -1254,13 +565,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_3": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1270,7 +581,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1285,13 +596,13 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_5": { "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", + "lastModified": 1729951556, + "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", + "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", "type": "github" }, "original": { @@ -1301,7 +612,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_6": { "locked": { "lastModified": 1728061008, "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", @@ -1327,11 +638,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1729710171, + "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "247a8e677b51f053ca89dcf67059e24f85e47391", "type": "github" }, "original": { @@ -1340,52 +651,25 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692876271, - "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1394,38 +678,20 @@ "type": "github" } }, - "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1725811807, - "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.6.1", - "repo": "rocksdb", - "type": "github" - } - }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_4", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_3", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1451,23 +717,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1725630423, - "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1476,11 +725,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1729996302, + "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", "type": "github" }, "original": { @@ -1513,8 +762,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_7", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1534,15 +783,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -1581,51 +830,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1649,17 +853,17 @@ }, "zjstatus": { "inputs": { - "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_9", + "crane": "crane_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1728141581, - "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", + "lastModified": 1729787428, + "narHash": "sha256-kGSM7b4+X5LObd6AdgQZABU241ZzHGm24xaiy33kwBI=", "owner": "dj95", "repo": "zjstatus", - "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", + "rev": "c74e310c35fb7ec6b59a1c73720db4d6d8e236a1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95a8488..3864b50 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - conduwuit = { - url = "github:girlbossceo/conduwuit"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # conduwuit = { + # url = "github:girlbossceo/conduwuit"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -97,7 +97,7 @@ jovian, nixos-hardware, nix-index-database, - conduwuit, + # conduwuit, ... } @ inputs: let inherit (self) outputs; diff --git a/pkgs/simple-completion-language-server/result b/pkgs/simple-completion-language-server/result deleted file mode 120000 index 5a7c687..0000000 --- a/pkgs/simple-completion-language-server/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/3l0wgxsvf5sz2q9sgyj0blc1ivzg808b-simple-completion-language-server-ff9f90bc96c347f284571bc6310bc31f95508d55 \ No newline at end of file From 1650e5a8a1e4b0bc10b37fcf62b40c564164b3e2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Nov 2024 13:01:25 +0100 Subject: [PATCH 172/395] update flake lock and change foot's desktop shortcut since the name changed --- flake.lock | 589 ++++++++++++------ .../package-configs/plasma-desktop.nix | 2 +- 2 files changed, 412 insertions(+), 179 deletions(-) diff --git a/flake.lock b/flake.lock index 63d14af..99c7539 100644 --- a/flake.lock +++ b/flake.lock @@ -5,16 +5,15 @@ "crane": "crane_2", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725300620, - "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", + "lastModified": 1729116596, + "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", "owner": "zhaofengli", "repo": "attic", - "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", + "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", "type": "github" }, "original": { @@ -38,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728525495, - "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", + "lastModified": 1730060100, + "narHash": "sha256-wTO5qAjMopgEv5GSuFfY432SOCiIHE12n6OPgADLF8U=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", + "rev": "511a714ed34e89a9957b657c38c39ff182fe9da7", "type": "github" }, "original": { @@ -72,14 +71,14 @@ "devenv": "devenv", "flake-compat": "flake-compat_4", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1724232775, - "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", "owner": "cachix", "repo": "cachix", - "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", "type": "github" }, "original": { @@ -98,16 +97,58 @@ "devenv", "flake-compat" ], + "git-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ], "nixpkgs": [ "conduwuit", "cachix", "devenv", "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726520618, + "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", + "owner": "cachix", + "repo": "cachix", + "rev": "695525f9086542dfb09fde0871dbf4174abbf634", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, + "cachix_3": { + "inputs": { + "devenv": "devenv_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" ], "pre-commit-hooks": [ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "pre-commit-hooks" ] }, @@ -127,11 +168,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "lastModified": 1730458408, + "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", "type": "github" }, "original": { @@ -174,11 +215,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1728182038, - "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", + "lastModified": 1729828262, + "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", + "rev": "16014e15946132160a40fa057387aadbea1550e4", "type": "github" }, "original": { @@ -232,11 +273,11 @@ }, "crane_3": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1729741221, + "narHash": "sha256-8AHZZXs1lFkERfBY0C8cZGElSo33D/et7NKEpLRmvzo=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "f235b656ee5b2bfd6d94c3bfd67896a575d4a6ed", "type": "github" }, "original": { @@ -247,18 +288,12 @@ } }, "crane_4": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -290,7 +325,7 @@ "cachix", "flake-compat" ], - "nix": "nix_2", + "nix": "nix_3", "nixpkgs": [ "conduwuit", "cachix", @@ -302,6 +337,46 @@ "git-hooks" ] }, + "locked": { + "lastModified": 1727963652, + "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", + "owner": "cachix", + "repo": "devenv", + "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "cachix": "cachix_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "git-hooks" + ] + }, "locked": { "lastModified": 1723156315, "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", @@ -316,13 +391,15 @@ "type": "github" } }, - "devenv_2": { + "devenv_3": { "inputs": { "flake-compat": [ "conduwuit", "cachix", "devenv", "cachix", + "devenv", + "cachix", "flake-compat" ], "nix": "nix", @@ -333,6 +410,8 @@ "cachix", "devenv", "cachix", + "devenv", + "cachix", "pre-commit-hooks" ] }, @@ -358,11 +437,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -402,11 +481,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1725690497, - "narHash": "sha256-5fT+96rV7Hx29HG+4/oBbr3V+yExKuLN2vcBcPbVBlU=", + "lastModified": 1729751566, + "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=", "owner": "nix-community", "repo": "fenix", - "rev": "4b8d964df93d1f918ee6c4f003b3548c432cc866", + "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64", "type": "github" }, "original": { @@ -552,6 +631,30 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -571,7 +674,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -579,11 +682,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -596,24 +699,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1689068808, "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", @@ -628,9 +713,24 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -649,7 +749,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1726560853, @@ -667,7 +767,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -699,11 +799,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1727854478, + "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", "type": "github" }, "original": { @@ -764,11 +864,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1730450782, + "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "8ca921e5a806b5b6171add542defe7bdac79d189", "type": "github" }, "original": { @@ -781,14 +881,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1730441026, + "narHash": "sha256-xmZQFGeIm2TzXv4jGaQ3nfBoUbt4gKbIv/SHVWw93ag=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "bd1da5657b8903b293a0ff51eb896a91a544ebed", "type": "github" }, "original": { @@ -801,17 +901,17 @@ "inputs": { "crane": "crane_4", "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1730107060, + "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", "type": "github" }, "original": { @@ -820,6 +920,22 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, "liburing": { "flake": false, "locked": { @@ -846,6 +962,8 @@ "devenv", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression" @@ -889,6 +1007,8 @@ "devenv", "cachix", "devenv", + "cachix", + "devenv", "poetry2nix", "nixpkgs" ] @@ -915,11 +1035,11 @@ ] }, "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { @@ -936,11 +1056,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -955,12 +1075,16 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "flake-compat" ], "nixpkgs": [ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression_2" @@ -980,13 +1104,43 @@ "type": "github" } }, + "nix_3": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { - "lastModified": 1728176478, - "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -1003,11 +1157,11 @@ ] }, "locked": { - "lastModified": 1728522165, - "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -1018,11 +1172,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1730368399, + "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", "type": "github" }, "original": { @@ -1034,11 +1188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724999960, - "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=", + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", "type": "github" }, "original": { @@ -1048,6 +1202,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -1065,11 +1235,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728565888, - "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", + "lastModified": 1730462280, + "narHash": "sha256-Qnn3hlqkbwZcjxhlKYXk1e28ngb00blknRHgVp/ETAk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", + "rev": "dea4abb8ba764920453cec83ef5d8e188f4c6a21", "type": "github" }, "original": { @@ -1110,6 +1280,22 @@ "type": "github" } }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1724316499, @@ -1160,11 +1346,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -1176,11 +1362,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -1190,6 +1376,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1692808169, @@ -1208,16 +1410,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } @@ -1240,11 +1442,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1730025694, + "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", "type": "github" }, "original": { @@ -1254,13 +1472,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -1270,7 +1488,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1285,29 +1503,13 @@ "type": "indirect" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "lastModified": 1729951556, + "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", "type": "github" }, "original": { @@ -1327,11 +1529,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1730366788, + "narHash": "sha256-0Ezvv4KkyFdLAblPBFDgZbiMLlJZtpHruT2i4KC2wIY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "f634d5f6ee9be365b2ca08b2d00e0e3b0c240b9e", "type": "github" }, "original": { @@ -1342,7 +1544,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "conduwuit", @@ -1350,6 +1552,8 @@ "devenv", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ] }, @@ -1367,6 +1571,50 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "flake-utils": "flake-utils_2", + "gitignore": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1381,11 +1629,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1397,16 +1645,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1725811807, - "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=", + "lastModified": 1729712930, + "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0", + "rev": "871eda6953c3f399aae39808dcfccdd014885beb", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.6.1", + "ref": "v9.7.3", "repo": "rocksdb", "type": "github" } @@ -1417,7 +1665,7 @@ "catppuccin": "catppuccin", "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", @@ -1425,7 +1673,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1454,11 +1702,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1725630423, - "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=", + "lastModified": 1729715509, + "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d", + "rev": "40492e15d49b89cf409e2c5536444131fac49429", "type": "github" }, "original": { @@ -1476,11 +1724,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1729996302, + "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", "type": "github" }, "original": { @@ -1514,7 +1762,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1534,15 +1782,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -1611,21 +1859,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1651,15 +1884,15 @@ "inputs": { "crane": "crane_5", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1728141581, - "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", + "lastModified": 1729787428, + "narHash": "sha256-kGSM7b4+X5LObd6AdgQZABU241ZzHGm24xaiy33kwBI=", "owner": "dj95", "repo": "zjstatus", - "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", + "rev": "c74e310c35fb7ec6b59a1c73720db4d6d8e236a1", "type": "github" }, "original": { diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index b1f5c6a..d823fdb 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -88,7 +88,7 @@ "applications:steam.desktop" "applications:noisetorch.desktop" "applications:org.kde.plasma-systemmonitor.desktop" - "applications:org.codeberg.dnkl.foot.desktop" + "applications:foot.desktop" "applications:nitrokey-app.desktop" "applications:codium.desktop" "applications:freetube.desktop" From 39136e1877633a9dd2081402b24f3eb7101d624b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 1 Nov 2024 13:03:44 +0100 Subject: [PATCH 173/395] update flake lock --- flake.lock | 1133 +++------------------------------------------------- 1 file changed, 52 insertions(+), 1081 deletions(-) diff --git a/flake.lock b/flake.lock index 99c7539..2ef2641 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1729116596, - "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -66,106 +43,6 @@ "type": "gitlab" } }, - "cachix": { - "inputs": { - "devenv": "devenv", - "flake-compat": "flake-compat_4", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1728672398, - "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", - "owner": "cachix", - "repo": "cachix", - "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "master", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": "devenv_2", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "git-hooks": [ - "conduwuit", - "cachix", - "devenv", - "pre-commit-hooks" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726520618, - "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", - "owner": "cachix", - "repo": "cachix", - "rev": "695525f9086542dfb09fde0871dbf4174abbf634", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, - "cachix_3": { - "inputs": { - "devenv": "devenv_3", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1712055811, - "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", - "owner": "cachix", - "repo": "cachix", - "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, "catppuccin": { "locked": { "lastModified": 1730458408, @@ -181,53 +58,6 @@ "type": "github" } }, - "complement": { - "flake": false, - "locked": { - "lastModified": 1724347376, - "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", - "owner": "matrix-org", - "repo": "complement", - "rev": "39733c1b2f8314800776748cc7164f9a34650686", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic", - "cachix": "cachix", - "complement": "complement", - "crane": "crane_3", - "fenix": "fenix_2", - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_3", - "liburing": "liburing", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1729828262, - "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "16014e15946132160a40fa057387aadbea1550e4", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -250,44 +80,6 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", - "owner": "ipetkov", - "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "locked": { - "lastModified": 1729741221, - "narHash": "sha256-8AHZZXs1lFkERfBY0C8cZGElSo33D/et7NKEpLRmvzo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "f235b656ee5b2bfd6d94c3bfd67896a575d4a6ed", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { "locked": { "lastModified": 1730060262, "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", @@ -302,7 +94,7 @@ "type": "github" } }, - "crane_5": { + "crane_3": { "locked": { "lastModified": 1727974419, "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", @@ -317,119 +109,6 @@ "type": "github" } }, - "devenv": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "nix": "nix_3", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1727963652, - "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", - "owner": "cachix", - "repo": "devenv", - "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_2": { - "inputs": { - "cachix": "cachix_3", - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix_2", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1723156315, - "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", - "owner": "cachix", - "repo": "devenv", - "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_3": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix", - "nixpkgs": "nixpkgs_2", - "poetry2nix": "poetry2nix", - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1708704632, - "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", - "owner": "cachix", - "repo": "devenv", - "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "python-rewrite", - "repo": "devenv", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -472,29 +151,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1729751566, - "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=", - "owner": "nix-community", - "repo": "fenix", - "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -528,71 +184,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -609,52 +200,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -674,7 +219,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -700,11 +245,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -714,43 +259,9 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -765,77 +276,7 @@ "type": "github" } }, - "flake-utils_5": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1727854478, - "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -880,8 +321,8 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_5" + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1730441026, @@ -899,10 +340,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_6", + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -920,114 +361,7 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, - "liburing": { - "flake": false, - "locked": { - "lastModified": 1725659644, - "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", - "owner": "axboe", - "repo": "liburing", - "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", - "type": "github" - }, - "original": { - "owner": "axboe", - "ref": "master", - "repo": "liburing", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -1069,71 +403,6 @@ "type": "github" } }, - "nix_2": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix_3": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "flake-compat" - ], - "flake-parts": "flake-parts_2", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_3", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_3", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1729386149, @@ -1188,36 +457,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726042813, - "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - } - }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -1235,11 +488,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730462280, - "narHash": "sha256-Qnn3hlqkbwZcjxhlKYXk1e28ngb00blknRHgVp/ETAk=", + "lastModified": 1730462463, + "narHash": "sha256-zEvTgoadqkInPhlBXR1hQrK3PJO+pxnH+H4OtNP8uWQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dea4abb8ba764920453cec83ef5d8e188f4c6a21", + "rev": "c034a96848b941fd334d33d5b1c58c8b611adc3a", "type": "github" }, "original": { @@ -1248,61 +501,13 @@ "type": "indirect" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_3": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -1313,38 +518,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { "locked": { "lastModified": 1729973466, "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", @@ -1376,87 +549,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1692808169, - "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1730025694, "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", @@ -1472,7 +565,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_3": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -1488,7 +581,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_4": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1503,7 +596,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_5": { "locked": { "lastModified": 1729951556, "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", @@ -1519,6 +612,22 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1542,91 +651,18 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692876271, - "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv", - "nix" - ], - "flake-utils": "flake-utils_2", - "gitignore": [ - "conduwuit", - "cachix", - "devenv", - "nix" - ], - "nixpkgs": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1729104314, @@ -1642,38 +678,20 @@ "type": "github" } }, - "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1729712930, - "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "871eda6953c3f399aae39808dcfccdd014885beb", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.7.3", - "repo": "rocksdb", - "type": "github" - } - }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_3", - "flake-utils": "flake-utils_4", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_3", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1699,23 +717,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1729715509, - "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "40492e15d49b89cf409e2c5536444131fac49429", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1761,8 +762,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_8", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1782,8 +783,8 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1729999681, @@ -1829,36 +830,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1882,9 +853,9 @@ }, "zjstatus": { "inputs": { - "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "crane": "crane_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2" }, "locked": { From 0c0c841b270f5e24bca56a5560b59a111ff890c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Nov 2024 13:46:18 +0100 Subject: [PATCH 174/395] add ryujinx and re-add conduwuit --- flake.nix | 10 +++++----- home-manager/hosts/GLaDOS/lillian.nix | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 3864b50..95a8488 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - # conduwuit = { - # url = "github:girlbossceo/conduwuit"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + conduwuit = { + url = "github:girlbossceo/conduwuit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -97,7 +97,7 @@ jovian, nixos-hardware, nix-index-database, - # conduwuit, + conduwuit, ... } @ inputs: let inherit (self) outputs; diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 0841ff3..572d11a 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -18,6 +18,7 @@ home.packages = with pkgs; [ heroic r2modman + ryujinx ]; programs.mangohud = { From e8f1325d13917b76805cedcb24c5f02f1beac5da Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Nov 2024 13:49:03 +0100 Subject: [PATCH 175/395] update flake lock --- flake.lock | 1193 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1111 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index 2ef2641..1c52611 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "attic": { + "inputs": { + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1729116596, + "narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -43,6 +66,106 @@ "type": "gitlab" } }, + "cachix": { + "inputs": { + "devenv": "devenv", + "flake-compat": "flake-compat_4", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", + "owner": "cachix", + "repo": "cachix", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "master", + "repo": "cachix", + "type": "github" + } + }, + "cachix_2": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "git-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726520618, + "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", + "owner": "cachix", + "repo": "cachix", + "rev": "695525f9086542dfb09fde0871dbf4174abbf634", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, + "cachix_3": { + "inputs": { + "devenv": "devenv_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "catppuccin": { "locked": { "lastModified": 1730458408, @@ -58,6 +181,53 @@ "type": "github" } }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1724347376, + "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", + "owner": "matrix-org", + "repo": "complement", + "rev": "39733c1b2f8314800776748cc7164f9a34650686", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, + "conduwuit": { + "inputs": { + "attic": "attic", + "cachix": "cachix", + "complement": "complement", + "crane": "crane_3", + "fenix": "fenix_2", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_3", + "liburing": "liburing", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs" + ], + "rocksdb": "rocksdb" + }, + "locked": { + "lastModified": 1729828262, + "narHash": "sha256-tFA1obQW6AVHEdPG0YbOtccRcmo3Qg8ncFs9unVgGmY=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "16014e15946132160a40fa057387aadbea1550e4", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -80,6 +250,44 @@ } }, "crane_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { + "locked": { + "lastModified": 1729741221, + "narHash": "sha256-8AHZZXs1lFkERfBY0C8cZGElSo33D/et7NKEpLRmvzo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "f235b656ee5b2bfd6d94c3bfd67896a575d4a6ed", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "crane_4": { "locked": { "lastModified": 1730060262, "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", @@ -94,7 +302,7 @@ "type": "github" } }, - "crane_3": { + "crane_5": { "locked": { "lastModified": 1727974419, "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", @@ -109,6 +317,119 @@ "type": "github" } }, + "devenv": { + "inputs": { + "cachix": "cachix_2", + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "nix": "nix_3", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "git-hooks" + ] + }, + "locked": { + "lastModified": 1727963652, + "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", + "owner": "cachix", + "repo": "devenv", + "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "cachix": "cachix_3", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "git-hooks" + ] + }, + "locked": { + "lastModified": 1723156315, + "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", + "owner": "cachix", + "repo": "devenv", + "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_3": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "flake-compat" + ], + "nix": "nix", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -151,6 +472,29 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1729751566, + "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=", + "owner": "nix-community", + "repo": "fenix", + "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -184,6 +528,71 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -202,15 +611,17 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "conduwuit", + "attic", "nixpkgs" ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -220,6 +631,50 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -245,11 +700,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -259,9 +714,43 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -276,7 +765,77 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1727854478, + "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -305,11 +864,11 @@ ] }, "locked": { - "lastModified": 1730450782, - "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=", + "lastModified": 1730633670, + "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "8ca921e5a806b5b6171add542defe7bdac79d189", + "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "type": "github" }, "original": { @@ -321,15 +880,15 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs" + "nix-github-actions": "nix-github-actions_2", + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730441026, - "narHash": "sha256-xmZQFGeIm2TzXv4jGaQ3nfBoUbt4gKbIv/SHVWw93ag=", + "lastModified": 1730625581, + "narHash": "sha256-vFxtzNCxtUIrmv8tluquZHjNTwMkCGtT0NCoVuwlqd4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bd1da5657b8903b293a0ff51eb896a91a544ebed", + "rev": "e6195c6bfc037617e20d6d7d4d6c9cdeee6aba6d", "type": "github" }, "original": { @@ -340,10 +899,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", + "crane": "crane_4", + "flake-compat": "flake-compat_6", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -361,7 +920,114 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1725659644, + "narHash": "sha256-WjnpmopfvFoUbubIu9bki+Y6P4YXDfvnW4+72hniq3g=", + "owner": "axboe", + "repo": "liburing", + "rev": "0fe5c09195c0918f89582dd6ff098a58a0bdf62a", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_3", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -390,11 +1056,11 @@ ] }, "locked": { - "lastModified": 1729999765, - "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", + "lastModified": 1730604744, + "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", + "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "type": "github" }, "original": { @@ -403,6 +1069,71 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1729386149, @@ -441,11 +1172,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730368399, - "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", + "lastModified": 1730537918, + "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", + "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", "type": "github" }, "original": { @@ -457,20 +1188,36 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -488,11 +1235,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730462463, - "narHash": "sha256-zEvTgoadqkInPhlBXR1hQrK3PJO+pxnH+H4OtNP8uWQ=", + "lastModified": 1730637267, + "narHash": "sha256-EBOSv3aJ88WitFtEb5XaIC0fNK/PJk1WoQvuAZGa1/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c034a96848b941fd334d33d5b1c58c8b611adc3a", + "rev": "b4cca74d1b67f45b3dadf0f7e9a868645615251d", "type": "github" }, "original": { @@ -501,7 +1248,71 @@ "type": "indirect" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { + "locked": { + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -517,13 +1328,29 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1730602179, + "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", "type": "github" }, "original": { @@ -535,11 +1362,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -549,7 +1376,87 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1730025694, "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", @@ -565,13 +1472,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_7": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -581,7 +1488,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_8": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -596,29 +1503,13 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_9": { "locked": { - "lastModified": 1729951556, - "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -638,11 +1529,11 @@ ] }, "locked": { - "lastModified": 1730366788, - "narHash": "sha256-0Ezvv4KkyFdLAblPBFDgZbiMLlJZtpHruT2i4KC2wIY=", + "lastModified": 1730635861, + "narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "f634d5f6ee9be365b2ca08b2d00e0e3b0c240b9e", + "rev": "293668587937daae1df085ee36d2b2d0792b7a0f", "type": "github" }, "original": { @@ -651,18 +1542,91 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "cachix", + "devenv", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "flake-utils": "flake-utils_2", + "gitignore": [ + "conduwuit", + "cachix", + "devenv", + "nix" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1729104314, @@ -678,20 +1642,38 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1729712930, + "narHash": "sha256-jlp4kPkRTpoJaUdobEoHd8rCGAQNBy4ZHZ6y5zL/ibw=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "871eda6953c3f399aae39808dcfccdd014885beb", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.7.3", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", + "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts_3", + "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_7", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -717,6 +1699,23 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1729715509, + "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "40492e15d49b89cf409e2c5536444131fac49429", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -762,8 +1761,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_4", + "flake-compat": "flake-compat_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -783,15 +1782,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_9", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1729999681, - "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "lastModified": 1730605784, + "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760", "type": "github" }, "original": { @@ -830,6 +1829,36 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -853,9 +1882,9 @@ }, "zjstatus": { "inputs": { - "crane": "crane_3", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6", + "crane": "crane_5", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay_2" }, "locked": { From d61288b8c10a16c5f65a050ac261eabf32bf6729 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Nov 2024 14:04:32 +0100 Subject: [PATCH 176/395] fix yazi bug with 7zz --- home-manager/shared/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 07f7fde..1555a1e 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -27,8 +27,13 @@ broot lazygit navi - yazi nil ]; programs.navi.enable = true; + programs.yazi = { + enable = true; + package = pkgs.yazi.override { + _7zz = pkgs._7zz.override {useUasm = true;}; + }; + }; } From 382913f15ddab72ee155f0c20bac2a5c5a2f9dbd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Nov 2024 14:05:41 +0100 Subject: [PATCH 177/395] Update flake lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1c52611..869b56a 100644 --- a/flake.lock +++ b/flake.lock @@ -437,11 +437,11 @@ ] }, "locked": { - "lastModified": 1730190761, - "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", + "lastModified": 1730675461, + "narHash": "sha256-Mhqz3p/HEiI/zxBJWO57LYQf6gGlJB0tci6fiVXLjd8=", "owner": "nix-community", "repo": "disko", - "rev": "3979285062d6781525cded0f6c4ff92e71376b55", + "rev": "380847d94ff0fedee8b50ee4baddb162c06678df", "type": "github" }, "original": { @@ -884,11 +884,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730625581, - "narHash": "sha256-vFxtzNCxtUIrmv8tluquZHjNTwMkCGtT0NCoVuwlqd4=", + "lastModified": 1730652030, + "narHash": "sha256-uTToUpFphR9ywc+DQUD/8hmboOMFV1lBVFf/ztzdn6A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e6195c6bfc037617e20d6d7d4d6c9cdeee6aba6d", + "rev": "e74e57a37de55ecfdc62f49fe5a7463b2a52499a", "type": "github" }, "original": { @@ -1235,11 +1235,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730637267, - "narHash": "sha256-EBOSv3aJ88WitFtEb5XaIC0fNK/PJk1WoQvuAZGa1/U=", + "lastModified": 1730725329, + "narHash": "sha256-5TEPO7ifLaEC3eUXYQqhI85eREgV7fbgEXflN1jpGGc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4cca74d1b67f45b3dadf0f7e9a868645615251d", + "rev": "2f45b7ffd7297dd721a747e8d8399abb84ccf1ab", "type": "github" }, "original": { From 99cd42ce60494db91cfc4f081f4b262b3e3ae80e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 9 Nov 2024 18:00:23 +0100 Subject: [PATCH 178/395] change the theming to stylix, set a background image, and set cursors automagically --- flake.lock | 395 +++++++++++++++--- flake.nix | 7 + home-manager/desktop/default.nix | 5 +- .../desktop/package-configs/foot/default.nix | 3 +- home-manager/shared/default.nix | 35 +- home-manager/shared/shell/bat.nix | 2 +- home-manager/shared/shell/zellij/default.nix | 2 +- nixos/shared/background.jpg | Bin 0 -> 161326 bytes nixos/shared/default.nix | 56 ++- nixos/shared/packages/default.nix | 40 +- 10 files changed, 447 insertions(+), 98 deletions(-) create mode 100644 nixos/shared/background.jpg diff --git a/flake.lock b/flake.lock index 869b56a..acc408a 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,72 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "665b3c6748534eb766c777298721cece9453fdae", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "type": "github" + } + }, "bcachefs-tools": { "inputs": { "crane": "crane", @@ -37,11 +103,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730060100, - "narHash": "sha256-wTO5qAjMopgEv5GSuFfY432SOCiIHE12n6OPgADLF8U=", + "lastModified": 1730928062, + "narHash": "sha256-fXwp5vmq313QEu180EsPr0YT0OqVDlcebNYxxZ7mMLw=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "511a714ed34e89a9957b657c38c39ff182fe9da7", + "rev": "d4932bf0e32375451e7cfd4b776bb5c470e9afb8", "type": "github" }, "original": { @@ -168,11 +234,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1730458408, - "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", + "lastModified": 1731088327, + "narHash": "sha256-Oizjf0wXBTqALipX4fQdGjq9IBSCXz8wwcfCGRK73bI=", "owner": "catppuccin", "repo": "nix", - "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", + "rev": "7bebd062df3239c005c0d600f5dfd8514f5915f8", "type": "github" }, "original": { @@ -289,11 +355,11 @@ }, "crane_4": { "locked": { - "lastModified": 1730060262, - "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -304,11 +370,11 @@ }, "crane_5": { "locked": { - "lastModified": 1727974419, - "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -437,11 +503,11 @@ ] }, "locked": { - "lastModified": 1730675461, - "narHash": "sha256-Mhqz3p/HEiI/zxBJWO57LYQf6gGlJB0tci6fiVXLjd8=", + "lastModified": 1731060864, + "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=", "owner": "nix-community", "repo": "disko", - "rev": "380847d94ff0fedee8b50ee4baddb162c06678df", + "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f", "type": "github" }, "original": { @@ -608,6 +674,22 @@ "type": "github" } }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -682,11 +764,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -767,7 +849,28 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_5" }, "locked": { "lastModified": 1726560853, @@ -783,6 +886,22 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -857,6 +976,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -864,11 +1000,11 @@ ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -878,17 +1014,38 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1730652030, - "narHash": "sha256-uTToUpFphR9ywc+DQUD/8hmboOMFV1lBVFf/ztzdn6A=", + "lastModified": 1730962714, + "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e74e57a37de55ecfdc62f49fe5a7463b2a52499a", + "rev": "93b525229c99fec0016db72a174f43b9d6237714", "type": "github" }, "original": { @@ -907,11 +1064,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730107060, - "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", + "lastModified": 1730739295, + "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", + "rev": "cef39a78679c266300874e7a7000b4da066228d4", "type": "github" }, "original": { @@ -1172,11 +1329,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730537918, - "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -1235,11 +1392,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730725329, - "narHash": "sha256-5TEPO7ifLaEC3eUXYQqhI85eREgV7fbgEXflN1jpGGc=", + "lastModified": 1731095917, + "narHash": "sha256-KMP/SvOmQsX1SQqi3BsOaCwrR2YofAPld5iuOA+ZTLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f45b7ffd7297dd721a747e8d8399abb84ccf1ab", + "rev": "bdac466cb9b2ff77f7459a3d68de9045a562bc28", "type": "github" }, "original": { @@ -1362,11 +1519,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1378,11 +1535,27 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1728061008, - "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -1458,11 +1631,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1730025694, - "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", + "lastModified": 1730642263, + "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", + "rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae", "type": "github" }, "original": { @@ -1474,11 +1647,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1629,11 +1802,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { @@ -1679,6 +1852,7 @@ "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", + "stylix": "stylix", "zjstatus": "zjstatus" } }, @@ -1724,11 +1898,11 @@ ] }, "locked": { - "lastModified": 1729996302, - "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", + "lastModified": 1730601085, + "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", + "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", "type": "github" }, "original": { @@ -1745,11 +1919,11 @@ ] }, "locked": { - "lastModified": 1728095260, - "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", + "lastModified": 1730687492, + "narHash": "sha256-xQVadjquBA/tFxDt5A55LJ1D1AvkVWsnrKC2o+pr8F4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", + "rev": "41814763a2c597755b0755dbe3e721367a5e420f", "type": "github" }, "original": { @@ -1786,11 +1960,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1730605784, - "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=", + "lastModified": 1731047660, + "narHash": "sha256-iyp51lPWEQz4c5VH9bVbAuBcFP4crETU2QJYh5V0NYA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760", + "rev": "60e1bce1999f126e3b16ef45f89f72f0c3f8d16f", "type": "github" }, "original": { @@ -1799,6 +1973,36 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_5", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_10", + "systems": "systems_4", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" + }, + "locked": { + "lastModified": 1731090365, + "narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=", + "owner": "danth", + "repo": "stylix", + "rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1859,6 +2063,71 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1883,16 +2152,16 @@ "zjstatus": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1729787428, - "narHash": "sha256-kGSM7b4+X5LObd6AdgQZABU241ZzHGm24xaiy33kwBI=", + "lastModified": 1730748983, + "narHash": "sha256-72uoWm/34SU5aHgvUJgKqYMhvt4Y9X39bFhcDwVS+P0=", "owner": "dj95", "repo": "zjstatus", - "rev": "c74e310c35fb7ec6b59a1c73720db4d6d8e236a1", + "rev": "d5794fbec93860ead015b0beee70489f50cd87b1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95a8488..c25d052 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,8 @@ # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; + # Stylix theming engine + stylix.url = "github:danth/stylix"; }; outputs = { @@ -98,6 +100,7 @@ nixos-hardware, nix-index-database, conduwuit, + stylix, ... } @ inputs: let inherit (self) outputs; @@ -155,6 +158,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -177,6 +181,7 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -197,6 +202,7 @@ disko.nixosModules.disko simple-nixos-mailserver.nixosModule catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin @@ -218,6 +224,7 @@ jovian.nixosModules.jovian home-manager.nixosModules.home-manager catppuccin.nixosModules.catppuccin + stylix.nixosModules.stylix { home-manager.sharedModules = [ inputs.catppuccin.homeManagerModules.catppuccin diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 947d6dd..3cbb99c 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -1,9 +1,6 @@ { - inputs, - outputs, - lib, - config, pkgs, + lib, ... }: { # You can import other home-manager modules here diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix index f1839dc..aada26e 100644 --- a/home-manager/desktop/package-configs/foot/default.nix +++ b/home-manager/desktop/package-configs/foot/default.nix @@ -1,10 +1,9 @@ {...}: { programs.foot = { enable = true; - catppuccin.enable = true; + # catppuccin.enable = true; settings = { main = { - font = "Fira Code:size=11"; }; mouse = { diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 1555a1e..239a06a 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -12,10 +12,10 @@ homeDirectory = "/home/lillian"; }; - catppuccin = { - enable = true; - flavor = "macchiato"; - }; + # catppuccin = { + # enable = true; + # flavor = "macchiato"; + # }; home.packages = with pkgs; [ # System tools: @@ -36,4 +36,31 @@ _7zz = pkgs._7zz.override {useUasm = true;}; }; }; + # stylix = { + # enable = true; + # autoEnable = true; + # base16Scheme = { + # scheme = "Catppuccin Macchiato"; + # author = "https://github.com/catppuccin/catppuccin"; + # base00 = "24273a"; + # base01 = "1e2030"; + # base02 = "363a4f"; + # base03 = "494d64"; + # base04 = "5b6078"; + # base05 = "cad3f5"; + # base06 = "f4dbd6"; + # base07 = "b7bdf8"; + # base08 = "ed8796"; + # base09 = "f5a97f"; + # base0A = "eed49f"; + # base0B = "a6da95"; + # base0C = "8bd5ca"; + # base0D = "8aadf4"; + # base0E = "c6a0f6"; + # base0F = "f0c6c6"; + # }; + # image = ./background.jpg; + # cursor.package = pkgs.catppuccin-cursors; + # cursor.name = "macchiatoMauve"; + # }; } diff --git a/home-manager/shared/shell/bat.nix b/home-manager/shared/shell/bat.nix index 2afdce3..8658a54 100644 --- a/home-manager/shared/shell/bat.nix +++ b/home-manager/shared/shell/bat.nix @@ -2,6 +2,6 @@ programs.bat = { enable = true; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; - catppuccin.enable = true; + # catppuccin.enable = true; }; } diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 6e154ec..5ad5e0e 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -174,7 +174,7 @@ in { enableZshIntegration = true; settings = { session_serialization = true; - theme = "catppuccin-macchiato"; + # theme = "catppuccin-macchiato"; themes = { catppuccin-mocha = { diff --git a/nixos/shared/background.jpg b/nixos/shared/background.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2ad658c36b07fc29fa67c0b790f30fa0db2541ae GIT binary patch literal 161326 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
WMXFPo|`L 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