summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--files/nvim/mini_starter_picture.diff20
-rw-r--r--flake.nix15
-rw-r--r--hosts/sofue/configuration.nix4
-rw-r--r--hosts/sofue/programs.nix32
-rw-r--r--hosts/yashinoki/configuration.nix1
-rw-r--r--hosts/yashinoki/programs.nix16
-rw-r--r--nix/amdgpu.nix10
-rw-r--r--nix/gaming.nix28
-rw-r--r--nix/intel.nix6
-rw-r--r--nix/mesa_git.nix12
-rw-r--r--nix/scripts.nix4
-rw-r--r--nix/user.nix12
12 files changed, 93 insertions, 67 deletions
diff --git a/files/nvim/mini_starter_picture.diff b/files/nvim/mini_starter_picture.diff
index 1066573..3ecd564 100644
--- a/files/nvim/mini_starter_picture.diff
+++ b/files/nvim/mini_starter_picture.diff
@@ -1,5 +1,5 @@
diff --git a/lua/mini/starter.lua b/lua/mini/starter.lua
-index 3e0570f3..3f003ba8 100644
+index 3e0570f3..0f4a384e 100644
--- a/lua/mini/starter.lua
+++ b/lua/mini/starter.lua
@@ -138,7 +138,7 @@
@@ -247,7 +247,23 @@ index 3e0570f3..3f003ba8 100644
-- Make all special symbols to update query
for _, key in ipairs(vim.split(H.get_config().query_updaters, '')) do
-@@ -1480,7 +1577,7 @@ H.echo = function(msg, is_important)
+@@ -1466,21 +1563,21 @@ H.is_something_shown = function()
+ end
+
+ -- Utilities ------------------------------------------------------------------
+-H.error = function(msg) error('(mini.starter) ' .. msg, 0) end
++H.error = function(msg) error('' .. msg, 0) end
+
+ H.check_type = function(name, val, ref, allow_nil)
+ if type(val) == ref or (ref == 'callable' and vim.is_callable(val)) or (allow_nil and val == nil) then return end
+ H.error(string.format('`%s` should be %s, not %s', name, ref, type(val)))
+ end
+
+-H.set_buf_name = function(buf_id, name) vim.api.nvim_buf_set_name(buf_id, 'ministarter://' .. buf_id .. '/' .. name) end
++H.set_buf_name = function(buf_id, name) vim.api.nvim_buf_set_name(buf_id, 'dashboard://' .. buf_id .. '/' .. name) end
+
+ H.echo = function(msg, is_important)
+ if H.get_config().silent then return end
-- Construct message chunks
msg = type(msg) == 'string' and { { msg } } or msg
diff --git a/flake.nix b/flake.nix
index 9c7b792..399779a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -240,10 +240,20 @@
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; })
+ (self: super: {
+ camu = camu.packages.${system}.default;
+ camu-devshell = camu.packages.${system}.shellWrapper;
+ })
(self: super: {
sway-unwrapped = super.sway-unwrapped.overrideAttrs (old: {
patches = old.patches ++ [];
@@ -254,6 +264,7 @@
mini-nvim = prev.mini-nvim.overrideAttrs (old: {
patches = [
./files/nvim/mini_starter_picture.diff
+ ./files/nvim/mini_completion_no_title.diff
];
});
fzf-vim = prev.fzf-vim.overrideAttrs (old: {
diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix
index cc12ee4..9c61f4e 100644
--- a/hosts/sofue/configuration.nix
+++ b/hosts/sofue/configuration.nix
@@ -130,14 +130,14 @@ in rec {
environment.systemPackages = with pkgs; [
linuxPackages_latest.perf
linuxPackages_latest.cpupower
- (pkgs.writeShellScriptBin "run-sway" ''
+ (writeShellScriptBin "run-sway" ''
export TTY=/dev/tty3
export XDG_VTNR=3
export WLR_RENDERER=vulkan
export PULSE_SERVER=unix:/home/andrew/.pulsewire-native-socket
export PIPEWIRE_REMOTE=/tmp/pipewire-0-manager
cd $HOME
- exec ${pkgs.kbd}/bin/openvt --switch --login --console 3 -f -- ${pkgs.sway}/bin/sway
+ exec ${kbd}/bin/openvt --switch --login --console 3 -f -- ${sway}/bin/sway
'')
pipewire # Using server from host.
pavucontrol
diff --git a/hosts/sofue/programs.nix b/hosts/sofue/programs.nix
index 89ff565..66852a2 100644
--- a/hosts/sofue/programs.nix
+++ b/hosts/sofue/programs.nix
@@ -1,26 +1,26 @@
{ lib, pkgs, ... }: {
environment.systemPackages = with pkgs; lib.lists.flatten [
#dia
- (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"])
+ (asNeeded "gftp" ["gftp"])
+ (asNeeded "cdrtools" ["btcflash" "cdda2mp3" "cdda2ogg" "cdda2wav" "cdrecord" "devdump" "isodebug" "isodump" "isoinfo" "isovfy" "mkhybrid" "mkisofs" "readcd" "rscsi" "scgcheck" "scgskeleton"])
+ (asNeeded "audacity" ["audacity"])
+ (asNeeded "krita" ["krita"])
+ (asNeeded "olive-editor" ["olive-editor"])
yt-dlp
- (pkgs.asNeeded "[chatterino2 streamlink]" ["chatterino2"])
- (pkgs.asNeeded "megatools" ["megacopy" "megadf" "megadl" "megaexport" "megaget" "megals" "megamkdir" "megaput" "megareg" "megarm" "megatest" "megatools"])
- (pkgs.asNeeded "gdown" ["gdown"])
+ (asNeeded "[chatterino2 streamlink]" ["chatterino2"])
+ (asNeeded "megatools" ["megacopy" "megadf" "megadl" "megaexport" "megaget" "megals" "megamkdir" "megaput" "megareg" "megarm" "megatest" "megatools"])
+ (asNeeded "gdown" ["gdown"])
wineWowPackages.staging
winetricks
cabextract
- (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; })
- (pkgs.asNeeded "imv" ["imv"])
- (pkgs.asNeeded "mpv" ["mpv"])
- (pkgs.asNeeded "vlc" ["vlc"])
+ (asNeeded "looking-glass-client" ["looking-glass-client"])
+ (asNeeded "qbittorrent" ["qbittorrent"])
+ (asNeeded "ungoogled-chromium" ["chromium"])
+ (asNeeded "brave" ["brave"])
+ (discord.override { withOpenASAR = true; })
+ (asNeeded "imv" ["imv"])
+ (asNeeded "mpv" ["mpv"])
+ (asNeeded "vlc" ["vlc"])
camu
camu-devshell
mauri
diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix
index 88a3674..44a462b 100644
--- a/hosts/yashinoki/configuration.nix
+++ b/hosts/yashinoki/configuration.nix
@@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }:
let
loc = config.local;
+ colo = loc.scheme;
inherit (import ../../nix/settings.nix) disks;
in {
imports = [
diff --git a/hosts/yashinoki/programs.nix b/hosts/yashinoki/programs.nix
index b481d9d..6811372 100644
--- a/hosts/yashinoki/programs.nix
+++ b/hosts/yashinoki/programs.nix
@@ -1,13 +1,11 @@
-{ pkgs, ... }: let
- inherit (import ../../nix/utils.nix) asNeeded;
-in {
- environment.systemPackages = with pkgs; [
- (asNeeded lib pkgs "krita" ["krita"])
+{ lib, pkgs, ... }: {
+ environment.systemPackages = with pkgs; lib.lists.flatten [
+ (asNeeded "krita" ["krita"])
yt-dlp
- (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; })
- (pkgs.asNeeded "imv" ["imv"])
- (pkgs.asNeeded "mpv" ["mpv"])
+ (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"])
+ (discord.override { withOpenASAR = true; })
+ (asNeeded "imv" ["imv"])
+ (asNeeded "mpv" ["mpv"])
camu
camu-devshell
];
diff --git a/nix/amdgpu.nix b/nix/amdgpu.nix
index 3b6a1c6..9c25608 100644
--- a/nix/amdgpu.nix
+++ b/nix/amdgpu.nix
@@ -1,17 +1,17 @@
{ pkgs, ... }: {
boot.kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
- environment.sessionVariables = {
+ environment.sessionVariables = with pkgs; {
VDPAU_DRIVER = "radeonsi";
LIBVA_DRIVER_NAME = "radeonsi";
AMD_VULKAN_ICD = "RADV";
- VK_ICD_FILENAMES="${pkgs.pkgsi686Linux.mesa}/share/vulkan/icd.d/radeon_icd.i686.json:${pkgs.mesa}/share/vulkan/icd.d/radeon_icd.x86_64.json";
- __EGL_VENDOR_LIBRARY_FILENAMES="${pkgs.pkgsi686Linux.mesa}/share/glvnd/egl_vendor.d/50_mesa.json:${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json";
+ VK_ICD_FILENAMES="${pkgsi686Linux.mesa}/share/vulkan/icd.d/radeon_icd.i686.json:${mesa}/share/vulkan/icd.d/radeon_icd.x86_64.json";
+ __EGL_VENDOR_LIBRARY_FILENAMES="${pkgsi686Linux.mesa}/share/glvnd/egl_vendor.d/50_mesa.json:${mesa}/share/glvnd/egl_vendor.d/50_mesa.json";
};
environment.systemPackages = with pkgs; [
radeontop
- (pkgs.writeShellScriptBin "proton-env-amdvlk" ''
+ (writeShellScriptBin "proton-env-amdvlk" ''
export AMD_VULKAN_ICD="AMDVLK"
- export VK_ICD_FILENAMES="${pkgs.amdvlk}/share/vulkan/icd.d/amd_icd64.json"
+ export VK_ICD_FILENAMES="${amdvlk}/share/vulkan/icd.d/amd_icd64.json"
proton-env "$@"
'')
];
diff --git a/nix/gaming.nix b/nix/gaming.nix
index 821ae5b..462e5bb 100644
--- a/nix/gaming.nix
+++ b/nix/gaming.nix
@@ -7,25 +7,25 @@ in {
};
environment.systemPackages = with pkgs; lib.lists.flatten [
mangohud
- (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" ''
+ (asNeeded "protontricks" ["protontricks" "protontricks-launch"])
+ (asNeeded "[lutris umu-launcher]" ["lutris"])
+ (asNeeded "prismlauncher" ["prismlauncher"])
+ (asNeeded "retroarch" ["retroarch"])
+ (asNeeded "dolphin-emu" ["dolphin-emu"])
+ (asNeeded "pcsx2" ["pcsx2-qt"])
+ (asNeeded "(ppsspp.override { enableQt = true; })" ["ppsspp"])
+ (asNeeded "cemu" ["cemu"])
+ (asNeeded "rpcs3" ["rpcs3"])
+ (asNeeded "ryujinx" ["ryujinx"])
+ (asNeeded "osu-lazer-bin" ["osu!"])
+ (asNeeded "parsec-bin" ["parsecd"])
+ (writeShellScriptBin "run-steam-gamescope" ''
export TTY=/dev/tty4
export XDG_VTNR=4
cd $HOME
exec ${pkgs.kbd}/bin/openvt --switch --login --console 4 -f -- steam-gamescope
'')
- (pkgs.writeShellScriptBin "proton-env" ''
+ (writeShellScriptBin "proton-env" ''
export STEAM_COMPAT_LAUNCHER_SERVICE=proton
export DXVK_HUD=compiler
export DXVK_LOG_LEVEL=none
diff --git a/nix/intel.nix b/nix/intel.nix
index 0ebfb8f..7b69ba8 100644
--- a/nix/intel.nix
+++ b/nix/intel.nix
@@ -1,10 +1,10 @@
{ pkgs, ... }: {
- environment.sessionVariables = {
+ environment.sessionVariables = with pkgs; {
VDPAU_DRIVER = "va_gl";
LIBVA_DRIVER_NAME = "iHD";
AMD_VULKAN_ICD = "ANV";
- VK_ICD_FILENAMES="${pkgs.pkgsi686Linux.mesa}/share/vulkan/icd.d/intel_icd.i686.json:${pkgs.mesa}/share/vulkan/icd.d/intel_icd.x86_64.json";
- __EGL_VENDOR_LIBRARY_FILENAMES="${pkgs.pkgsi686Linux.mesa}/share/glvnd/egl_vendor.d/50_mesa.json:${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json";
+ VK_ICD_FILENAMES="${pkgsi686Linux.mesa}/share/vulkan/icd.d/intel_icd.i686.json:${mesa}/share/vulkan/icd.d/intel_icd.x86_64.json";
+ __EGL_VENDOR_LIBRARY_FILENAMES="${pkgsi686Linux.mesa}/share/glvnd/egl_vendor.d/50_mesa.json:${mesa}/share/glvnd/egl_vendor.d/50_mesa.json";
};
hardware.graphics = {
extraPackages = with pkgs; [
diff --git a/nix/mesa_git.nix b/nix/mesa_git.nix
index b4bfd1f..ba2dcc1 100644
--- a/nix/mesa_git.nix
+++ b/nix/mesa_git.nix
@@ -1,15 +1,15 @@
{ pkgs, ... }: {
environment.systemPackages = with pkgs; [
- (pkgs.writeShellScriptBin "proton-env-anv" ''
+ (writeShellScriptBin "proton-env-anv" ''
export AMD_VULKAN_ICD="ANV"
- export VK_ICD_FILENAMES="${pkgs.pkgsi686Linux.mesa_git.drivers}/share/vulkan/icd.d/intel_icd.i686.json:${pkgs.mesa_git.drivers}/share/vulkan/icd.d/intel_icd.x86_64.json"
+ export VK_ICD_FILENAMES="${pkgsi686Linux.mesa_git}/share/vulkan/icd.d/intel_icd.i686.json:${mesa_git}/share/vulkan/icd.d/intel_icd.x86_64.json"
proton-env "$@"
'')
- (pkgs.writeShellScriptBin "proton-env-radv" ''
+ (writeShellScriptBin "proton-env-radv" ''
export AMD_VULKAN_ICD="RADV"
- export VK_ICD_FILENAMES="${pkgs.pkgsi686Linux.mesa_git.drivers}/share/vulkan/icd.d/radeon_icd.i686.json:${pkgs.mesa_git.drivers}/share/vulkan/icd.d/radeon_icd.x86_64.json"
- export __EGL_VENDOR_LIBRARY_FILENAMES="${pkgs.pkgsi686Linux.mesa_git.drivers}/share/glvnd/egl_vendor.d/50_mesa.json:${pkgs.mesa_git.drivers}/share/glvnd/egl_vendor.d/50_mesa.json"
- export LD_LIBRARY_PATH="${pkgs.pkgsi686Linux.mesa_git.drivers}/lib:${pkgs.mesa_git.drivers}/lib:$LD_LIBRARY_PATH"
+ export VK_ICD_FILENAMES="${pkgsi686Linux.mesa_git}/share/vulkan/icd.d/radeon_icd.i686.json:${mesa_git}/share/vulkan/icd.d/radeon_icd.x86_64.json"
+ export __EGL_VENDOR_LIBRARY_FILENAMES="${pkgsi686Linux.mesa_git}/share/glvnd/egl_vendor.d/50_mesa.json:${mesa_git}/share/glvnd/egl_vendor.d/50_mesa.json"
+ export LD_LIBRARY_PATH="${pkgsi686Linux.mesa_git}/lib:${mesa_git}/lib:$LD_LIBRARY_PATH"
proton-env "$@"
'')
];
diff --git a/nix/scripts.nix b/nix/scripts.nix
index a36d17a..e8c63f6 100644
--- a/nix/scripts.nix
+++ b/nix/scripts.nix
@@ -9,8 +9,8 @@ in {
sha256 = "sha256-sXSuKusyG1L2Stuf9BL5ZqfzOIOdeAeE3RXcrXAsLdY=";
};
};
- environment.systemPackages = [
- (pkgs.writeShellScriptBin "bemenu-colored" ''
+ environment.systemPackages = with pkgs; [
+ (writeShellScriptBin "bemenu-colored" ''
bemenu -C --single-instance -B 0 -M 0 --hp 6 \
--fn "${loc.font.name} ${toString (loc.font.size - 1)}" -H ${toString ((loc.font.size - 1) * 2)} \
--cf "#${colo.foreground}" --cb "#${colo.background}" \
diff --git a/nix/user.nix b/nix/user.nix
index fce8bfc..89b6fe1 100644
--- a/nix/user.nix
+++ b/nix/user.nix
@@ -64,15 +64,15 @@ in {
(python3.withPackages (python-pkgs: [ python-pkgs.requests python-pkgs.beautifulsoup4 ]))
htop
neofetch
- (pkgs.asNeeded "cmatrix" ["cmatrix"])
+ (asNeeded "cmatrix" ["cmatrix"])
hdparm
usbutils
cryptsetup
- (pkgs.asNeeded "nix-index" ["nix-channel-index" "nix-index" "nix-locate"])
+ (asNeeded "nix-index" ["nix-channel-index" "nix-index" "nix-locate"])
imagemagick
- (pkgs.asNeeded "optipng" ["optipng"])
- (pkgs.asNeeded "dmtx-utils" ["dmtxquery" "dmtxread" "dmtxwrite"])
- (pkgs.asNeeded "zbar" ["zbarcam" "zbarcam-gtk" "zbarcam-qt" "zbarimg"])
+ (asNeeded "optipng" ["optipng"])
+ (asNeeded "dmtx-utils" ["dmtxquery" "dmtxread" "dmtxwrite"])
+ (asNeeded "zbar" ["zbarcam" "zbarcam-gtk" "zbarcam-qt" "zbarimg"])
perlPackages.ArchiveZip
b3sum
libfaketime
@@ -80,7 +80,7 @@ in {
dos2unix
socat
curl
- (pkgs.asNeeded "httrack" ["htsserver" "httrack" "proxytrack" "webhttrack"])
+ (asNeeded "httrack" ["htsserver" "httrack" "proxytrack" "webhttrack"])
libuchardet
(unzip.override { enableNLS = true; })
rar
generated by cgit v1.2.3-101-g0448 (git 2.54.0) at 2026-07-25 17:16:26 +0000