Fzf vim sharp borders, cleanup asNeeded

3 files changed, 21 insertions, 21 deletions

diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix
index 929f6a2..cc12ee4 100644
--- a/hosts/sofue/configuration.nix
+++ b/hosts/sofue/configuration.nix
@@ -133,7 +133,7 @@ in rec {
     (pkgs.writeShellScriptBin "run-sway" ''
       export TTY=/dev/tty3
       export XDG_VTNR=3
-      export WLR_RENDERER=gles2
+      export WLR_RENDERER=vulkan
       export PULSE_SERVER=unix:/home/andrew/.pulsewire-native-socket
       export PIPEWIRE_REMOTE=/tmp/pipewire-0-manager
       cd $HOME
diff --git a/hosts/sofue/programs.nix b/hosts/sofue/programs.nix
index c47f9c1..89ff565 100644
--- a/hosts/sofue/programs.nix
+++ b/hosts/sofue/programs.nix
@@ -1,27 +1,26 @@
-{ lib, pkgs, ... }: let
-  inherit (import ../../nix/utils.nix) asNeeded;
-in {
+{ lib, pkgs, ... }: {
   environment.systemPackages = with pkgs; lib.lists.flatten [
     #dia
-    (asNeeded lib pkgs "gftp" ["gftp"])
-    (asNeeded lib pkgs "cdrtools" ["btcflash" "cdda2mp3" "cdda2ogg" "cdda2wav" "cdrecord" "devdump" "isodebug" "isodump" "isoinfo" "isovfy" "mkhybrid" "mkisofs" "readcd" "rscsi" "scgcheck" "scgskeleton"])
-    (asNeeded lib pkgs "audacity" ["audacity"])
-    (asNeeded lib pkgs "krita" ["krita"])
-    (asNeeded lib pkgs "olive-editor" ["olive-editor"])
+    (pkgs.asNeeded "gftp" ["gftp"])
+    (pkgs.asNeeded "cdrtools" ["btcflash" "cdda2mp3" "cdda2ogg" "cdda2wav" "cdrecord" "devdump" "isodebug" "isodump" "isoinfo" "isovfy" "mkhybrid" "mkisofs" "readcd" "rscsi" "scgcheck" "scgskeleton"])
+    (pkgs.asNeeded "audacity" ["audacity"])
+    (pkgs.asNeeded "krita" ["krita"])
+    (pkgs.asNeeded "olive-editor" ["olive-editor"])
     yt-dlp
-    (asNeeded lib pkgs "[chatterino2 streamlink]" ["chatterino2"])
-    (asNeeded lib pkgs "megatools" ["megacopy" "megadf" "megadl" "megaexport" "megaget" "megals" "megamkdir" "megaput" "megareg" "megarm" "megatest" "megatools"])
-    (asNeeded lib pkgs "gdown" ["gdown"])
+    (pkgs.asNeeded "[chatterino2 streamlink]" ["chatterino2"])
+    (pkgs.asNeeded "megatools" ["megacopy" "megadf" "megadl" "megaexport" "megaget" "megals" "megamkdir" "megaput" "megareg" "megarm" "megatest" "megatools"])
+    (pkgs.asNeeded "gdown" ["gdown"])
     wineWowPackages.staging
     winetricks
     cabextract
-    (asNeeded lib pkgs "looking-glass-client" ["looking-glass-client"])
-    (asNeeded lib pkgs "qbittorrent" ["qbittorrent"])
-    (asNeeded lib pkgs "ungoogled-chromium" ["chromium"])
+    (pkgs.asNeeded "looking-glass-client" ["looking-glass-client"])
+    (pkgs.asNeeded "qbittorrent" ["qbittorrent"])
+    (pkgs.asNeeded "ungoogled-chromium" ["chromium"])
+    (pkgs.asNeeded "brave" ["brave"])
     (pkgs.discord.override { withOpenASAR = true; })
-    (asNeeded lib pkgs "imv" ["imv"])
-    (asNeeded lib pkgs "mpv" ["mpv"])
-    (asNeeded lib pkgs "vlc" ["vlc"])
+    (pkgs.asNeeded "imv" ["imv"])
+    (pkgs.asNeeded "mpv" ["mpv"])
+    (pkgs.asNeeded "vlc" ["vlc"])
     camu
     camu-devshell
     mauri
diff --git a/hosts/yashinoki/programs.nix b/hosts/yashinoki/programs.nix
index 915bb21..b481d9d 100644
--- a/hosts/yashinoki/programs.nix
+++ b/hosts/yashinoki/programs.nix
@@ -4,11 +4,12 @@ in {
   environment.systemPackages = with pkgs; [
     (asNeeded lib pkgs "krita" ["krita"])
     yt-dlp
-    (asNeeded lib pkgs "[wineWowPackages.staging winetricks cabextract]" ["function_grep.pl" "msidb" "msiexec" "notepad" "regedit" "regsvr32" "widl" "wine" "wine-preloader" "wine64" "wine64-preloader" "wineboot" "winebuild" "winecfg" "wineconsole" "winecpp" "winedbg" "winedump" "winefile" "wineg++" "winegcc" "winemaker" "winemine" "winepath" "wineserver" "wmc" "wrc"])
+    (pkgs.asNeeded "[wineWowPackages.staging winetricks cabextract]" ["function_grep.pl" "msidb" "msiexec" "notepad" "regedit" "regsvr32" "widl" "wine" "wine-preloader" "wine64" "wine64-preloader" "wineboot" "winebuild" "winecfg" "wineconsole" "winecpp" "winedbg" "winedump" "winefile" "wineg++" "winegcc" "winemaker" "winemine" "winepath" "wineserver" "wmc" "wrc"])
     (pkgs.discord.override { withOpenASAR = true; })
-    (asNeeded lib pkgs "imv" ["imv"])
-    (asNeeded lib pkgs "mpv" ["mpv"])
+    (pkgs.asNeeded "imv" ["imv"])
+    (pkgs.asNeeded "mpv" ["mpv"])
     camu
+    camu-devshell
   ];
   local.scripts.imports = [
     "battery"