diff --git a/flake.lock b/flake.lock index 0401a74..fa609b8 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719676503, - "narHash": "sha256-5ER4843mn9Am8FKsUovaPFzwBIc2LOFvmcd+iUr8P9g=", + "lastModified": 1718887932, + "narHash": "sha256-eo1B6mUPNlRMCe9dgt1bzXinUlD+cD1DdVFj1fxwZnU=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "755788e2d6065ac35e680a23c48125a5cd63f7b7", + "rev": "411df4e53fdc58cfca2e473e54c1bed9cf17740d", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1719758387, - "narHash": "sha256-bMaI1jJNzIZar4TP/hhoPQROqqcbD6zT6O+sqIJdp8c=", + "lastModified": 1719311390, + "narHash": "sha256-eP+SydN7alV3ln7a1BrGhDoLVTBa6RaHxYZ9bTHAQIA=", "owner": "catppuccin", "repo": "nix", - "rev": "9eb0610d48dd0e1fecf772bbdacf9050d7b82d7c", + "rev": "1adbfeb44a54be0ae79eca751ba948a6faa3bb0f", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "rocksdb": "rocksdb_2" }, "locked": { - "lastModified": 1719876904, - "narHash": "sha256-rPzc2Wpkvaq/N1U0FNvUmQdzLHOJ/dLb3sQ6+04+0GI=", + "lastModified": 1719159653, + "narHash": "sha256-nLl9hKldeNuViMK/fvf2YEirlbcWeQrZXhUQORWt16w=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "20aab1792be1b637bee4e268a7bd8d163321fb63", + "rev": "6f9d7b5667c9d4ae62712d4c8e6622c97bcf93c8", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1719864345, - "narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=", + "lastModified": 1719236180, + "narHash": "sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM=", "owner": "nix-community", "repo": "disko", - "rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533", + "rev": "dd4d1663ccf7fbdb32361b9afe9e71206584cd4c", "type": "github" }, "original": { @@ -653,11 +653,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -897,11 +897,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1719180626, + "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "type": "github" }, "original": { @@ -917,11 +917,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719631702, - "narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", + "lastModified": 1719292813, + "narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2f9668e19aff06550cd154c87c0af120735a56a4", + "rev": "d6222e7818aa5528f8369afe84bc53556a57c329", "type": "github" }, "original": { @@ -941,11 +941,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1719818887, - "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=", + "lastModified": 1718782018, + "narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429", + "rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1719832725, - "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", + "lastModified": 1719111455, + "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", + "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "type": "github" }, "original": { @@ -1097,11 +1097,11 @@ }, "nixlib": { "locked": { - "lastModified": 1719708727, - "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", + "lastModified": 1712450863, + "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", + "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "type": "github" }, "original": { @@ -1118,11 +1118,11 @@ ] }, "locked": { - "lastModified": 1719841141, - "narHash": "sha256-WOyohxFJJdfDvEB7N3eTcX44lNU2rZes1inHsyHL7mM=", + "lastModified": 1718025593, + "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "140dcc2b9a0eb87ba5e9011076a1a7af19179ab1", + "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", "type": "github" }, "original": { @@ -1133,11 +1133,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719895800, - "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", + "lastModified": 1719145664, + "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", + "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719909084, - "narHash": "sha256-GxoaFEsoQZhP7YDzLhilmlUlX2vLnzsizM6ACQlbd8A=", + "lastModified": 1719313272, + "narHash": "sha256-0YOLZ8BslZZVfpWw/fOE/zn/QKeKOdS87UjuGzI4ciQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e689d1116660575bac669cbbe1cc05999bbd2f0f", + "rev": "736555406c2a59499046a31827a1470b6c29402d", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1719663039, - "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "lastModified": 1719099622, + "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", + "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1719468428, - "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", + "lastModified": 1718983919, + "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", + "rev": "90338afd6177fc683a04d934199d693708c85a3b", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1719875930, - "narHash": "sha256-jQmdWLxRP6BzOxRF8hQEhDD7UKw7UrnYbmaAPOSaXWY=", + "lastModified": 1719302143, + "narHash": "sha256-PMtSsKvbgfoI5+rb7UBIBfIwQ4Zvjt1iChWwQL+BkGo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "7e062fcd669e261fb06cf54fe0ef2e46c3db8e83", + "rev": "a3b881f62eb3aabb97e4fc68041ef34e8029e186", "type": "github" }, "original": { @@ -1748,11 +1748,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1719873517, - "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", + "lastModified": 1719268571, + "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a11224af8d824935f363928074b4717ca2e280db", + "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "type": "github" }, "original": { @@ -1895,11 +1895,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1719650330, - "narHash": "sha256-spoLPg8Ty7LvypwM4JpuWA06B/TUcIzyjs+N1nzGha4=", + "lastModified": 1719140798, + "narHash": "sha256-3Zo8kD/NQhHTkeVSRCSXYX86fnZyk/EJ15pH365tZY0=", "owner": "dj95", "repo": "zjstatus", - "rev": "f5fd92d8ebd3152b0db4c85c6ff7b638c6f52d14", + "rev": "2f0a24cb31ce94be568e4f57051d98a9318049b9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 40ddf08..065ea9a 100644 --- a/flake.nix +++ b/flake.nix @@ -79,11 +79,24 @@ # 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/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 394788b..9324703 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -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; diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 1c4a376..664322d 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 jq]; + path = with pkgs; [jq coreutils udisks bash util-linux toybox 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 8acd75b..2ebcef8 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; @@ -49,7 +49,7 @@ environment.systemPackages = with pkgs; [ # Custom tools - auto-mount + # auto-mount #System: btrfs-progs diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1ad4cf2..702add4 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -34,18 +34,8 @@ experimental-features = "nix-command flakes"; # Deduplicate and optimize nix store auto-optimise-store = true; - 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=" - ]; + extra-substituters = ["https://cache.lix.systems"]; + trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="]; }; }; diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 3a27c32..37a8ef2 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -3,8 +3,11 @@ stdenv, system, pkgs, - util-linux, jq, + coreutils, + udisks, + toybox, + util-linux, writeShellApplication, }: writeShellApplication @@ -13,7 +16,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [pkgs.steam]; + runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest]; text = '' set -euo pipefail @@ -73,7 +76,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 "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" + 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}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi diff --git a/pkgs/default.nix b/pkgs/default.nix index 464322b..51823f9 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 {}; }