home/natto: misc changes

update st config
update pkgs and stuff
misc updates to emacs and xmonad config

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

home/natto/config/emacs/config.org

@@ -486,7 +486,7 @@ This returns the command to run in the terminal
            ("java" (concat "java" full))
            ("py" (concat "python" full))
            ("cpp" (concat "g++ " full " -o " file " && " file " && rm " file))
-           ("hs" (concat "ghc -dynamic " full " && " file " && rm " file " " file ".o"))
+           ("hs" (concat "runhaskell " full))
            ("sh" (concat "sh" full))
            ("js" (concat "node" full))
            ("ts" (concat "tsc" full " && node " file ".js && rm " file ".js" ))

home/natto/config/xmonad/xmobar.hs

@@ -37,13 +37,13 @@ config =
           Run $ Date "<fn=1>\xf073</fn> %-d/%-m/%-y/%w" "date" 10000,
           Run $ Date "%H:%M:%S" "time" 10,
           Run $ MPD ["-t", "<statei><title><fn=" ++ magenta ++ "> \xf001</fn>", "--", "-P", ">> ", "-Z", "|| ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
-          Run $ Com "/home/natto/.xmonad/lib/padding-icon.sh" ["stalonetray"] "tray" 10,
+          Run $ Com "~/.xmonad/lib/padding-icon.sh" ["stalonetray"] "tray" 10,
           Run $ Com "pamixer" ["--get-volume"] "" 100,
           Run UnsafeStdinReader
         ],
       sepChar = "*",
       alignSep = "--",
-      template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* " ++ sep ++ " <fn=1></fn>*mpd* -- *multicpu* " ++ sep ++ " *memory* " ++ sep ++ " *dynnetwork* " ++ sep ++ " *battery* " ++ sep ++ " <fn=1>\xf028</fn> <fc=" ++ green ++ ">*pamixer*%</fc> " ++ sep ++ " *date* - *time* " ++ sep ++ "*tray*"
+      template = "<action=`dmenu_run` button=1><icon=~/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* " ++ sep ++ " <fn=1></fn>*mpd* -- *multicpu* " ++ sep ++ " *memory* " ++ sep ++ " *dynnetwork* " ++ sep ++ " *battery* " ++ sep ++ " <fn=1>\xf028</fn> <fc=" ++ green ++ ">*pamixer*%</fc> " ++ sep ++ " *date* - *time* " ++ sep ++ "*tray*"
     }
 
 main :: IO ()

home/natto/config/xmonad/xmonad.hs

@@ -56,6 +56,12 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
 
   , ((modMask, xK_d),
      spawn "dmenu_run -l 20")
+
+  , ((shiftMask .|. mod1Mask, xK_v),
+     spawn "clipmenu")
+
+  , ((modMask, xK_s),
+     spawn "dmenu_websearch")
   
   , ((shiftMask, xK_Print),
      spawn "flameshot gui")

home/natto/default.nix

@@ -1,6 +1,4 @@
 { config, pkgs, lib, ... }:
-let
-in
 {
   imports = [
     ./email.nix

home/natto/pkgs.nix

@@ -18,8 +18,11 @@
     # Utils
     rage
     curl
-    dmenu
+    (dmenu.override { patches = [ ./patches/dmenu.patch ]; })
-    st
+    (st.override { 
+      patches = [ ./patches/st.patch ]; 
+      extraLibs = [ harfbuzz ];
+    })
     yt-dlp
     xclip
     xorg.xkbcomp
@@ -67,18 +70,8 @@
     wineWowPackages.stable
     master.winetricks
     tlauncher
-    lutris
     citra
-    (yuzu.overrideAttrs (_: rec {
+    yuzu
-      version = "1245";
-      src = fetchFromGitHub {
-        owner = "yuzu-emu";
-        repo = "yuzu-mainline";
-        rev = "mainline-0-${version}";
-        sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A=";
-        fetchSubmodules = true;
-      };
-    }))
     ryujinx
 
     # Dev shit
@@ -103,7 +96,6 @@
     })
     python3Packages.pygments
     inform7
-    gnome-inform7
 
     # Misc
     teams
@@ -114,5 +106,6 @@
       visualizerSupport = true;
       clockSupport = true;
     })
+    libsForQt5.qtstyleplugins
   ];
 }

home/natto/services.nix

@@ -81,6 +81,7 @@ in
         };     
       };
     };
+
   };
 
   systemd.user.services = {

home/natto/stuff.nix

@@ -8,6 +8,7 @@
     sessionVariables = {
       LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]);
       TERM = "st-24bits";
+      QT_QPA_PLATFORMTHEME = "gtk2";
     };
     file = with config; {
       stalonetray = {
@@ -22,6 +23,14 @@
         source = ./config/mpv/mpv.conf;
         target = "${xdg.configHome}/mpv/mpv.conf";
       };
+      packages = {
+        text = let
+          packages = builtins.map (p: "${p.name}") config.home.packages;
+          sortedUnique = builtins.sort builtins.lessThan (lib.unique packages);
+          formatted = builtins.concatStringsSep "\n" sortedUnique;
+          in formatted;
+        target = "${xdg.configHome}/${config.home.username}-packages";
+      };
     };
   };
 }