jawz/NixOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

best practices: get rid of with pkgs;

Browse Source
This commit is contained in:
Danilo Reyes 2024-11-09 15:33:03 -06:00
parent ebcab67a6a
commit 120d485f28
33 changed files with 418 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base.nix
View File

@ -120,10 +120,12 @@
};
documentation.enable = false;
environment = {
systemPackages = with pkgs; [
systemPackages = builtins.attrValues {
inherit (pkgs)
wget
sops
];
;
};
variables =
let
XDG_DATA_HOME = "\${HOME}/.local/share";

6
cinnamon.nix
View File

@ -12,8 +12,10 @@
enable = true;
style = "adwaita";
};
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
adw-gtk3 # theme legacy applications
papirus-icon-theme # icon theme
];
;
};
}

6
cosmic.nix
View File

@ -10,11 +10,13 @@
enable = true;
style = "adwaita";
};
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
# ffmpegthumbnailer # generate thumbnails
adw-gtk3 # theme legacy applications
papirus-icon-theme # icon theme
# libgda # for pano shell extension
# gradience # theme customizer, allows you to modify adw-gtk3 themes
];
;
};
}

25
gnome.nix
View File

@ -16,7 +16,8 @@
};
};
};
environment.gnome.excludePackages = with pkgs; [
environment.gnome.excludePackages = builtins.attrValues {
inherit (pkgs)
# gnome-shell-extensions
# totem
baobab
@ -30,29 +31,37 @@
gnome-text-editor
gnome-tour
yelp
];
;
};
qt = {
enable = true;
style = "adwaita";
};
users.users.jawz.packages =
(with pkgs; [
# ffmpegthumbnailer # generate thumbnails
let
packages = builtins.attrValues {
inherit (pkgs)
adw-gtk3 # theme legacy applications
gnome-tweaks # tweaks for the gnome desktop environment
papirus-icon-theme # icon theme
libgda # for pano shell extension
# ffmpegthumbnailer # generate thumbnails
# gradience # theme customizer, allows you to modify adw-gtk3 themes
])
++ (with pkgs.gnomeExtensions; [
;
};
extensions = builtins.attrValues {
inherit (pkgs.gnomeExtensions)
appindicator # applets for open applications
reading-strip # like putting a finger on every line I read
tactile # window manager
pano # clipboard manager
freon # hardware temperature monitor
gamemode-indicator-in-system-settings # I guess I'm a gamer now?
# blur-my-shell # make the overview more visually appealing
burn-my-windows
# blur-my-shell # make the overview more visually appealing
# forge # window manager
]);
;
};
in
packages ++ extensions;
}

2
hosts/miniserver/hardware-configuration.nix
View File

