commit bfdacb651a8cdf334e9acd4fff0828e7f18dc573
parent d1d3943505ab8cb63ae8c7d1054ac312516666e7
Author: Milutin Popovic <milutin@popovic.xyz>
Date: Mon, 16 Mar 2026 22:39:56 +0000
bump
Diffstat:
2 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/modules/packages.nix b/modules/packages.nix
@@ -1,9 +1,11 @@
{ pkgs, isDarwin }:
let
- fetchSucklessRepo = repo: hash: pkgs.fetchgit {
- url = "git://popovic.xyz/${repo}.git";
- inherit hash;
- };
+ fetchSucklessRepo =
+ repo: hash:
+ pkgs.fetchgit {
+ url = "git://popovic.xyz/${repo}.git";
+ inherit hash;
+ };
suckless = with pkgs; {
dwm = dwm.overrideAttrs (old: {
@@ -21,7 +23,13 @@ let
slock = slock.overrideAttrs (old: {
src = fetchSucklessRepo "slock" "sha256-4cKVyYRqgv9YGYYHFzzkIoJhdMlzb5GC72RQsCSEbG0=";
- buildInputs = old.buildInputs ++ (with xorg; [ libxinerama imlib2 libxft ]);
+ buildInputs =
+ old.buildInputs
+ ++ (with xorg; [
+ libxinerama
+ imlib2
+ libxft
+ ]);
});
dwmblocks = dwmblocks.overrideAttrs (old: {
@@ -29,7 +37,8 @@ let
});
};
in
-with pkgs; {
+with pkgs;
+{
system = [
home-manager
nix
@@ -72,7 +81,8 @@ with pkgs; {
whois
nmap
wireguard-tools
- ] ++ lib.optionals (!isDarwin) [
+ ]
+ ++ lib.optionals (!isDarwin) [
nextcloud-client
tigervnc
];
@@ -93,7 +103,14 @@ with pkgs; {
pamixer
pulseaudio
scrot
- ] ++ (with suckless; [ dwm st dmenu slock dwmblocks ]);
+ ]
+ ++ (with suckless; [
+ dwm
+ st
+ dmenu
+ slock
+ dwmblocks
+ ]);
fonts = [
noto-fonts-color-emoji
@@ -106,10 +123,12 @@ with pkgs; {
spotify
inkscape
imagemagick
+ pandoc
mediainfo
transmission_4
chromium
- ] ++ lib.optionals (!isDarwin) [
+ ]
+ ++ lib.optionals (!isDarwin) [
vlc
sxiv
gimp
@@ -134,18 +153,20 @@ with pkgs; {
zathuraPkgs.zathura_cb
zathuraPkgs.zathura_djvu
zathuraPkgs.zathura_pdf_mupdf
- ] ++ lib.optionals (!isDarwin) [
+ ]
+ ++ lib.optionals (!isDarwin) [
nautilus
gnome-epub-thumbnailer
];
office = [
groff
- ] ++ lib.optionals (!isDarwin) [
+ texliveFull
+ ]
+ ++ lib.optionals (!isDarwin) [
libreoffice-fresh
];
-
email = [
neomutt
msmtp
diff --git a/system/host/frame.nix b/system/host/frame.nix
@@ -190,6 +190,11 @@
noto-fonts
noto-fonts-color-emoji
terminus_font
+ liberation_ttf
+ fira-code
+ fira-code-symbols
+ ubuntu-classic
+ corefonts
];
fonts.fontconfig.useEmbeddedBitmaps = true;
}