idk what tehf uck i changed

10 files changed, 216 insertions, 147 deletions

diff --git a/flake.lock b/flake.lock
index 4ca71b8..ceb01fb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,14 +4,15 @@
       "inputs": {
         "darwin": "darwin",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1695384796,
-        "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
+        "lastModified": 1703433843,
+        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4",
+        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
         "type": "github"
       },
       "original": {
@@ -20,6 +21,28 @@
         "type": "github"
       }
     },
+    "crane": {
+      "inputs": {
+        "nixpkgs": [
+          "schizofox",
+          "searx-randomizer",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1701386725,
+        "narHash": "sha256-w4aBlMYh9Y8co1V80m5LzEKMijUJ7CBTq209WbqVwUU=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "8b9bad9b30bd7a9ed08782e64846b7485f9d0a38",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -28,11 +51,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673295039,
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
         "type": "github"
       },
       "original": {
@@ -49,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695737383,
-        "narHash": "sha256-l8gj3ly3a0ixhwE9BErrnLXMgGnO48YKYZ3+n/1U6IE=",
+        "lastModified": 1707524024,
+        "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "07dd3af9802a8e52991937fdddd4d3085c76df34",
+        "rev": "d07de570ba05cec2807d058daaa044f6955720c7",
         "type": "github"
       },
       "original": {
@@ -71,11 +94,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1695742406,
-        "narHash": "sha256-HxkMqDIy7PfyZ46bMPO/G39prSKXHbfOS2UsejZqT4g=",
+        "lastModified": 1707602717,
+        "narHash": "sha256-mLEziZaYS1G9Q2l7L1/HU+PyScfBGwgh1R4Mov7x5iY=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "3f0a01fd2408a31af91bb768260b7c0e5c2fefcf",
+        "rev": "8e23ca5dcbcd202ceb790598b38a68d7d292ef38",
         "type": "gitlab"
       },
       "original": {
@@ -85,6 +108,22 @@
         "type": "gitlab"
       }
     },
+    "flake-compat": {
+      "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": [
@@ -93,11 +132,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690933134,
-        "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
+        "lastModified": 1701473968,
+        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
+        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
         "type": "github"
       },
       "original": {
@@ -108,20 +147,14 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": [
-          "schizofox",
-          "nixpak",
-          "hercules-ci-effects",
-          "hercules-ci-agent",
-          "nixpkgs"
-        ]
+        "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1688466019,
-        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
+        "lastModified": 1698882062,
+        "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
+        "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
         "type": "github"
       },
       "original": {
@@ -147,11 +180,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1695541019,
-        "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=",
+        "lastModified": 1707211557,
+        "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296",
+        "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7",
         "type": "github"
       },
       "original": {
@@ -160,41 +193,6 @@
         "type": "github"
       }
     },
