refactor: replaced all with with builtins.attrValues

This commit is contained in:
Nick 2024-11-04 19:24:06 -06:00
parent f87d465a2c
commit b08a7694a5
12 changed files with 236 additions and 153 deletions

View file

@ -65,69 +65,91 @@ let
in {
flake.homeModules = {
desktop = {
imports = with modules; [
brave
firefox
misc-android
misc-desktop
misc-internet
qbittorrent
vscode
];
imports = builtins.attrValues {
inherit
(modules)
brave
firefox
misc-android
misc-desktop
misc-internet
qbittorrent
vscode
;
};
};
entertainment = {
imports = with modules; [
freetube
misc-entertainment
mpv
steam
];
imports = builtins.attrValues {
inherit
(modules)
freetube
misc-entertainment
mpv
steam
;
};
};
productionArt = {
imports = with modules; [
misc-productionArt
];
imports = builtins.attrValues {
inherit
(modules)
misc-productionArt
;
};
};
productionAudio = {
imports = with modules; [
misc-productionAudio
];
imports = builtins.attrValues {
inherit
(modules)
misc-productionAudio
;
};
};
productionVideo = {
imports = with modules; [
misc-productionVideo
obs-studio
];
imports = builtins.attrValues {
inherit
(modules)
misc-productionVideo
obs-studio
;
};
};
productionWriting = {
imports = with modules; [
misc-productionWriting
];
imports = builtins.attrValues {
inherit
(modules)
misc-productionWriting
;
};
};
shared = {
imports = with modules; [
bat
bottom
direnv
git
helix
home-manager
lazygit
misc-commandLine
misc-virtualization
nushell
starship
wezterm
# yazi
zellij
zoxide
];
imports = builtins.attrValues {
inherit
(modules)
bat
bottom
direnv
git
helix
home-manager
lazygit
misc-commandLine
misc-virtualization
nushell
starship
wezterm
# yazi
zellij
zoxide
;
};
};
};
}

View file

@ -2,11 +2,14 @@
programs = {
obs-studio = {
enable = true;
plugins = with pkgs.obs-studio-plugins; [
obs-tuna
obs-vkcapture
obs-multi-rtmp
];
plugins = builtins.attrValues {
inherit
(pkgs.obs-studio-plugins)
obs-tuna
obs-vkcapture
obs-multi-rtmp
;
};
};
};
home = {

View file

@ -14,20 +14,20 @@
# when = "textInputFocus";
# }
# ];
extensions = with pkgs.vscode-extensions; [
eamodio.gitlens
catppuccin.catppuccin-vsc
james-yu.latex-workshop
jnoortheen.nix-ide
kamadorueda.alejandra
mkhl.direnv
pkief.material-icon-theme
streetsidesoftware.code-spell-checker
tamasfe.even-better-toml
esbenp.prettier-vscode
mattn.lisp
haskell.haskell
];
extensions = builtins.attrValues {
inherit (pkgs.vscode-extensions.catppuccin) catppuccin-vsc;
inherit (pkgs.vscode-extensions.eamodio) gitlens;
inherit (pkgs.vscode-extensions.esbenp) prettier-vscode;
inherit (pkgs.vscode-extensions.haskell) haskell;
inherit (pkgs.vscode-extensions.james-yu) latex-workshop;
inherit (pkgs.vscode-extensions.jnoortheen) nix-ide;
inherit (pkgs.vscode-extensions.kamadorueda) alejandra;
inherit (pkgs.vscode-extensions.mattn) lisp;
inherit (pkgs.vscode-extensions.mkhl) direnv;
inherit (pkgs.vscode-extensions.pkief) material-icon-theme;
inherit (pkgs.vscode-extensions.streetsidesoftware) code-spell-checker;
inherit (pkgs.vscode-extensions.tamasfe) even-better-toml;
};
userSettings = {
"git.confirmSync" = false;
"editor.insertSpaces" = false;