diff --git a/flake.lock b/flake.lock index 1553136..c44d311 100644 --- a/flake.lock +++ b/flake.lock @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { @@ -178,11 +178,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1757345656, - "narHash": "sha256-ZvNfl8pu1iwJW0uUZKV8XHIM7JqJxoZX+EqzjayMDqU=", + "lastModified": 1758770724, + "narHash": "sha256-ayj0RkDQ57roFRtqOuDaUk6493Yd2x2xJrfOz44s4jk=", "owner": "nix-community", "repo": "NUR", - "rev": "9009f3b97f820b7b5c2732d423a08bb8d82d179a", + "rev": "2147792a5e7b210162abdc6b318441737cd73da5", "type": "github" }, "original": { @@ -288,11 +288,11 @@ }, "unstable": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { 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 b795be7..3edd4c0 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 eb73361..ecc5a56 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/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 = { diff --git a/home/modules/zed.nix b/home/modules/zed.nix index 6e54ca7..60fd59a 100644 --- a/home/modules/zed.nix +++ b/home/modules/zed.nix @@ -40,8 +40,8 @@ in { }; autosave = "on_focus_change"; auto_update = false; - buffer_font_family = "JetBrains Mono"; - buffer_font_size = 16; + buffer_font_family = "JetBrainsMono Nerd Font"; + buffer_font_size = 22; hide_mouse = "never"; minimap.show = "auto"; tabs = { diff --git a/home/platforms/chem@yuki/default.nix b/home/platforms/chem@yuki/default.nix index 9d774d2..5e87405 100644 --- a/home/platforms/chem@yuki/default.nix +++ b/home/platforms/chem@yuki/default.nix @@ -44,7 +44,7 @@ gui = { enable = true; monitors = { - HDMI-A-4 = { + HDMI-A-1 = { width = "1920"; height = "1080"; rate = "59.94"; @@ -67,6 +67,7 @@ qbittorrent virt-manager vintagestory + easyeffects ]; username = "chem"; diff --git a/sys/modules/baseline.nix b/sys/modules/baseline.nix index 3869463..8c75530 100644 --- a/sys/modules/baseline.nix +++ b/sys/modules/baseline.nix @@ -53,6 +53,17 @@ in { ]; }; + fonts.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 + ]; + services = { openssh.enable = mkDefault true; 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; }