@ -12,7 +12,7 @@
graphics = {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [ vpl-gpu-rt ];
extraPackages = [ pkgs.vpl-gpu-rt ];
};
};
boot = {

2
hosts/server/configuration.nix
View File

@ -90,7 +90,7 @@
users = {
groups.nixremote.gid = 555;
users = {
jawz.packages = with pkgs; [ stash ];
jawz.packages = [ pkgs.stash ];
nixremote = {
isNormalUser = true;
createHome = true;

12
hosts/workstation/configuration.nix
View File

@ -80,12 +80,14 @@
users = {
groups.nixremote.gid = 555;
users = {
jawz.packages = with pkgs; [
jawz.packages = builtins.attrValues {
inherit (pkgs)
distrobox # install packages from other os
gocryptfs # encrypted filesystem! shhh!!!
torrenttools # create torrent files from the terminal!
vcsi # video thumbnails for torrents, can I replace it with ^?
];
;
};
nixremote = {
isNormalUser = true;
createHome = true;
@ -116,14 +118,16 @@
obs-studio = {
enable = true;
enableVirtualCamera = true;
plugins = with pkgs.obs-studio-plugins; [
plugins = builtins.attrValues {
inherit (pkgs.obs-studio-plugins)
obs-vkcapture
obs-vaapi
obs-tuna
looking-glass-obs
input-overlay
droidcam-obs
];
;
};
};
};
services = {

25
modules/apps/art.nix
View File

@ -11,7 +11,15 @@
};
config = lib.mkIf config.my.apps.art.enable {
users.users.jawz.packages =
(with pkgs; [
let
gdPackages = builtins.attrValues {
inherit (pkgs)
godot_4 # game development
gdtoolkit_4 # gdscript language server
;
};
packages = builtins.attrValues {
inherit (pkgs)
gimp # the coolest bestest art program to never exist
krita # art to your heart desire!
# mypaint # not the best art program
@ -20,16 +28,9 @@
blender # cgi animation and sculpting
drawpile # arty party with friends!!
pureref # create inspiration/reference boards
])
++ (
if config.my.dev.gameDev.enable then
with pkgs;
[
godot_4 # game development
gdtoolkit_4 # gdscript language server
]
else
[ ]
);
;
};
in
packages ++ (if config.my.dev.gameDev.enable then gdPackages else [ ]);
};
}

14
modules/apps/dictionaries.nix
View File

@ -7,11 +7,15 @@
{
options.my.apps.dictionaries.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.apps.dictionaries.enable {
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
hunspell
hunspellDicts.it_IT
hunspellDicts.es_MX
hunspellDicts.en_CA-large
];
;
inherit (pkgs.hunspellDicts)
it_IT
es_MX
en_CA-large
;
};
};
}

6
modules/apps/fonts.nix
View File

@ -7,11 +7,13 @@
{
options.my.apps.fonts.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.apps.fonts.enable {
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
nerdfonts
symbola
comic-neue
cascadia-code
];
;
};
};
}

16
modules/apps/gaming.nix
View File

@ -19,7 +19,10 @@
platformOptimizations.enable = true;
};
};
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages =
let
packages = builtins.attrValues {
inherit (pkgs)
shipwright # zelda OoT port
mangohud # fps & stats overlay
lutris # games launcher & emulator hub
@ -28,7 +31,6 @@
heroic # install epic games
protonup-qt # update proton-ge
ns-usbloader # load games into my switch
(callPackage ../../pkgs/polymc/default.nix { }) # minecraft launcher
# minecraft # minecraft official launcher
# emulators
@ -38,7 +40,15 @@
dolphin-emu # wii
snes9x-gtk # snes
ryujinx # switch
(callPackage ../../pkgs/citra/default.nix { branch = "nightly"; }) # 3ds
;
};
customPackages = [
# minecraft launcher
(pkgs.callPackage ../../pkgs/polymc/default.nix { })
# 3Ds emulator
(pkgs.callPackage ../../pkgs/citra/default.nix { branch = "nightly"; })
];
in
packages ++ customPackages;
};
}

9
modules/apps/internet.nix
View File

@ -23,8 +23,8 @@
users.users.jawz.packages =
let
vdhcoapp = pkgs.callPackage ../../pkgs/vdhcoapp/default.nix { };
in
(with pkgs; [
packages = builtins.attrValues {
inherit (pkgs)
warp # transfer files with based ppl
brave # crypto-browser that at least somewhat integrates with gtk
nextcloud-client # self-hosted google-drive alternative
@ -38,7 +38,10 @@
discord # :3
teamspeak5_client # ppl say they will use this...?
# hugo # website engine
])
;
};
in
packages
++ [
vdhcoapp # video download helper assistant
inputs.zen-browser.packages.x86_64-linux.default

6
modules/apps/misc.nix
View File

@ -7,7 +7,8 @@
{
options.my.apps.misc.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.apps.misc.enable {
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
# celeste # sync tool for any cloud provider
# czkawka # duplicate finder
# sequeler # friendly SQL client
@ -16,6 +17,7 @@
metadata-cleaner # remove any metadata and geolocation from files
pika-backup # backups
gnome-obfuscate # censor private information
];
;
};
};
}

6
modules/apps/multimedia.nix
View File

