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

7
hosts/hermit/programs.nix
View file

@ -1,5 +1,7 @@
{pkgs, ...}: { {pkgs, ...}: {
environment.systemPackages = with pkgs; [ environment.systemPackages = builtins.attrValues {
inherit
(pkgs)
alsa-utils alsa-utils
anki anki
asciinema asciinema
@ -84,5 +86,6 @@
zapzap zapzap
zip zip
zoxide zoxide
]; ;
};
} }

9
hosts/temperance/programs.nix
View file

@ -1,11 +1,14 @@
{pkgs, ...}: { {pkgs, ...}: {
environment.systemPackages = with pkgs; [ environment.systemPackages = builtins.attrValues {
inherit
(pkgs)
alsa-utils alsa-utils
anki anki
asciinema asciinema
beets beets
cachix cachix
calc calc
cinny-desktop
difftastic difftastic
dnsutils dnsutils
element-desktop element-desktop
@ -59,7 +62,6 @@
typst typst
walker walker
wayneko wayneko
wineWowPackages.waylandFull
wireguard-tools wireguard-tools
xdg-utils xdg-utils
xournalpp xournalpp
@ -67,5 +69,6 @@
zathura zathura
zotero zotero
zoxide 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];
}; };

19
modules/style/fonts.nix
View file

@ -47,16 +47,13 @@ in {
monospace = ["Iosevka Nerd Font"]; monospace = ["Iosevka Nerd Font"];
}; };
}; };
packages = with pkgs; [ packages = builtins.attrValues {
inherit
(pkgs)
# custom-iosevka # custom-iosevka
material-icons material-icons
material-design-icons material-design-icons
papirus-icon-theme papirus-icon-theme
nerd-fonts.iosevka
nerd-fonts.jetbrains-mono
nerd-fonts.comic-shanns-mono
nerd-fonts.symbols-only
lexend lexend
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
@ -64,7 +61,15 @@ in {
noto-fonts-color-emoji noto-fonts-color-emoji
corefonts corefonts
font-awesome font-awesome
]; ;
inherit
(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

7
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 {
inherit
(pkgs)
bluetuith bluetuith
bluez bluez
blueman blueman
]; ;
};
}; };
} }

7
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 {
inherit
(pkgs)
intel-vaapi-driver intel-vaapi-driver
intel-media-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";

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

@ -1,20 +1,20 @@
pkgs: (with pkgs; [ pkgs:
builtins.attrValues {
inherit
(pkgs)
# better cd # better cd
zoxide zoxide
#better ls #better ls
eza eza
atuin atuin
# better cat # better cat
bat bat
# clipboard # clipboard
# yazi # yazi
serpl serpl
diff-so-fancy diff-so-fancy
tig tig
direnv direnv
sesh sesh
mprocs mprocs
curlie curlie
@ -23,20 +23,15 @@ pkgs: (with pkgs; [
sd sd
# mult # mult
glow glow
# dua-cli # dua-cli
dust dust
kondo kondo
# better grep # better grep
ripgrep ripgrep
# better dig # better dig
dogdns dogdns
# simply the best fetch tool out there # simply the best fetch tool out there
microfetch microfetch
fzf fzf
element element
carapace carapace
@ -54,18 +49,17 @@ pkgs: (with pkgs; [
cpufetch cpufetch
yt-dlp yt-dlp
tealdeer tealdeer
glow
hyperfine hyperfine
imagemagick imagemagick
ffmpeg-full ffmpeg-full
# catimg # catimg
timg timg
nmap nmap
wget
fd fd
jq jq
rsync rsync
figlet figlet
unzip unzip
zip zip
]) ;
}