nydragon/nix-da
1
Fork 0
Code Issues Pull requests Activity Actions 1

chore: move nixpkgs override to overlay

Browse source
This commit is contained in:
Nydragon 2024-08-21 04:55:19 +02:00
parent 3d7a3bb194
commit b65b91652d
Signed by: nydragon
SSH key fingerprint: SHA256:iQnIC12spf4QjWSbarmkD2No1cLMlu6TWoV7K6cYF5g
6 changed files with 43 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home/rofi/default.nix
View file

@ -24,7 +24,7 @@ lib.mkIf config.programs.rofi.enable {
# WARNING: ABI version mismatch # WARNING: ABI version mismatch
# "calc" # "calc"
"clipboard:${lib.my.checkPath pkgs.cliphist "cliphist-rofi-img"}" "clipboard:${lib.my.checkPath pkgs.cliphist "cliphist-rofi-img"}"
"obsidian:${lib.my.checkPath pkgs.custom.rofi-obsidian "rofi-obsidian"}" "obsidian:${lib.my.checkPath pkgs.rofi-obsidian "rofi-obsidian"}"
]; ];
matching = "fuzzy"; matching = "fuzzy";
sort = true; sort = true;

12
home/scripts/default.nix
View file

@ -1,4 +1,9 @@
{ pkgs, lib, ... }: {
pkgs,
lib,
config,
...
}:
let let
nixos-rebuild = nixos-rebuild =
@ -53,7 +58,10 @@ in
getext = pkgs.writeScriptBin "ls | grep -E \"\.[a-zA-Z0-9]+$\" --only-matching | sort | uniq"; getext = pkgs.writeScriptBin "ls | grep -E \"\.[a-zA-Z0-9]+$\" --only-matching | sort | uniq";
rpaste = pkgs.writers.writeBashBin "rpaste" ''curl -F "file=@$1" http://rusty.ccnlc.eu/''; rpaste = pkgs.writers.writeBashBin "rpaste" ''
export $(cat ${config.age.secrets.rustypaste.path} | xargs)
curl -F "file=@$1" -H "Authorization: $AUTH_TOKEN" http://rusty.ccnlc.eu/
'';
gentest = nixos-rebuild "gentest" "test"; gentest = nixos-rebuild "gentest" "test";

6
home/sway/default.nix
View file

@ -91,8 +91,8 @@
"--locked XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-pause"; "--locked XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
"--locked XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next"; "--locked XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
"--locked XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous"; "--locked XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
"Print" = "exec ${pkgs.custom.scripts.screenshot}/bin/screenshot"; "Print" = "exec ${pkgs.scripts.screenshot}/bin/screenshot";
"${mod}+u" = "exec ${pkgs.custom.scripts.screenshot}/bin/screenshot"; "${mod}+u" = "exec ${pkgs.scripts.screenshot}/bin/screenshot";
"${mod}+Shift+u" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.swappy}/bin/swappy -f -"; "${mod}+Shift+u" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.swappy}/bin/swappy -f -";
#: Workspace movement {{{ #: Workspace movement {{{
@ -127,7 +127,7 @@
{ command = "${pkgs.kdeconnect}/bin/kdeconnect-indicator"; } { command = "${pkgs.kdeconnect}/bin/kdeconnect-indicator"; }
{ command = "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"; } { command = "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"; }
{ {
command = "${pkgs.custom.scripts.set-background}/bin/set-background -f ${wallpaper}"; command = "${pkgs.scripts.set-background}/bin/set-background -f ${wallpaper}";
always = true; always = true;
} }
{ {

12
hosts/brontes/home.nix
View file

@ -71,12 +71,12 @@
ripgrep ripgrep
wl-clipboard wl-clipboard
custom.scripts.nixedit scripts.nixedit
custom.scripts.set-background scripts.set-background
custom.scripts.fishl scripts.fishl
custom.scripts.rpaste scripts.rpaste
custom.scripts.genswitch scripts.genswitch
custom.scripts.gentest scripts.gentest
]; ];
}; };

12
hosts/marr/home.nix
View file

@ -71,12 +71,12 @@
swaybg swaybg
wl-clipboard wl-clipboard
custom.scripts.screenshot scripts.screenshot
custom.scripts.nixedit scripts.nixedit
custom.scripts.set-background scripts.set-background
custom.scripts.rpaste scripts.rpaste
custom.scripts.genswitch scripts.genswitch
custom.scripts.gentest scripts.gentest
]; ];
}; };
}; };

17
modules/nix/overlays.nix
View file

@ -1,3 +1,9 @@
{
inputs,
config,
lib,
...
}:
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
# Add env vars to calibre so they may get propagated to a plugin that needs them # Add env vars to calibre so they may get propagated to a plugin that needs them
@ -18,5 +24,16 @@
youtubeSupport = false; youtubeSupport = false;
}; };
}) })
(final: prev: {
scripts = import ../../home/scripts {
inherit lib config;
pkgs = prev.pkgs;
};
})
(final: prev: {
rofi-obsidian = inputs.rofi-obsidian.outputs.packages.${prev.pkgs.system}.rofi-obsidian;
})
]; ];
} }