@ -7,7 +7,8 @@
{
options.my.apps.multimedia.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.apps.multimedia.enable {
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
pitivi # video editor
celluloid # video player
curtail # image compressor
@ -20,6 +21,7 @@
# cozy # audiobooks player
# gnome-podcasts # podcast player
# hakuneko # manga & comic GUI downloader
];
;
};
};
}

6
modules/apps/office.nix
View File

@ -8,7 +8,8 @@
options.my.apps.office.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.apps.office.enable {
environment.variables.CALIBRE_USE_SYSTEM_THEME = "1";
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
libreoffice # office, but based
calibre # ugly af eBook library manager
newsflash # feed reader, syncs with nextcloud
@ -17,6 +18,7 @@
# foliate # gtk eBook reader
# wike # gtk wikipedia wow!
# denaro # manage your finances
];
;
};
};
}

8
modules/dev/docker.nix
View File

@ -8,9 +8,9 @@
options.my.dev.docker.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.docker.enable {
environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";
users.users.jawz.packages = with pkgs; [
dockfmt
nodePackages.dockerfile-language-server-nodejs
];
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs) dockfmt;
inherit (pkgs.nodePackages) dockerfile-language-server-nodejs;
};
};
}

37
modules/dev/emacs.nix
View File

@ -25,7 +25,17 @@
};
};
users.users.jawz.packages =
(with pkgs; [
let
packagesDoomEverywhere = builtins.attrValues {
inherit (pkgs.xorg) xwininfo;
inherit (pkgs)
xdotool
xclip
wl-clipboard-rs
;
};
packages = builtins.attrValues {
inherit (pkgs)
fd # modern find, faster searches
fzf # fuzzy finder! super cool and useful
ripgrep # modern grep
@ -34,25 +44,26 @@
tetex # export pdf
languagetool # proofreader for English
# doom everywhere
xorg.xwininfo
xdotool
xclip
# lsps
yaml-language-server
markdownlint-cli
])
++ (with pkgs.nodePackages; [
;
};
packagesNode = builtins.attrValues {
inherit (pkgs.nodePackages)
vscode-json-languageserver
# linters
prettier
]);
prettier # multi-language linter
;
};
in
packages ++ packagesDoomEverywhere ++ packagesNode;
services.emacs = {
enable = true;
package =
with pkgs;
((emacsPackagesFor emacs-gtk).emacsWithPackages (epkgs: with epkgs; [ vterm ]));
let
emacsPackages = (pkgs.emacsPackagesFor pkgs.emacs-gtk).emacsWithPackages;
in
emacsPackages (epkgs: [ epkgs.vterm ]);
defaultEditor = true;
};
environment.variables.PATH = [ "\${XDG_CONFIG_HOME}/emacs/bin" ];

6
modules/dev/haskell.nix
View File

@ -7,10 +7,12 @@
{
options.my.dev.haskell.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.haskell.enable {
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
ghc # compiler
haskell-language-server # lsp
];
;
};
environment.variables = {
CABAL_DIR = "\${XDG_CACHE_HOME}/cabal";
STACK_ROOT = "\${XDG_DATA_HOME}/stack";

8
modules/dev/javascript.nix
View File

@ -11,10 +11,10 @@
"npm/npmrc".source = ../../dotfiles/npm/npmrc;
"configstore/update-notifier-npm-check.json".source = ../../dotfiles/npm/update-notifier-npm-check.json;
};
users.users.jawz.packages = with pkgs; [
nodejs
nodePackages.pnpm
];
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs) nodejs;
inherit (pkgs.nodePackages) pnpm;
};
environment.variables = {
NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";

6
modules/dev/nix.nix
View File

@ -7,11 +7,13 @@
{
options.my.dev.nix.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.nix.enable {
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
nixfmt-rfc-style # formating
cachix # why spend time compiling?
nixd # language server
statix # linter
];
;
};
};
}

19
modules/dev/python.nix
View File

