faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

flake: start transitioning away from with

Browse source
This commit is contained in:
Charlie Root 2025-03-02 19:11:27 +01:00
commit deb3e1753c
Signed by: faukah
SSH key fingerprint: SHA256:jpYIt4Vkz1NBTQcks/N9OPTfTFxE6KF2W/rV7hrfrIw
10 changed files with 281 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

175
hosts/hermit/programs.nix
View file

@ -1,88 +1,91 @@
{pkgs, ...}: { {pkgs, ...}: {
environment.systemPackages = with pkgs; [ environment.systemPackages = builtins.attrValues {
alsa-utils inherit
anki (pkgs)
asciinema alsa-utils
cachix anki
calc asciinema
# calibre cachix
cbonsai calc
cmus # calibre
difftastic cbonsai
element cmus
element-desktop difftastic
emacs30-pgtk element
# evince element-desktop
eza emacs30-pgtk
firefox # evince
fftw eza
gcc firefox
grc fftw
gparted gcc
git grc
halloy gparted
helvum git
httpie halloy
hyperfine helvum
imagemagick httpie
img2pdf hyperfine
impala imagemagick
imv img2pdf
inetutils impala
jujutsu imv
just inetutils
jrnl jujutsu
keepassxc just
lazygit jrnl
libtool keepassxc
librewolf lazygit
links2 libtool
linuxHeaders librewolf
moc links2
mpv linuxHeaders
ncmpcpp moc
neofetch mpv
networkmanagerapplet ncmpcpp
nextcloud-client neofetch
nicotine-plus networkmanagerapplet
nil nextcloud-client
nitch nicotine-plus
swww nil
microfetch nitch
nmap swww
pamixer microfetch
pavucontrol nmap
pdfarranger pamixer
pfetch pavucontrol
pidgin pdfarranger
playerctl pfetch
polkit pidgin
pulsemixer playerctl
python3 polkit
ripgrep pulsemixer
rmpc python3
signal-desktop ripgrep
sioyek rmpc
smartmontools signal-desktop
taskwarrior3 sioyek
taskwarrior-tui smartmontools
telegram-desktop taskwarrior3
texliveFull taskwarrior-tui
tldr telegram-desktop
thunderbird texliveFull
tor-browser tldr
trash-cli thunderbird
typst tor-browser
ungoogled-chromium trash-cli
util-linux typst
v4l-utils ungoogled-chromium
vesktop util-linux
vlc v4l-utils
weechat vesktop
wireguard-tools vlc
xournalpp weechat
zapzap wireguard-tools
zip xournalpp
zoxide zapzap
]; zip
zoxide
;
};
} }

141
hosts/temperance/programs.nix
View file

@ -1,71 +1,74 @@
{pkgs, ...}: { {pkgs, ...}: {
environment.systemPackages = with pkgs; [ environment.systemPackages = builtins.attrValues {
alsa-utils inherit
anki (pkgs)
asciinema alsa-utils
beets anki
cachix asciinema
calc beets
difftastic cachix
dnsutils calc
element-desktop cinny-desktop
evince difftastic
gcc dnsutils
gnumake element-desktop
halloy evince
helvum gcc
httpie gnumake
imagemagick halloy
imhex helvum
img2pdf httpie
impala imagemagick
imv imhex
inetutils img2pdf
joplin-desktop impala
jujutsu imv
julia inetutils
just joplin-desktop
keepassxc jujutsu
lazygit julia
librewolf just
libtool keepassxc
logiops lazygit
mpv librewolf
nextcloud-client libtool
nheko logiops
nicotine-plus mpv
swww nextcloud-client
pandoc nheko
pavucontrol nicotine-plus
pdfarranger swww
picard pandoc
polkit pavucontrol
pulsemixer pdfarranger
python3 picard
pwvucontrol polkit
qbittorrent pulsemixer
r2modman python3
radare2 pwvucontrol
ripgrep qbittorrent
rmpc r2modman
signal-desktop radare2
strawberry ripgrep
telegram-desktop rmpc
texliveFull signal-desktop
thunderbird strawberry
tor-browser telegram-desktop
trash-cli texliveFull
tutanota-desktop thunderbird
typst tor-browser
walker trash-cli
wayneko tutanota-desktop
wineWowPackages.waylandFull typst
wireguard-tools walker
xdg-utils wayneko
xournalpp wireguard-tools
zapzap xdg-utils
zathura xournalpp
zotero zapzap
zoxide zathura
]; zotero
zoxide
;
};
} }

11
modules/programs/gui/steam.nix
View file

@ -3,8 +3,8 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: let
with lib; let inherit (lib) mkIf;
cfg = config.modules.system.programs.steam; cfg = config.modules.system.programs.steam;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -17,10 +17,11 @@ in {
}; };
extraLibraries = p: extraLibraries = p:
with p; [ builtins.attrValues {
atk inherit (p) atk;
]; };
}; };
gamescopeSession.enable = true; gamescopeSession.enable = true;
extraCompatPackages = [pkgs.proton-ge-bin.steamcompattool]; extraCompatPackages = [pkgs.proton-ge-bin.steamcompattool];
}; };

