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

refactor: move scripts into nixpkgs via packageOverrides

Browse source
This commit is contained in:
Nydragon 2024-06-30 16:34:47 +02:00
parent f586de1cb1
commit f3c7e2b6c4
No known key found for this signature in database
GPG key ID: 14AA30A865EA1209
11 changed files with 117 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -20,8 +20,16 @@
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
overlays = [ overlays.calibre ];
config = {
allowUnfree = true;
packageOverrides = pkgs: {
custom = {
scripts = import ./home/scripts { inherit pkgs; };
};
};
};
};
lib = nixpkgs.lib;

8
home/default.nix
View file

@ -1,8 +1,2 @@
# This file contains default settings used across different systems
{
programs.nix-index = {
enable = true;
enableFishIntegration = true;
enableBashIntegration = true;
};
}
{ }

1
home/fish/default.nix
View file

@ -12,6 +12,7 @@
sd = ''cd "$(dirname "$HOME/$(env --chdir ~ fzf)")"'';
mkdir = "mkdir --parent";
cp = "cp -i";
mv = "mv -i";
};
functions =
let

2
home/neovim/default.nix
View file

@ -19,7 +19,6 @@
# Formatter
python311Packages.black # Python formatter
#rPackages.styler # R formatter
clang-tools
nodePackages_latest.prettier # JSON, JS, TS formatter
yamlfmt # YAML formatter
@ -27,6 +26,7 @@
rustfmt # Rust formatter
shfmt # Shell, Bash etc.
nixfmt-rfc-style
stylua # lua formatter
# Misc
ripgrep

9
home/sway/default.nix
View file

@ -15,9 +15,6 @@
wayland.windowManager.sway =
let
screenshot = (import ../scripts { inherit pkgs; }).screenshot;
set-background = (import ../scripts { inherit pkgs; }).set-background;
homeDirectory = config.home.homeDirectory;
term = "${pkgs.alacritty}/bin/alacritty";
filemanager = "${pkgs.gnome.nautilus}/bin/nautilus";
@ -93,8 +90,8 @@
"--locked XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
"--locked XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
"--locked XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
"Print" = "exec ${screenshot}/bin/screenshot";
"${mod}+u" = "exec ${screenshot}/bin/screenshot";
"Print" = "exec ${pkgs.custom.scripts.screenshot}/bin/screenshot";
"${mod}+u" = "exec ${pkgs.custom.scripts.screenshot}/bin/screenshot";
#: Workspace movement {{{
"--input-device=${inputs.kb.builtin} ${mod}+ampersand" = "workspace number 1";
"--input-device=${inputs.kb.builtin} ${mod}+eacute" = "workspace number 2";
@ -127,7 +124,7 @@
{ command = "${pkgs.kdeconnect}/bin/kdeconnect-indicator"; }
{ command = "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"; }
{
command = "${set-background}/bin/set-background -f ${wallpaper}";
command = "${pkgs.custom.scripts.set-background}/bin/set-background -f ${wallpaper}";
always = true;
}
{

1
hosts/brontes/configuration.nix
View file

@ -13,6 +13,7 @@
../../modules
./home.nix
];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

83
hosts/brontes/home.nix
View file

@ -33,52 +33,49 @@
stateVersion = config.system.stateVersion;
inherit username;
packages =
let
scripts = import ../../home/scripts/list.nix { inherit pkgs; };
programs = with pkgs; [
keepassxc
kdeconnect
nextcloud-client
cliphist
digikam
fragments
element-desktop
libreoffice
loupe
gnome.seahorse
gimp
vlc
pavucontrol
thunderbird
keepassxc
gnome.nautilus
lollypop
protonmail-bridge-gui
varia
signal-desktop
calibre
alacritty
packages = with pkgs; [
keepassxc
kdeconnect
nextcloud-client
cliphist
digikam
fragments
element-desktop
libreoffice
loupe
gnome.seahorse
gimp
vlc
pavucontrol
thunderbird
keepassxc
gnome.nautilus
lollypop
protonmail-bridge-gui
varia
signal-desktop
calibre
alacritty
tagger
# proprietary
obsidian
# proprietary
obsidian
# CLI tools
delta
fzf
jhead
fdupes
exiftool
sshfs
zip
unzip
lazygit
fd
ripgrep
# CLI tools
delta
fzf
jhead
fdupes
exiftool
sshfs
zip
unzip
lazygit
fd
ripgrep
];
in
programs ++ scripts;
custom.scripts.nixedit
];
};
};
}

82
hosts/marr/home.nix
View file

@ -38,52 +38,46 @@
stateVersion = config.system.stateVersion;
inherit username;
packages =
let
pk = with pkgs; [
digikam
fragments
element-desktop
libreoffice
loupe
gnome.seahorse
gimp
vlc
thunderbird
keepassxc
gnome.nautilus
lollypop
protonmail-bridge-gui
varia
signal-desktop
calibre
packages = with pkgs; [
digikam
fragments
element-desktop
libreoffice
loupe
gnome.seahorse
gimp
vlc
thunderbird
keepassxc
gnome.nautilus
lollypop
protonmail-bridge-gui
varia
signal-desktop
calibre
# Proprietary
postman
mongodb-compass
obsidian
# Proprietary
postman
mongodb-compass
obsidian
# CLI tools
delta
fzf
jhead
fdupes
exiftool
sshfs
zip
unzip
lazygit
fd
ripgrep
swaybg
];
scripts = with import ../../home/scripts { inherit pkgs; }; [
screenshot
set-background
nixedit
];
in
scripts ++ pk;
# CLI tools
delta
fzf
jhead
fdupes
exiftool
sshfs
zip
unzip
lazygit
fd
ripgrep
swaybg
custom.scripts.screenshot
custom.scripts.set-background
];
};
};
}

6
modules/fonts.nix
View file

@ -1,7 +1,9 @@
{ pkgs, ... }:
{
fonts = with pkgs; {
packages = [
fonts = {
enableDefaultPackages = true;
fontDir.enable = true;
packages = with pkgs; [
(nerdfonts.override { fonts = [ "Noto" ]; })
d2coding
jigmo

1
modules/home-manager.nix
View file

@ -1,5 +1,6 @@
{
home-manager = {
backupFileExtension = "backup";
useGlobalPkgs = true;
};
}

28
modules/programs/firefox.nix
View file

@ -29,16 +29,24 @@ lib.mkIf config.programs.firefox.enable {
AutofillCreditCardEnabled = false;
AutofillAddressEnabled = false;
# Check about:support for extension/add-on ID strings.
ExtensionSettings = {
"uBlock0@raymondhill.net" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
installation_mode = "normal_install";
};
"firefox-translations-addon@mozilla.org" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/firefox-translations/latest.xpi";
installation_mode = "normal_install";
};
};
# WARNING: Does not seem to install extension, i.e useless
ExtensionSettings =
let
extension = shortId: uuid: {
name = uuid;
value = {
install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
installation_mode = "force_installed";
};
};
in
builtins.listToAttrs [
(extension "ublock-origin" "uBlock0@raymondhill.net")
(extension "firefox-translations" "firefox-translations-addon@mozilla.org")
(extension "private-relay" "private-relay@firefox.com")
(extension "decentraleyes" "jid1-BoFifL9Vbdl2zQ@jetpack")
(extension "duckduckgo-for-firefox" "ddg@search.mozilla.org")
];
FirefoxHome = {
Search = true;
TopSites = false;