-    "haskell-flake": {
-      "locked": {
-        "lastModified": 1684780604,
-        "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
-        "owner": "srid",
-        "repo": "haskell-flake",
-        "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "ref": "0.3.0",
-        "repo": "haskell-flake",
-        "type": "github"
-      }
-    },
-    "hercules-ci-agent": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "haskell-flake": "haskell-flake",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1688568579,
-        "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=",
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-agent",
-        "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5",
-        "type": "github"
-      },
-      "original": {
-        "id": "hercules-ci-agent",
-        "type": "indirect"
-      }
-    },
     "hercules-ci-effects": {
       "inputs": {
         "flake-parts": [
@@ -202,7 +200,6 @@
           "nixpak",
           "flake-parts"
         ],
-        "hercules-ci-agent": "hercules-ci-agent",
         "nixpkgs": [
           "schizofox",
           "nixpak",
@@ -210,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689397210,
-        "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=",
+        "lastModified": 1701009247,
+        "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce",
+        "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09",
         "type": "github"
       },
       "original": {
@@ -231,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "lastModified": 1703113217,
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
         "type": "github"
       },
       "original": {
@@ -251,11 +248,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695738267,
-        "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=",
+        "lastModified": 1707607386,
+        "narHash": "sha256-hj/RgQMTvCWQVInkZwiMMieumkfOjHXhtWhfuXHop/8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486",
+        "rev": "bfd0ae29a86eff4603098683b516c67e22184511",
         "type": "github"
       },
       "original": {
@@ -272,11 +269,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693187908,
-        "narHash": "sha256-cTcNpsqi1llmUFl9bmCdD0mTyfjhBrNFPhu2W12WXzA=",
+        "lastModified": 1703838268,
+        "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8bde7a651b94ba30bd0baaa9c4a08aae88cc2e92",
+        "rev": "2aff324cf65f5f98f89d878c056b779466b17db8",
         "type": "github"
       },
       "original": {
@@ -287,11 +284,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1694622745,
-        "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=",
+        "lastModified": 1706639736,
+        "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e",
+        "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
         "type": "github"
       },
       "original": {
@@ -307,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695526222,
-        "narHash": "sha256-/NwZz3QcVplrfiDKk1thYg1EIHLSNucVHNUi2uwO3RI=",
+        "lastModified": 1707620986,
+        "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "25d6369c232bbea1ec1f90226fd17982e7a0a647",
+        "rev": "0cb4345704123492e6d1f1068629069413c80de0",
         "type": "github"
       },
       "original": {
@@ -353,11 +350,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692831528,
-        "narHash": "sha256-EG/hn6KpDCfQSVHoKoxU+4MgMs8gJzrrHtpo2atTvWo=",
+        "lastModified": 1703730102,
+        "narHash": "sha256-oXEu4FYhIgS0+qMMf1YfnseMmOStK/45S4k6XUcGi4M=",
         "owner": "nixpak",
         "repo": "nixpak",
-        "rev": "8b331d0e2f46c72731303311f65f3690b1917816",
+        "rev": "39e3350f9d473422c8cf9e7cb362241f8ed2b974",
         "type": "github"
       },
       "original": {
@@ -368,11 +365,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677676435,
-        "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
+        "lastModified": 1703013332,
+        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
+        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
         "type": "github"
       },
       "original": {
@@ -382,29 +379,31 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1695360818,
-        "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
+        "dir": "lib",
+        "lastModified": 1698611440,
+        "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
+        "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
         "type": "github"
       },
       "original": {
+        "dir": "lib",
         "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1688322751,
-        "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=",
+        "lastModified": 1707546158,
+        "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f",
+        "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
         "type": "github"
       },
       "original": {
@@ -431,19 +430,21 @@
     },
     "schizofox": {
       "inputs": {
+        "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager_3",
         "nixpak": "nixpak",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "searx-randomizer": "searx-randomizer"
       },
       "locked": {
-        "lastModified": 1693418681,
-        "narHash": "sha256-Jaz8BeHNT7Nj0wPAo8h9xSTinDIRitn/s8/T8lG8yEA=",
+        "lastModified": 1704255270,
+        "narHash": "sha256-VC3+/kDeA60MfwT6w5AMBKuHVrtTFLGmbjdTTmKjJ3I=",
         "owner": "schizofox",
         "repo": "schizofox",
-        "rev": "dacd1e479991cb0365a2ac4429308f3dc0f6d996",
+        "rev": "cd5aaffb0063f48cb3f1e62d32a890e5e19163f1",
         "type": "github"
       },
       "original": {
@@ -452,6 +453,44 @@
         "type": "github"
       }
     },
+    "searx-randomizer": {
+      "inputs": {
+        "crane": "crane",
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": [
+          "schizofox",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1701454956,
+        "narHash": "sha256-9m6QXEka8YUmAnM/o6OpPrPoYHCGFw40lNXV8VMlN24=",
+        "owner": "schizofox",
+        "repo": "searx-randomizer",
+        "rev": "46c41f2ae7107cc541ead1390f4cd6ce06045721",
+        "type": "github"
+      },
+      "original": {
+        "owner": "schizofox",
+        "repo": "searx-randomizer",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "viper-nix-common": {
       "inputs": {
         "nixpkgs-lib": [
@@ -459,11 +498,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694194362,
-        "narHash": "sha256-y6UKj2no4j6JYVXI79ZjRxU4012RY0f1PNnNO2LqYpY=",
+        "lastModified": 1707588042,
+        "narHash": "sha256-/EBc4S7t4LorJCtvaD5Pn/Rqs7IqtGKooI3qD0DLWUI=",
         "owner": "viperML",
         "repo": "nix-common",
-        "rev": "147c204a4b14cd1ed458c7320217d11109019569",
+        "rev": "1a150b28922e042ea73d6f18ae4b11b8559a05fe",
         "type": "github"
       },
       "original": {
diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix
index 22f253b..bf75cf0 100644
--- a/hosts/navi/default.nix
+++ b/hosts/navi/default.nix
@@ -102,7 +102,7 @@
         "/var/lib/docker"
       ];
       users.tzlil = {
-        directories = [".config/SchildiChat" ".local/share/Terraria" ".local/share/Steam"];
+        directories = [".config/SchildiChat" ".local/share/Terraria" ".local/share/Steam" ".config/keepassxc" ".local/share/cinny"];
       };
     };
 
@@ -118,15 +118,20 @@
       ${lib.getExe mullvad} account login < ${config.age.secrets.mullvad.path}
       ${lib.getExe mullvad} auto-connect set on
       ${lib.getExe mullvad} lockdown-mode set on
-      ${lib.getExe mullvad} tunnel ipv6 set on
+      ${lib.getExe mullvad} tunnel set ipv6 on
     '';
 
     home-manager.users.tzlil = {
+      services.gnome-keyring = {
+      	enable = true; # for nheko
+	components = ["secrets"];
+      };
       home.packages = [
-        pkgs.schildichat-desktop-wayland
+	pkgs.nheko
         pkgs.keepassxc
         pkgs.gtkcord4
         pkgs.cmst
+        pkgs.nheko
 
         # (pkgs.stdenv.mkDerivation rec {
         #   name = "pragmata";
@@ -175,7 +180,7 @@
         # })
         # pkgs.apl386
 
-        (pkgs.cutter.withPlugins (ps: with ps; [rz-ghidra sigdb]))
+        #(pkgs.cutter.withPlugins (ps: with ps; [rz-ghidra sigdb]))
 
         (pkgs.discord.override {
           withOpenASAR = true;
@@ -188,14 +193,15 @@
       #   settings.colors.webpage.darkmode.enabled = true;
       # };
 
-      xdg.configFile."keepassxc/keepassxc.ini".text = lib.generators.toINI {} {
-        General = {ConfigVersion = 2;};
-        Browser = {
-          AlwaysAllowAccess = true;
-          Enabled = true;
-        };
-        GUI = {ApplicationTheme = "dark";};
-      };
+      #xdg.configFile."keepassxc/keepassxc.ini".text = lib.generators.toINI {} {
+      #  General = {ConfigVersion = 2;};
+      #  Browser = {
+      #    AlwaysAllowAccess = true;
+      #    Enabled = true;
+      #  };
+      #  GUI = {ApplicationTheme = "dark";};
+      #};
+
       home.file.".cache/keepassxc/keepassxc.ini".text = lib.generators.toINI {} {
         General = {LastActiveDatabase = "${config.services.syncthing.dataDir}/passwords/passwords.kdbx";};
       };
@@ -290,7 +296,12 @@
 
     virtualisation.docker.enable = true;
     virtualisation.docker.storageDriver = "btrfs";
+	
+    # rtl sdr
+    hardware.rtl-sdr.enable = true;
+    users.users.tzlil.extraGroups = [ "plugdev" ];
 
+    services.udev.packages = [ pkgs.usb-blaster-udev-rules ];
     # pragmata
     # home-manager.users.tzlil.home.packages = [
 
diff --git a/hosts/vps/services/matrix.nix b/hosts/vps/services/matrix.nix
index a3be7a2..a56b489 100644
--- a/hosts/vps/services/matrix.nix
+++ b/hosts/vps/services/matrix.nix
@@ -136,10 +136,11 @@
       '';
       # for clients
       virtualHosts."tzlil.net".extraConfig = ''
-        reverse_proxy /_matrix/* localhost:8008
-        header /.well-known/matrix/* Content-Type application/json
-        header /.well-known/matrix/* Access-Control-Allow-Origin *
-        respond /.well-known/matrix/server `{"m.server": "tzlil.net"}`
+               reverse_proxy /_matrix/* localhost:8008
+               header /.well-known/matrix/* Content-Type application/json
+               header /.well-known/matrix/* Access-Control-Allow-Origin *
+               respond /.well-known/matrix/server `{"m.server": "tzlil.net"}`
+        respond /.well-known/matrix/client `{"m.homeserver": {"base_url": "https://tzlil.net"}}`
       '';
     };
     networking.firewall.allowedTCPPorts = [8448];
diff --git a/hosts/vps/services/website.nix b/hosts/vps/services/website.nix
index 95dea73..1cdd33e 100644
--- a/hosts/vps/services/website.nix
+++ b/hosts/vps/services/website.nix
@@ -48,6 +48,10 @@
                  a { color: #7878ff; }
                  a:visited { color: #6464fa; }
              }
+	     .mail:before {
+	       content: attr(b) "\0040" attr(a);
+	       unicode-bidi: bidi-override;
+	       direction: rtl;
              </style>
              <pre>
             ~?~+=I?~~IIIII++,:   .?= .,I=O8OZ.DNNO, ZD7:::=.? ,,:,,I,,:,~+?II?I?II?=+=~+7$ZO
@@ -75,6 +79,8 @@
             <a href="https://fm.tzlil.net">fm.tzlil.net</a> music
             <a href="https://git.tzlil.net">git.tzlil.net</a> code
             <a href="/arXiv">arXiv randomizer</a>
+	    matrix @tzlil:tzlil.net
+	    email tzlils protonmail com
             </pre>
           ''} /
             file_server
diff --git a/mixins/cli.nix b/mixins/cli.nix
index db81d4b..e43f4f2 100644
--- a/mixins/cli.nix
+++ b/mixins/cli.nix
@@ -36,11 +36,10 @@
 
           (
             let
-              hs = pkgs.ghc.withPackages (p: with p; [relude pretty-simple pointfree]);
+              hs = pkgs.ghc.withPackages (p: with p; [pretty-simple pointfree parsec]);
             in
               pkgs.writeShellScriptBin "hs" ''
                 exec ${hs}/bin/ghci -ghci-script ${pkgs.writeText "ghci.conf" ''
-                    :set -XNoImplicitPrelude
                     :set -XFlexibleContexts
                     :set -XFlexibleInstances
                     :set -XOverloadedStrings
@@ -48,8 +47,7 @@
                     :set prompt "\ESC[38;5;208m\STXλ>\ESC[m\STX "
                     :set -ferror-spans -freverse-errors -fprint-expanded-synonyms
                     :set -interactive-print Text.Pretty.Simple.pPrint
-                  :def pf \str -> return $ ":! ${hs}/bin/pointfree \"" ++ str ++ "\""
-                    import Relude''}
+                  :def pf \str -> return $ ":! ${hs}/bin/pointfree \"" ++ str ++ "\""''}
               ''
           )
         ];
diff --git a/mixins/firefox/default.nix b/mixins/firefox/default.nix
index 857162e..1379b9e 100644
--- a/mixins/firefox/default.nix
+++ b/mixins/firefox/default.nix
@@ -14,7 +14,7 @@ in
       # gives me access to addonId and crap
       firefox-addons = pkgs.callPackage (pkgs.applyPatches {
         src = inputs.firefox-addons;
-        patches = [./addons-passthru.patch];
+        #patches = [./addons-passthru.patch];
         name = "firefox-addons-patched";
       }) {};
       addons = config.home-manager.users.tzlil.programs.firefox.profiles.${profile}.extensions;
diff --git a/mixins/firefox/minimum/addons-passthru.patch b/mixins/firefox/minimum/addons-passthru.patch
index 6bd149d..07e789d 100644
--- a/mixins/firefox/minimum/addons-passthru.patch
+++ b/mixins/firefox/minimum/addons-passthru.patch
@@ -13,4 +13,4 @@ index 3098b10..806d05c 100644
 +      };
  
        buildCommand = ''
-         dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
\ No newline at end of file
+         dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
diff --git a/mixins/firefox/minimum/default.nix b/mixins/firefox/minimum/default.nix
index 8ecf48a..e495ce2 100644
--- a/mixins/firefox/minimum/default.nix
+++ b/mixins/firefox/minimum/default.nix
@@ -13,7 +13,7 @@ in
     home-manager.users.tzlil = let
       firefox-addons = pkgs.callPackage (pkgs.applyPatches {
         src = inputs.firefox-addons;
-        patches = [./addons-passthru.patch];
+        #patches = [./addons-passthru.patch];
         name = "firefox-addons-patched";
       }) {};
       mozlz4 = n: x:
diff --git a/mixins/multimedia.nix b/mixins/multimedia.nix
index 2e99771..9405934 100644
--- a/mixins/multimedia.nix
+++ b/mixins/multimedia.nix
@@ -23,6 +23,7 @@
           "image/png" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"];
           "image/jpeg" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"];
         };
+	associations.added = config.home-manager.users.tzlil.xdg.mimeApps.defaultApplications;
       };
       userDirs = {
         createDirectories = true;
@@ -74,6 +75,37 @@
         enable = true;
         options = {
           selection-clipboard = "clipboard";
+          notification-error-bg = "#ff5555";
+          notification-error-fg = "#f8f8f2";
+          notification-warning-bg = "#ffb86c";
+          notification-warning-fg = "#44475a";
+          notification-bg = "#282a36";
+          notification-fg = "#f8f8f2";
+          completion-bg = "#282a36";
+          completion-fg = "#6272a4";
+          completion-group-bg = "#282a36";
+          completion-group-fg = "#6272a4";
+          completion-highlight-bg = "#44475a";
+          completion-highlight-fg = "#f8f8f2";
+          index-bg = "#282a36";
+          index-fg = "#f8f8f2";
+          index-active-bg = "#44475a";
+          index-active-fg = "#f8f8f2";
+          inputbar-bg = "#282a36";
+          inputbar-fg = "#f8f8f2";
+          statusbar-bg = "#282a36";
+          statusbar-fg = "#f8f8f2";
+          highlight-color = "#ffb86c";
+          highlight-active-color = "#ff79c6";
+          default-bg = "#282a36";
+          default-fg = "#f8f8f2";
+          render-loading = true;
+          render-loading-fg = "#282a36";
+          render-loading-bg = "#f8f8f2";
+          recolor-lightcolor = "#282a36";
+          recolor-darkcolor = "#f8f8f2";
+          adjust-open = "width";
+          recolor = true;
         };
       };
     };
diff --git a/mixins/sway.nix b/mixins/sway.nix
index 5981049..a3eaf4b 100644
--- a/mixins/sway.nix
+++ b/mixins/sway.nix
@@ -3,25 +3,7 @@
   pkgs,
   lib,
   ...
-}: let
-  menuscript =
-    pkgs.writeShellScript "menu"
-    ''
-      #!/bin/sh -eu
-
-      in_pipe="$XDG_RUNTIME_DIR/menu-in.$$.pipe"
-      out_pipe="$XDG_RUNTIME_DIR/menu-out.$$.pipe"
-
-      mkfifo "$in_pipe" "$out_pipe"
-      trap "rm -f $in_pipe $out_pipe" EXIT
-
-      app_id=menu
-      chooser="${lib.getExe pkgs.fzf} <$in_pipe >$out_pipe"
-      ${lib.getExe pkgs.foot} -W40x40 --app-id "$app_id" -- sh -c "$chooser" &
-      cat >"$in_pipe"
-      cat <"$out_pipe"
-    '';
-in {
+}: {
   config = {
     security.pam.services.swaylock = {};
     home-manager.users.tzlil = {
@@ -154,7 +136,7 @@ in {
           keybindings = {
             "${modifier}+Return" = "exec $term";
             "${modifier}+q" = "kill";
-            "${modifier}+d" = "exec ${pkgs.dmenu}/bin/dmenu_path | ${menuscript} | xargs swaymsg exec --";
+            "${modifier}+d" = "exec ${lib.getExe pkgs.kickoff}";
             "${modifier}+Shift+c" = "reload";
             "${modifier}+Shift+q" = "exec swaynag -t warning -m 'you sure?' -B 'yes' 'swaymsg exit' -s 'no'";
             "${modifier}+Shift+p" = "exec systemctl poweroff";