idk what tehf uck i changed

6 files changed, 39 insertions, 27 deletions

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";