@ -9,11 +9,16 @@
config = lib.mkIf config.my.dev.python.enable {
home-manager.users.jawz.xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc;
environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages =
let
packages = builtins.attrValues {
inherit (pkgs)
pipenv # python development workflow for humans
pyright # LSP
(python3.withPackages (
ps: with ps; [
;
};
pythonPackages = builtins.attrValues {
inherit (pkgs.python3Packages)
black # Python code formatter
editorconfig # follow rules of contributin
flake8 # wraper for pyflakes, pycodestyle and mccabe
@ -24,8 +29,12 @@
# nose # testing and running python scripts
# poetry # dependency management made easy
# pytest # framework for writing tests
]
))
;
};
in
packages
++ [
(pkgs.python3.withPackages (ps: pythonPackages))
];
};
}

9
modules/dev/sh.nix
View File

@ -7,11 +7,14 @@
{
options.my.dev.sh.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.dev.sh.enable {
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
bashdb # autocomplete
shellcheck # linting
shfmt # a shell parser and formatter
nodePackages.bash-language-server # LSP
];
;
#LSP
inherit (pkgs.nodePackages) bash-language-server;
};
};
}

24
modules/servers/nextcloud.nix
View File

@ -39,25 +39,31 @@ in
users.users.nextcloud = {
isSystemUser = true;
extraGroups = [ "render" ];
packages = with pkgs; [
mediainfo
nodejs
perl
(python311.withPackages (ps: with ps; [ tensorflow ]))
(perlPackages.buildPerlPackage (
packages =
let
packages = builtins.attrValues {
inherit (pkgs) mediainfo nodejs perl;
};
pythonPackages = [
(pkgs.python311.withPackages (ps: [ ps.tensorflow ]))
];
perlPackages = pkgs.perlPackages.buildPerlPackage (
let
version = "12.70";
in
{
pname = "Image-ExifTool";
inherit version;
src = fetchurl {
src = pkgs.fetchurl {
url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
hash = "sha256-TLJSJEXMPj870TkExq6uraX8Wl4kmNerrSlX3LQsr/4=";
};
}
))
];
);
in
packages ++ pythonPackages ++ [ perlPackages ];
};
programs.msmtp = {
enable = true;

2
modules/servers/qbittorrent.nix
View File

@ -16,7 +16,7 @@ let
hash = "sha256-ISiMNTrA4J8NYUQSmdVFaro1RxkSqvXhz6LpoSn/fLQ=";
fetchSubmodules = true;
};
build-system = with pkgs.python3Packages; [ setuptools ];
build-system = [ pkgs.python3Packages.setuptools ];
};
qbit_manage_env = pkgs.python3.withPackages (
ps:

6
modules/services/nvidia.nix
View File

@ -13,13 +13,15 @@
graphics = {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [
extraPackages = builtins.attrValues {
inherit (pkgs)
nvidia-vaapi-driver
vaapiVdpau
libvdpau-va-gl
vulkan-loader
mesa
];
;
};
};
nvidia = {
open = (config.networking.hostName == "workstation");

6
modules/shell/exercism.nix
View File

@ -7,9 +7,11 @@
{
options.my.shell.exercism.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.shell.exercism.enable {
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
exercism # learn to code
bats # testing system, required by Exercism
];
;
};
};
}

16
modules/shell/multimedia.nix
View File

@ -8,14 +8,16 @@
options.my.shell.multimedia.enable = lib.mkEnableOption "enable";
config = lib.mkIf config.my.shell.multimedia.enable {
users.users.jawz.packages =
(with pkgs; [
let
packages = builtins.attrValues {
inherit (pkgs)
gallery-dl # similar to yt-dlp but for most image gallery websites
yt-dlp # downloads videos from most video websites
ffmpeg # not ffmpreg, the coolest video conversion tool!
imagemagick # photoshop what??
])
++ [
(pkgs.python3Packages.buildPythonApplication (
;
};
ffpb = pkgs.python3Packages.buildPythonApplication (
let
pname = "ffpb";
version = "0.4.1";
@ -29,7 +31,11 @@
buildInputs = [ pkgs.python3Packages.setuptools ];
propagatedBuildInputs = [ pkgs.python3Packages.tqdm ];
}
))
);
in
packages
++ [
ffpb
];
};
}

