upRootNutrition/dotfiles
1
0
Fork 0
mirror of https://gitlab.com/upRootNutrition/dotfiles.git synced 2025-06-16 10:05:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: replaced all with with builtins.attrValues

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

112
home-manager/default.nix
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
;
};
};
};
}

13
home-manager/modules/obs-studio/default.nix
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 = {

28
home-manager/modules/vscode.nix
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;

91
nixos/default.nix
View file

@ -58,54 +58,67 @@ let
in {
flake.nixosModules = {
personal = {
imports = with modules; [
android
audio
bluetooth
corectrl
dconf
disks
firejail
flatpak
fonts
nur
plasma
printing
sddm
steam
sysstat
virtualization
];
imports = builtins.attrValues {
inherit
(modules)
android
audio
bluetooth
corectrl
dconf
disks
firejail
flatpak
fonts
nur
plasma
printing
sddm
steam
sysstat
virtualization
;
};
};
desktop = {
imports = with modules; [
syncthing
# ollama
];
imports = builtins.attrValues {
inherit
(modules)
syncthing
# ollama
;
};
};
server = {
imports = with modules; [
services
];
imports = builtins.attrValues {
inherit
(modules)
services
;
};
};
shared = {
imports = with modules; [
accounts
doas
environment
gvfs
home-manager
locale
nix
rsyncd
sops
ssh
system
xserver
];
imports = builtins.attrValues {
inherit
(modules)
accounts
doas
environment
gvfs
home-manager
locale
nix
rsyncd
sops
ssh
system
xserver
;
};
};
};
}

9
nixos/modules/android.nix
View file

@ -1,6 +1,9 @@
{pkgs, ...}: {
programs.adb.enable = true;
services.udev.packages = with pkgs; [
android-udev-rules
];
services.udev.packages = builtins.attrValues {
inherit
(pkgs)
android-udev-rules
;
};
}

11
nixos/modules/fonts.nix
View file

@ -1,9 +1,12 @@
{pkgs, ...}: {
fonts = {
fontconfig.defaultFonts.emoji = ["Noto Fonts Color Emoji"];
packages = with pkgs; [
noto-fonts-color-emoji
open-dyslexic
];
packages = builtins.attrValues {
inherit
(pkgs)
noto-fonts-color-emoji
open-dyslexic
;
};
};
}

22
nixos/modules/gnome.nix
View file

@ -14,17 +14,21 @@
games.enable = false;
gnome-online-accounts.enable = true;
};
udev.packages = with pkgs; [
gnome.gnome-settings-daemon
];
udev.packages = builtins.attrValues {
inherit
(pkgs.gnome)
gnome-settings-daemon
;
};
};
environment = {
variables = {
# WEBKIT_FORCE_SANDBOX = "0";
# WEBKIT_DISABLE_COMPOSITING_MODE = "1";
};
gnome.excludePackages =
(with pkgs; [
gnome.excludePackages = builtins.attrValues {
inherit
(pkgs)
gnome-photos
gnome-tour
epiphany # web browser
@ -34,8 +38,9 @@
totem # video player
yelp # help viewer
gnome-calendar
])
++ (with pkgs.gnome; [
;
inherit
(pkgs.gnome)
gnome-music
tali # poker game
iagno # go game
@ -46,6 +51,7 @@
gnome-maps
gnome-contacts
gnome-characters
]);
;
};
};
}

19
nixos/modules/plasma.nix
View file

@ -2,12 +2,15 @@
services = {
desktopManager.plasma6.enable = true;
};
environment.plasma6.excludePackages = with pkgs.kdePackages; [
plasma-browser-integration
konsole
kate
spectacle
kdeconnect-kde
khelpcenter
];
environment.plasma6.excludePackages = builtins.attrValues {
inherit
(pkgs.kdePackages)
plasma-browser-integration
konsole
kate
spectacle
kdeconnect-kde
khelpcenter
;
};
}

15
nixos/modules/services/peertube.nix
View file

@ -23,12 +23,15 @@ in {
user = service.name;
plugins = {
enable = true;
plugins = with pkgs; [
peertube-plugin-livechat
peertube-plugin-matomo
peertube-plugin-transcoding-custom-quality
peertube-theme-dark
];
plugins = builtins.attrValues {
inherit
(pkgs)
peertube-plugin-livechat
peertube-plugin-matomo
peertube-plugin-transcoding-custom-quality
peertube-theme-dark
;
};
};
secrets = {

23
systems/desktop/graphics.nix
View file

@ -2,13 +2,22 @@
hardware = {
graphics = {
enable = true;
extraPackages = with pkgs; [
rocmPackages.clr.icd
amdvlk
];
extraPackages32 = with pkgs; [
driversi686Linux.amdvlk
];
extraPackages = builtins.attrValues {
inherit
(pkgs)
amdvlk
;
inherit
(pkgs.rocmPackages.clr)
icd
;
};
extraPackages32 = builtins.attrValues {
inherit
(pkgs.driversi686Linux)
amdvlk
;
};
};
};
boot.initrd.kernelModules = ["amdgpu"];

23
systems/laptop/graphics.nix
View file

@ -2,13 +2,22 @@
hardware = {
graphics = {
enable = true;
extraPackages = with pkgs; [
rocmPackages.clr.icd
amdvlk
];
extraPackages32 = with pkgs; [
driversi686Linux.amdvlk
];
extraPackages = builtins.attrValues {
inherit
(pkgs)
amdvlk
;
inherit
(pkgs.rocmPackages.clr)
icd
;
};
extraPackages32 = builtins.attrValues {
inherit
(pkgs.driversi686Linux)
amdvlk
;
};
};
};
boot.initrd.kernelModules = ["amdgpu"];

23
systems/server/graphics.nix
View file

@ -2,13 +2,22 @@
hardware = {
graphics = {
enable = true;
extraPackages = with pkgs; [
rocmPackages.clr.icd
amdvlk
];
extraPackages32 = with pkgs; [
driversi686Linux.amdvlk
];
extraPackages = builtins.attrValues {
inherit
(pkgs)
amdvlk
;
inherit
(pkgs.rocmPackages.clr)
icd
;
};
extraPackages32 = builtins.attrValues {
inherit
(pkgs.driversi686Linux)
amdvlk
;
};
};
};
boot.initrd.kernelModules = ["amdgpu"];