diff --git a/common/desktop.nix b/common/desktop.nix index 263ab6e..2eaf91b 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -48,12 +48,12 @@ in allowBitmaps = false; antialias = true; defaultFonts = { + monospace = [ "Berkeley Mono" ]; serif = [ "Liberation Serif" ]; sansSerif = [ "Inter" ]; }; hinting.enable = true; hinting.style = "slight"; - subpixel.rgba = "rgb"; }; packages = with pkgs; [ inter @@ -63,7 +63,6 @@ in noto-fonts noto-fonts-cjk-sans noto-fonts-color-emoji - roboto ubuntu_font_family ]; }; diff --git a/home/common/ghostty.nix b/home/common/ghostty.nix index a4e95bd..50f8cd5 100644 --- a/home/common/ghostty.nix +++ b/home/common/ghostty.nix @@ -22,6 +22,8 @@ font-style-bold-italic = "ExtraLight"; font-synthetic-style = false; + freetype-load-flags = "no-force-autohint"; + adjust-cursor-thickness = 4; adjust-underline-position = 3; adjust-underline-thickness = -1; diff --git a/home/common/gnome.nix b/home/common/gnome.nix index 83fe87f..b8e949e 100644 --- a/home/common/gnome.nix +++ b/home/common/gnome.nix @@ -66,11 +66,9 @@ with lib.hm.gvariant; enable-animations = false; enable-hot-corners = false; show-battery-percentage = true; - font-antialiasing = "grayscale"; - font-hinting = "slight"; font-name = "Inter Variable 11"; document-font-name = "Inter Variable 11"; - monospace-font-name = "BerkeleyMono Nerd Font 11"; + monospace-font-name = "Berkeley Mono 11"; toolkit-accessibility = false; }; diff --git a/home/common/nvim/dieter/lua/dieter/init.lua b/home/common/nvim/dieter/lua/dieter/init.lua index 61946a2..2d6c96a 100644 --- a/home/common/nvim/dieter/lua/dieter/init.lua +++ b/home/common/nvim/dieter/lua/dieter/init.lua @@ -10,6 +10,12 @@ local colors = { dimmed = hsl(0, 0, 80), dimmed_subtle = hsl(0, 0, 20), + highlight_subtle = hsl(0, 0, 94), + highlight = hsl(0, 0, 90), + highlight_intense = hsl(42, 100, 30), + + dialog_fg = hsl(230, 13, 10), + string = hsl(96, 50, 33), comment = hsl(360, 66, 40), comment_error = hsl(2, 85, 40), @@ -32,11 +38,18 @@ local colors = { change_quarter = hsl(224, 100, 85), delete = hsl(350, 100, 40), - dialog_bg = hsl(224, 5, 92), selection = hsl(270, 75, 92), - highlight_subtle = hsl(0, 0, 94), - highlight = hsl(0, 0, 90), - highlight_intense = hsl(42, 100, 30), + + search_bg = hsl(43, 100, 8), + search_fg = hsl(43, 100, 85), + + cmp_bg = hsl(218, 30, 97), + cmp_fg = hsl(218, 30, 13), + cmp_selected_fg = hsl(218, 50, 8), + cmp_selected_bg = hsl(218, 30, 85), + + doc_bg = hsl(200, 30, 90), + doc_fg = hsl(220, 80, 10), }, dark = { diff --git a/home/common/nvim/init.lua b/home/common/nvim/init.lua index a99fcad..0b30e4f 100644 --- a/home/common/nvim/init.lua +++ b/home/common/nvim/init.lua @@ -10,7 +10,6 @@ vim.opt.guicursor = "n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor,sm:block-blinkwait175-blinkoff150-blinkon175" vim.opt.laststatus = 0 vim.opt.number = false -vim.opt.messagesopt = "wait:1000,history:50" vim.opt.relativenumber = false vim.opt.ruler = true vim.opt.syntax = "on" diff --git a/home/dln/nemo.nix b/home/dln/nemo.nix index df79854..988c04c 100644 --- a/home/dln/nemo.nix +++ b/home/dln/nemo.nix @@ -6,7 +6,7 @@ ]; programs.ghostty.settings = { - font-size = lib.mkForce 16; + font-size = lib.mkForce 15; }; programs.obs-studio = {