From 272031aaed9ab0f4e823e164c39b028a6f2207b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Thu, 18 Jan 2024 08:47:08 +0100 Subject: [PATCH] feat: change default font --- home/desktops/hyprland/default.nix | 2 +- home/desktops/hyprland/keybinds.nix | 2 +- home/desktops/hyprland/kitty.nix | 19 ++----------------- home/packages/default.nix | 2 +- home/programs/neovide.toml | 5 ++++- home/programs/nixvim.nix | 17 +++-------------- hosts/MONSTER/default.nix | 28 ++++++++++++++++++++++++++-- 7 files changed, 38 insertions(+), 37 deletions(-) diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix index 5aa2a99..e6fb702 100644 --- a/home/desktops/hyprland/default.nix +++ b/home/desktops/hyprland/default.nix @@ -39,7 +39,7 @@ }; master = { orientation = "center"; - new_is_master = false; + new_is_master = true; always_center_master = true; mfact = 0.4; }; diff --git a/home/desktops/hyprland/keybinds.nix b/home/desktops/hyprland/keybinds.nix index 2b1fd80..0b15272 100644 --- a/home/desktops/hyprland/keybinds.nix +++ b/home/desktops/hyprland/keybinds.nix @@ -3,7 +3,7 @@ "SUPER,T,exec,kitty" "SUPER,TAB,exec,ags -t overview" "SUPER,C,togglespecialworkspace,calc" - "SUPER_SHIFT,C,exec,hyprpicker" + "SUPER_SHIFT,C,exec,hyprpicker | wl-copy" "SUPER_SHIFT,V,exec,slurp | grim -g - - | wl-copy" "SUPER,P,togglefloating," "SUPER,P,pin," diff --git a/home/desktops/hyprland/kitty.nix b/home/desktops/hyprland/kitty.nix index f6683a2..e73d984 100644 --- a/home/desktops/hyprland/kitty.nix +++ b/home/desktops/hyprland/kitty.nix @@ -1,30 +1,15 @@ {pkgs}: { enable = true; - /* - package = pkgs.kitty.overrideAttrs (prev: { - src = pkgs.lib.fetchFromGitHub { - owner = "nightuser"; - repo = "kitty"; - rev = "" - }; - }); - */ shellIntegration.enableFishIntegration = true; - font = { - package = pkgs.jetbrains-mono; - name = "JetBrains Mono"; - size = 13; - }; extraConfig = '' symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono + font_size 13 + include ./current-theme.conf ''; settings = { background_opacity = "0.8"; window_padding_width = 10; - - cursor = "#928374"; - cursor_text_color = "background"; }; } diff --git a/home/packages/default.nix b/home/packages/default.nix index 46af606..1890c2d 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -18,7 +18,7 @@ tartube yt-dlp # youtube-music.override {electron = pkgs.electron_28;}) - vlc + mpv makemkv handbrake metadata-cleaner diff --git a/home/programs/neovide.toml b/home/programs/neovide.toml index 3d5046b..444b259 100644 --- a/home/programs/neovide.toml +++ b/home/programs/neovide.toml @@ -1,6 +1,9 @@ maximized = false [font] -normal = ["JetBrainsMono NF"] +normal = ["FiraCode Nerd Font"] size = 16 edging = "subpixelantialias" + +[font.features] +"FiraCode Nerd Font" = ["+zero", "+onum", "+ss04", "+cv19", "+cv23", "+ss09", "+cv27", "+ss06", "+ss07", "+ss10"] diff --git a/home/programs/nixvim.nix b/home/programs/nixvim.nix index d862f4e..63517ad 100644 --- a/home/programs/nixvim.nix +++ b/home/programs/nixvim.nix @@ -5,18 +5,6 @@ nodejs = pkgs.nodejs_18; }) ."@angular/language-server"; - /* - *tree-sitter-angular = pkgs.tree-sitter.buildGrammar { - language = "angular"; - version = "624ff10"; - src = pkgs.fetchFromGitHub { - owner = "dlvandenberg"; - repo = "tree-sitter-angular"; - rev = "ddd64047c8ccc3dc2aff1082e4461ebc9210917d"; - hash = "sha256-wAbkrJ0MmNhE3qb34DQiju/mFIb7YCTyBUgVmP+iWQs="; - }; - }; - */ darkman = pkgs.vimUtils.buildVimPlugin { name = "darkman"; src = pkgs.buildGoModule rec { @@ -193,8 +181,6 @@ in { mergetool_layout = "mr"; mergetool_prefer_revision = "local"; - guifont = "JetBrains_Mono:h12"; - neovide_transparency = 0.8; neovide_padding_top = 10; neovide_padding_bottom = 10; @@ -202,6 +188,8 @@ in { neovide_padding_right = 10; neovide_floating_blur_amount_x = 10; neovide_floating_blur_amount_y = 10; + neovide_floating_shadow = false; + neovide_cursor_vfx_mode = "pixiedust"; }; clipboard = { @@ -229,6 +217,7 @@ in { local flavour = require("catppuccin").options.background[vim.o.background] local palette = require("catppuccin.palettes").get_palette(flavour) vim.cmd("hi Normal guibg=" .. palette.base) + vim.cmd("set pumblend=100") end, }) end diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix index 3740723..d78f167 100644 --- a/hosts/MONSTER/default.nix +++ b/hosts/MONSTER/default.nix @@ -197,14 +197,38 @@ noto-fonts-cjk noto-fonts-emoji fira-code - (nerdfonts.override {fonts = ["JetBrainsMono" "Noto" "NerdFontsSymbolsOnly"];}) + (nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono" "Noto" "NerdFontsSymbolsOnly"];}) ]; fontconfig = { defaultFonts = { - monospace = ["JetBrainsMono Nerd Font"]; + monospace = ["FiraCode Nerd Font"]; sansSerif = ["Noto Sans Nerd Font"]; }; + localConf = + /* + xml + */ + '' + + + Fira + + + zero + onum + ss04 + cv19 + cv23 + ss09 + cv27 + ss06 + ss07 + ss10 + + + ''; + subpixel.rgba = "bgr"; }; };