12
modules/shell/tools.nix
View File

@ -45,14 +45,16 @@
pager = "less -FR";
theme = "base16";
};
extraPackages = with pkgs.bat-extras; [
extraPackages = builtins.attrValues {
inherit (pkgs.bat-extras)
batman # man pages
batpipe # piping
batgrep # ripgrep
batdiff # this is getting crazy!
batwatch # probably my next best friend
prettybat # trans your sourcecode!
];
;
};
};
};
};
@ -65,7 +67,8 @@
vimAlias = true;
};
};
users.users.jawz.packages = with pkgs; [
users.users.jawz.packages = builtins.attrValues {
inherit (pkgs)
ripgrep # modern grep
du-dust # rusty du similar to gdu
eza # like ls but with colors
@ -77,7 +80,8 @@
trash-cli # oop! did not meant to delete that
jq # linting
smartmontools # check hard drie health
];
;
};
environment.variables = {
TEST = "AHHH";
HISTFILE = "\${XDG_STATE_HOME}/bash/history";

21
overlay.nix
View File

@ -5,24 +5,31 @@ _self: super: {
nautilus = gPrev.nautilus.overrideAttrs (nsuper: {
buildInputs =
nsuper.buildInputs
++ (with pkgs.gst_all_1; [
++ builtins.attrValues {
inherit (pkgs.gst_all_1)
gst-libav
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
gst-plugins-base
]);
;
};
});
}
);
lutris = super.lutris.override {
extraPkgs =
pkgs: with pkgs; [
pango
winetricks
wine64Packages.stable
wineWowPackages.stable
pkgs:
let
corePackages = builtins.attrValues {
inherit (pkgs) pango winetricks;
};
winePackages = [
pkgs.wine64Packages.stable
pkgs.wineWowPackages.stable
];
in
corePackages ++ winePackages;
};
nerdfonts = super.nerdfonts.override {
fonts = [

6
pkgs/download/default.nix
View File

@ -9,11 +9,13 @@ python3Packages.buildPythonApplication {
version = "2.5";
src = ../../scripts/download/.;
build-system = [ python3Packages.setuptools ];
dependencies = with python3Packages; [
dependencies = builtins.attrValues {
inherit (python3Packages)
pyyaml
types-pyyaml
yt-dlp
];
;
};
propagatedBuildInputs = [
gallery-dl
ffmpeg

4
pkgs/polymc/default.nix
View File

@ -168,7 +168,7 @@ let
}
);
};
meta = with lib; {
meta = {
homepage = "https://polymc.org/";
downloadPage = "https://polymc.org/download/";
changelog = "https://github.com/PolyMC/PolyMC/releases";
@ -179,7 +179,7 @@ let
their associated options with a simple interface.
'';
platforms = [ "x86_64-linux" ];
license = licenses.gpl3Only;
license = lib.licenses.gpl3Only;
};
}
);

6
pkgs/vdhcoapp/default.nix
View File

@ -66,11 +66,11 @@ buildNpmPackage (
--add-flags $out/opt/vdhcoapp/src/main.js
'';
meta = with lib; {
meta = {
description = "Companion application for the Video DownloadHelper browser add-on";
homepage = "https://www.downloadhelper.net/";
license = licenses.gpl2;
maintainers = with maintainers; [ wolfangaukang ];
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.wolfangaukang ];
mainProgram = "vdhcoapp";
};
}

6
pkgs/vdhcoapp/filepicker.nix
View File

@ -33,12 +33,12 @@ rustPlatform.buildRustPackage (
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
meta = {
description = "File picker used by VDHCoApp";
homepage = "https://github.com/paulrouget/static-filepicker";
license = licenses.gpl2;
license = lib.licenses.gpl2;
mainProgram = "filepicker";
maintainers = with maintainers; [ hannesgith ];
maintainers = [ lib.maintainers.hannesgith ];
};
}
)