41
modules/style/fonts.nix
View file

@ -47,24 +47,29 @@ in {
monospace = ["Iosevka Nerd Font"]; monospace = ["Iosevka Nerd Font"];
}; };
}; };
packages = with pkgs; [ packages = builtins.attrValues {
# custom-iosevka inherit
material-icons (pkgs)
material-design-icons # custom-iosevka
papirus-icon-theme material-icons
nerd-fonts.iosevka material-design-icons
nerd-fonts.jetbrains-mono papirus-icon-theme
nerd-fonts.comic-shanns-mono lexend
nerd-fonts.symbols-only noto-fonts
noto-fonts-cjk-sans
lexend noto-fonts-cjk-serif
noto-fonts noto-fonts-color-emoji
noto-fonts-cjk-sans corefonts
noto-fonts-cjk-serif font-awesome
noto-fonts-color-emoji ;
corefonts inherit
font-awesome (pkgs.nerd-fonts)
]; iosevka
jetbrains-mono
comic-shanns-mono
symbols-only
;
};
fontDir = { fontDir = {
# Whether to create a directory with links to all fonts in # Whether to create a directory with links to all fonts in
# /run/current-system/sw/share/X11/fonts # /run/current-system/sw/share/X11/fonts

13
modules/system/hardware/bluetooth.nix
View file

@ -12,10 +12,13 @@ in {
enable = true; enable = true;
powerOnBoot = mkIf cfg.powerOnBoot true; powerOnBoot = mkIf cfg.powerOnBoot true;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = builtins.attrValues {
bluetuith inherit
bluez (pkgs)
blueman bluetuith
]; bluez
blueman
;
};
}; };
} }

11
modules/system/hardware/cpu/intel.nix
View file

@ -9,9 +9,12 @@
in { in {
hardware = { hardware = {
cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware; cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
graphics.extraPackages = with pkgs; [ graphics.extraPackages = builtins.attrValues {
intel-vaapi-driver inherit
intel-media-driver (pkgs)
]; intel-vaapi-driver
intel-media-driver
;
};
}; };
} }

8
modules/system/hardware/graphics.nix
View file

@ -11,12 +11,14 @@ in {
hardware = { hardware = {
graphics = { graphics = {
enable = true; enable = true;
extraPackages = with pkgs; extraPackages = mkIf cfg.amd.enable (builtins.attrValues {
mkIf cfg.amd.enable [ inherit
(pkgs)
mesa mesa
libva libva
vaapiVdpa vaapiVdpa
]; ;
});
}; };
nvidia = mkIf cfg.nvidia.enable { nvidia = mkIf cfg.nvidia.enable {
modesetting.enable = true; modesetting.enable = true;

7
modules/user/default.nix
View file

@ -11,10 +11,9 @@
module = { module = {
config = { config = {
environment.sessionVariables.EDITOR = "hx"; environment.sessionVariables.EDITOR = "hx";
environment.systemPackages = with packages; [ environment.systemPackages = builtins.attrValues {
fish inherit (packages) fish helix;
helix };
];
}; };
}; };
} }

8
modules/user/kakoune/default.nix
View file

@ -31,11 +31,9 @@
ln -s --relative "$autoload_target" autoload ln -s --relative "$autoload_target" autoload
''; '';
}; };
plugins = builtins.attrValues {
plugins = with kakounePlugins; [ inherit (kakounePlugins) fzf-kak kakoune-catppuccin;
fzf-kak };
kakoune-catppuccin
];
kakoune-wrapped = symlinkJoin { kakoune-wrapped = symlinkJoin {
name = "kakoune-wrapped"; name = "kakoune-wrapped";

136
modules/user/shell/packages.nix
View file

@ -1,71 +1,65 @@
pkgs: (with pkgs; [ pkgs:
# better cd builtins.attrValues {
zoxide inherit
#better ls (pkgs)
eza # better cd
atuin zoxide
#better ls
# better cat eza
bat atuin
# better cat
# clipboard bat
# yazi # clipboard
serpl # yazi
diff-so-fancy serpl
tig diff-so-fancy
direnv tig
direnv
sesh sesh
mprocs mprocs
curlie curlie
entr entr
procs procs
sd sd
# mult # mult
glow glow
# dua-cli
# dua-cli dust
dust kondo
kondo # better grep
ripgrep
# better grep # better dig
ripgrep dogdns
# simply the best fetch tool out there
# better dig microfetch
dogdns fzf
element
# simply the best fetch tool out there carapace
microfetch difftastic
hexyl
fzf iputils
element gnumake
carapace gping
difftastic asciinema
hexyl inetutils
iputils scc
gnumake starship
gping onefetch
asciinema wget
inetutils cpufetch
scc yt-dlp
starship tealdeer
onefetch hyperfine
wget imagemagick
cpufetch ffmpeg-full
yt-dlp # catimg
tealdeer timg
glow nmap
hyperfine fd
imagemagick jq
ffmpeg-full rsync
# catimg figlet
timg unzip
nmap zip
wget ;
fd }
jq
rsync
figlet
unzip
zip
])