From f03b8d39db11427018b64087dd7b31354cf58d47 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Fri, 12 Sep 2025 15:20:10 -0600 Subject: [PATCH 1/3] home: add dysk --- home/modules/baseline.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix index 83472a0..a8471d6 100644 --- a/home/modules/baseline.nix +++ b/home/modules/baseline.nix @@ -20,6 +20,7 @@ in { packages = with pkgs; [ calc + dysk file gcc htop From 00c44ba7ed64bbc941327de6316377f764cdfe11 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Fri, 12 Sep 2025 15:23:41 -0600 Subject: [PATCH 2/3] home: upgrade fonts to nerdfonts --- home/modules/gui/fonts.nix | 5 ++--- home/modules/gui/mako.nix | 2 +- home/modules/gui/sway.nix | 4 ++-- home/modules/gui/waybar.nix | 8 ++++---- home/modules/halloy.nix | 1 + home/modules/terminal.nix | 8 ++++---- home/modules/zed.nix | 2 +- sys/modules/baseline.nix | 1 + sys/modules/gtklock.nix | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/home/modules/gui/fonts.nix b/home/modules/gui/fonts.nix index 1830208..b74c094 100644 --- a/home/modules/gui/fonts.nix +++ b/home/modules/gui/fonts.nix @@ -8,7 +8,7 @@ enable = true; defaultFonts = { monospace = [ - "JetBrains Mono" + "JetBrainsMono Nerd Font" "Noto Sans Mono CJK SC" "Noto Sans Mono" "Noto Color Emoji" @@ -31,11 +31,10 @@ # with fonts.packages buy im too lazy to check home.packages = with pkgs; [ jetbrains-mono + nerd-fonts.jetbrains-mono noto-fonts noto-fonts-cjk-sans noto-fonts-emoji noto-fonts-extra - nerd-fonts.fira-code - nerd-fonts.droid-sans-mono ]; } diff --git a/home/modules/gui/mako.nix b/home/modules/gui/mako.nix index 7f0dde4..ad6fd11 100644 --- a/home/modules/gui/mako.nix +++ b/home/modules/gui/mako.nix @@ -18,7 +18,7 @@ in { progress-color = "over #FFFFFF"; border-radius = 0; default-timeout = 7000; - font = "JetBrains Mono 10"; + font = "JetBrainsMono Nerd Font 10"; icons = true; ignore-timeout = false; layer = "top"; diff --git a/home/modules/gui/sway.nix b/home/modules/gui/sway.nix index 676cf70..3028f3d 100644 --- a/home/modules/gui/sway.nix +++ b/home/modules/gui/sway.nix @@ -62,7 +62,7 @@ in { }; fonts = { - names = ["JetBrains Mono"]; + names = ["JetBrainsMono Nerd Font"]; style = "Regular"; size = 8.0; }; @@ -136,7 +136,7 @@ in { keybindings = let mod = config.wayland.windowManager.sway.config.modifier; grimshot = getExe pkgs.sway-contrib.grimshot; - bemenuCommand = ''bemenu-run --center --width-factor 0.2 --fixed-height --list 10 --scrollbar none --auto-select --accept-single --fn "JetBrains Mono 12" --prompt "" --tb "#000000" --tf "#EAEAEA" --fb "#000000" --ff "#EAEAEA" --cb "#EAEAEA" --cf "#000000" --nb "#000000" --nf "#EAEAEA" --sb "#000000" --sf "#EAEAEA" --hb "#000000" --hf "#EAEAEA" --fbb "#000000" --fbf "#000000" --ab "#000000" --af "#EAEAEA"''; + bemenuCommand = ''bemenu-run --center --width-factor 0.2 --fixed-height --list 10 --scrollbar none --auto-select --accept-single --fn "JetBrainsMono Nerd Font 12" --prompt "" --tb "#000000" --tf "#EAEAEA" --fb "#000000" --ff "#EAEAEA" --cb "#EAEAEA" --cf "#000000" --nb "#000000" --nf "#EAEAEA" --sb "#000000" --sf "#EAEAEA" --hb "#000000" --hf "#EAEAEA" --fbb "#000000" --fbf "#000000" --ab "#000000" --af "#EAEAEA"''; in mkOptionDefault { "${mod}+a" = "focus parent"; diff --git a/home/modules/gui/waybar.nix b/home/modules/gui/waybar.nix index 3e4db09..7f37784 100644 --- a/home/modules/gui/waybar.nix +++ b/home/modules/gui/waybar.nix @@ -48,16 +48,16 @@ in { tooltip = false; }; "cpu" = { - format = "cpu {usage}%"; + format = " {usage}%"; tooltip = false; }; "memory" = { - format = "mem {percentage}%"; + format = " {percentage}%"; tooltip = true; tooltip-format = "{used}/{total}"; }; "disk" = { - format = "disk {specific_used:0.0f}/{specific_total:0.0f}"; + format = " {specific_used:0.0f}/{specific_total:0.0f}"; unit = "GiB"; tooltip = false; }; @@ -68,7 +68,7 @@ in { }; style = '' * { - font-family: "JetBrains Mono", monospace; + font-family: "JetBrainsMono Nerd Font", monospace; font-size: 12px; font-weight: 500; border: none; diff --git a/home/modules/halloy.nix b/home/modules/halloy.nix index 48c3806..7988917 100644 --- a/home/modules/halloy.nix +++ b/home/modules/halloy.nix @@ -15,6 +15,7 @@ in { enable = true; settings = { theme = "macawCustom"; + font.size = 16; preview.enabled = false; sidebar = { buffer_action = "replace-pane"; diff --git a/home/modules/terminal.nix b/home/modules/terminal.nix index bc6b553..cf86f0d 100644 --- a/home/modules/terminal.nix +++ b/home/modules/terminal.nix @@ -15,10 +15,10 @@ in { settings = { main = { term = "xterm-256color"; - font = "JetBrains Mono:style=Medium:size=15"; - font-bold = "JetBrains Mono:style=Bold:size=15"; - font-italic = "JetBrains Mono:style=Italic:size=15"; - font-bold-italic = "JetBrains Mono:style=Bold Italic:size=15"; + font = "JetBrainsMono Nerd Font:style=Medium:size=15"; + font-bold = "JetBrainsMono Nerd Font:style=Bold:size=15"; + font-italic = "JetBrainsMono Nerd Font:style=Italic:size=15"; + font-bold-italic = "JetBrainsMono Nerd Font:style=Bold Italic:size=15"; dpi-aware = "yes"; initial-window-size-pixels = "1200x600"; }; diff --git a/home/modules/zed.nix b/home/modules/zed.nix index 1b79e2a..7148c24 100644 --- a/home/modules/zed.nix +++ b/home/modules/zed.nix @@ -40,7 +40,7 @@ in { }; autosave = "on_focus_change"; auto_update = false; - buffer_font_family = "JetBrains Mono"; + buffer_font_family = "JetBrainsMono Nerd Font"; buffer_font_size = 22; hide_mouse = "never"; minimap.show = "auto"; diff --git a/sys/modules/baseline.nix b/sys/modules/baseline.nix index 7c876a3..fd594b7 100644 --- a/sys/modules/baseline.nix +++ b/sys/modules/baseline.nix @@ -55,6 +55,7 @@ in { fonts.packages = with pkgs; [ jetbrains-mono + nerd-fonts.jetbrains-mono noto-fonts noto-fonts-cjk-sans noto-fonts-emoji diff --git a/sys/modules/gtklock.nix b/sys/modules/gtklock.nix index 3600b41..5d9721d 100644 --- a/sys/modules/gtklock.nix +++ b/sys/modules/gtklock.nix @@ -26,7 +26,7 @@ in { window { background-color: black; color: #eaeaea; - font-family: "JetBrains Mono", monospace; + font-family: "JetBrainsMono Nerd Font", monospace; font-size: 14px; } From f9a6d798eac62ee2b4dcbb3b55eebf0f154fac1b Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Fri, 12 Sep 2025 15:27:22 -0600 Subject: [PATCH 3/3] neovim: add plugins and themes --- home/modules/neovim.nix | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/home/modules/neovim.nix b/home/modules/neovim.nix index 7bed139..e5ba52a 100644 --- a/home/modules/neovim.nix +++ b/home/modules/neovim.nix @@ -40,8 +40,66 @@ in { ''; plugins = with pkgs.vimPlugins; [ + barbar-nvim + nvim-web-devicons vim-nix vim-visual-multi + { + plugin = nvim-tree-lua; + type = "lua"; + config = '' + require("nvim-tree").setup({ + renderer = { + icons = { + show = { + file = true, + folder = true, + folder_arrow = true, + git = true, + }, + glyphs = { + git = { + unstaged = "", + staged = "", + unmerged = "", + renamed = "", + untracked = "", + deleted = "", + ignored = "", + }, + }, + }, + }, + view = { + width = 30, + side = 'left', + }, + sync_root_with_cwd = true, --fix to open cwd with tree + respect_buf_cwd = true, + update_cwd = true, + update_focused_file = { + enable = true, + update_cwd = true, + update_root = true, + }, + }) + + vim.g.nvim_tree_respect_buf_cwd = 1 + + -- use g? for bindings help while in tree + ''; + } + { + plugin = gruvbox-nvim; + type = "lua"; + config = '' + require("gruvbox").setup({ + contrast = "high", + }) + vim.o.background = "dark" + vim.cmd([[colorscheme gruvbox]]) + ''; + } ]; }; home.sessionVariables = {