From a788dd9a0273fc4aac68197934eb8f25f4b367f2 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 1 Apr 2025 16:50:35 -0400 Subject: Fzf vim sharp borders, cleanup asNeeded --- files/nvim/init.vim | 6 +++++- flake.lock | 28 ++++++++++++++-------------- flake.nix | 9 ++++++++- hosts/sofue/configuration.nix | 2 +- hosts/sofue/programs.nix | 33 ++++++++++++++++----------------- hosts/yashinoki/programs.nix | 7 ++++--- nix/gaming.nix | 25 ++++++++++++------------- nix/user.nix | 13 ++++++------- nix/utils.nix | 7 ------- 9 files changed, 66 insertions(+), 64 deletions(-) delete mode 100644 nix/utils.nix diff --git a/files/nvim/init.vim b/files/nvim/init.vim index b05acbd..35a55b9 100644 --- a/files/nvim/init.vim +++ b/files/nvim/init.vim @@ -113,7 +113,11 @@ let g:fzf_colors = { \'header': ['fg', 'Type'] \} let g:fzf_preview_window = ['right,47%'] -let g:fzf_layout = { 'window': { 'width': 0.75, 'height': 0.60 } } +" This is redundant but I want to keep FZF_DEFAULT_OPTS here. +let $FZF_DEFAULT_OPTS = '--preview-window=border-sharp' +let g:fzf_layout = { + \'window': { 'width': 0.75, 'height': 0.60, 'rounded': 0 }, +\} function! StatuslineMode() abort if mode() == nr2char(22) diff --git a/flake.lock b/flake.lock index 00e49bb..7553229 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1742086029, - "narHash": "sha256-Q9eJIDnzzPlacnQZ7He8uRQbtwTvU+e9U4qQLZkf4ec=", + "lastModified": 1743463234, + "narHash": "sha256-R3XjF+CQaIyk7YZYj06wIcE+zhb4HpZBehumUy4pfCI=", "ref": "refs/heads/master", - "rev": "f0accac221a53633380f15b4953ca4f4fdfbeca7", - "revCount": 104, + "rev": "a9667e44efb204846092ec65beb2673c7f998889", + "revCount": 108, "type": "git", "url": "https://git.akon.city/camu" }, @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1735091652, - "narHash": "sha256-Af3GqjV/w7ff6k7u9rNfGnattVkPB0Ejv9p/5S6kwEo=", + "lastModified": 1743466986, + "narHash": "sha256-mL2KLnz/+LuTl2rb0lKvFSsj/ZUkY4adBQd/Kx4qSHQ=", "ref": "refs/heads/master", - "rev": "f5ceeabf64a03c08b4de2d57dd20de3bbe855a77", - "revCount": 62, + "rev": "f2318df4bfda763eafb6d535175e246ad18ac6a3", + "revCount": 65, "type": "git", "url": "https://git.akon.city/mauri" }, @@ -144,11 +144,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1741870048, - "narHash": "sha256-odXRdNZGdXg1LmwlAeWL85kgy/FVHsgKlDwrvbR2BsU=", + "lastModified": 1743125458, + "narHash": "sha256-0z+5AMacL2Eqo92fAd0eCWeKVecWrxPJwd5/BIfcdJ8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "5d76001e33ee19644a598ad80e7318ab0957b122", + "rev": "394c77f61ac76399290bfc2ef9d47b1fba31b215", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743432156, - "narHash": "sha256-2/E1HKZPCa6yFzAqG9Hva6nn7y0fHs41cI39p31l80g=", + "lastModified": 1743472829, + "narHash": "sha256-r43stBd6qx6oTSidM4zpTl6WrIxwIB9DKHTu3Y9+P8c=", "owner": "nix-community", "repo": "NUR", - "rev": "eab90f0687a564764388d6a993ea719800fe385c", + "rev": "f80cb1507bdf2051df68ce49bd2010b10345184d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c857ba9..9c7b792 100644 --- a/flake.nix +++ b/flake.nix @@ -133,8 +133,15 @@ system = system; modules = [ self.settingsModule - ({ ... }: { nixpkgs.overlays = [ + ({ lib, ... }: { nixpkgs.overlays = [ nur.overlays.default + (self: super: { + asNeeded = (pkg: commands: + (lib.lists.forEach commands (command: super.writeShellScriptBin "${command}" '' + install-as-needed "${pkg}" ${command} ''$@ + '')) + ); + }) (self: super: { local-fonts = super.stdenv.mkDerivation local-fonts; }) (self: super: { camu = camu.packages.${system}.default; 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" diff --git a/nix/gaming.nix b/nix/gaming.nix index a2d866f..821ae5b 100644 --- a/nix/gaming.nix +++ b/nix/gaming.nix @@ -1,25 +1,24 @@ { config, lib, pkgs, ... }: let loc = config.local; colo = loc.scheme; - inherit (import ./utils.nix) asNeeded; in { users.users.andrew = { extraGroups = [ "gamemode" ]; }; environment.systemPackages = with pkgs; lib.lists.flatten [ mangohud - (asNeeded lib pkgs "protontricks" ["protontricks" "protontricks-launch"]) - (asNeeded lib pkgs "[lutris umu-launcher]" ["lutris"]) - (asNeeded lib pkgs "prismlauncher" ["prismlauncher"]) - (asNeeded lib pkgs "retroarch" ["retroarch"]) - (asNeeded lib pkgs "dolphin-emu" ["dolphin-emu"]) - (asNeeded lib pkgs "pcsx2" ["pcsx2-qt"]) - (asNeeded lib pkgs "(ppsspp.override { enableQt = true; })" ["ppsspp"]) - (asNeeded lib pkgs "cemu" ["cemu"]) - (asNeeded lib pkgs "rpcs3" ["rpcs3"]) - (asNeeded lib pkgs "ryujinx" ["ryujinx"]) - (asNeeded lib pkgs "osu-lazer-bin" ["osu!"]) - (asNeeded lib pkgs "parsec-bin" ["parsecd"]) + (pkgs.asNeeded "protontricks" ["protontricks" "protontricks-launch"]) + (pkgs.asNeeded "[lutris umu-launcher]" ["lutris"]) + (pkgs.asNeeded "prismlauncher" ["prismlauncher"]) + (pkgs.asNeeded "retroarch" ["retroarch"]) + (pkgs.asNeeded "dolphin-emu" ["dolphin-emu"]) + (pkgs.asNeeded "pcsx2" ["pcsx2-qt"]) + (pkgs.asNeeded "(ppsspp.override { enableQt = true; })" ["ppsspp"]) + (pkgs.asNeeded "cemu" ["cemu"]) + (pkgs.asNeeded "rpcs3" ["rpcs3"]) + (pkgs.asNeeded "ryujinx" ["ryujinx"]) + (pkgs.asNeeded "osu-lazer-bin" ["osu!"]) + (pkgs.asNeeded "parsec-bin" ["parsecd"]) (pkgs.writeShellScriptBin "run-steam-gamescope" '' export TTY=/dev/tty4 export XDG_VTNR=4 diff --git a/nix/user.nix b/nix/user.nix index 057f95f..fce8bfc 100644 --- a/nix/user.nix +++ b/nix/user.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: let loc = config.local; colo = loc.scheme; - inherit (import ./utils.nix) asNeeded; in { users.users.andrew = { isNormalUser = true; @@ -65,15 +64,15 @@ in { (python3.withPackages (python-pkgs: [ python-pkgs.requests python-pkgs.beautifulsoup4 ])) htop neofetch - (asNeeded lib pkgs "cmatrix" ["cmatrix"]) + (pkgs.asNeeded "cmatrix" ["cmatrix"]) hdparm usbutils cryptsetup - (asNeeded lib pkgs "nix-index" ["nix-channel-index" "nix-index" "nix-locate"]) + (pkgs.asNeeded "nix-index" ["nix-channel-index" "nix-index" "nix-locate"]) imagemagick - (asNeeded lib pkgs "optipng" ["optipng"]) - (asNeeded lib pkgs "dmtx-utils" ["dmtxquery" "dmtxread" "dmtxwrite"]) - (asNeeded lib pkgs "zbar" ["zbarcam" "zbarcam-gtk" "zbarcam-qt" "zbarimg"]) + (pkgs.asNeeded "optipng" ["optipng"]) + (pkgs.asNeeded "dmtx-utils" ["dmtxquery" "dmtxread" "dmtxwrite"]) + (pkgs.asNeeded "zbar" ["zbarcam" "zbarcam-gtk" "zbarcam-qt" "zbarimg"]) perlPackages.ArchiveZip b3sum libfaketime @@ -81,7 +80,7 @@ in { dos2unix socat curl - (asNeeded lib pkgs "httrack" ["htsserver" "httrack" "proxytrack" "webhttrack"]) + (pkgs.asNeeded "httrack" ["htsserver" "httrack" "proxytrack" "webhttrack"]) libuchardet (unzip.override { enableNLS = true; }) rar diff --git a/nix/utils.nix b/nix/utils.nix deleted file mode 100644 index 9219048..0000000 --- a/nix/utils.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - asNeeded = (lib: pkgs: pkg: commands: - (lib.lists.forEach commands (command: pkgs.writeShellScriptBin "${command}" '' - install-as-needed "${pkg}" ${command} ''$@ - '')) - ); -} -- cgit v1.2.3-101-g0448