diff --git a/modules/desktop/home/default.nix b/modules/desktop/home/default.nix index 4cf7f9f..55cb35d 100644 --- a/modules/desktop/home/default.nix +++ b/modules/desktop/home/default.nix @@ -10,12 +10,11 @@ ./layaway.nix ./swayidle.nix ./browser.nix + ./fuzzel.nix ./eww ./niri ]; - # temporary(tm) - programs.wofi.enable = true; programs.swaylock.enable = true; services.network-manager-applet.enable = true; xsession.enable = true; @@ -27,6 +26,10 @@ # fucking hell. pkgs.obsidian pkgs.zsh + pkgs.hyprpicker + pkgs.bemoji + pkgs.librsvg + pkgs.cairo ]; services.gpg-agent = { diff --git a/modules/desktop/home/fuzzel.nix b/modules/desktop/home/fuzzel.nix new file mode 100644 index 0000000..431943e --- /dev/null +++ b/modules/desktop/home/fuzzel.nix @@ -0,0 +1,28 @@ +{ lib, ... }: +{ + programs.fuzzel = { + enable = true; + settings = { + main = { + font = lib.mkForce "Departure Mono:size=13"; + terminal = "kitty"; + lines = 15; + width = 50; + horizontal-pad = 20; + vertical-pad = 12; + }; + colors = { + background = lib.mkForce "282828cf"; + match = lib.mkForce "d65d0eff"; + selection-match = lib.mkForce "fe8019ff"; + border = lib.mkForce "bab9e5ff"; + }; + border = { + radius = 10; + selection-radius = 3; + width = 3; + }; + }; + }; + +} diff --git a/modules/desktop/home/niri/kdl/binds.kdl b/modules/desktop/home/niri/kdl/binds.kdl index 2bfb5c4..f578e07 100644 --- a/modules/desktop/home/niri/kdl/binds.kdl +++ b/modules/desktop/home/niri/kdl/binds.kdl @@ -1,11 +1,10 @@ - binds { // spawn terminal Mod+Return repeat=false { spawn "kitty"; } - Mod+D repeat=false { spawn "wofi" "-S" "drun" "--allow-images"; } - Mod+I { - spawn "/nix/store/0wnpajfc40akxikz2h483a256ab97idx-rofimoji-6.7.0/bin/rofimoji" "--selector" "wofi" "-f" "alchemical_symbols" "emojis" "braille_patterns" "box_drawing" "chess_symbols" "emoticons" "geometric_shapes" "greek_extended" "math" "mathematical_alphanumeric_symbols" "mathematical_operators" "miscellaneous_symbols" "miscellaneous_mathematical_symbols-a" "miscellaneous_mathematical_symbols-b" "miscellaneous_symbols_and_arrows" "miscellaneous_symbols_and_pictographs" "miscellaneous_technical" "modi" "modifier_tone_letters" "musical_symbols" "nerd_font" "number_forms" "shorthand_format_controls" "specials" "variation_selectors" "vertical_forms" "-a" "copy"; - } + Mod+D repeat=false { spawn "fuzzel"; } + Mod+I repeat=false { spawn "bemoji"; } + Mod+M repeat=false { spawn "hyprpicker"; } + Mod+E repeat=false { spawn "kitty" "hx" "~/.config/niri/live.kdl"; } Mod+Shift+E { quit; } Mod+Shift+Q { close-window; } diff --git a/modules/desktop/home/niri/kdl/style.kdl b/modules/desktop/home/niri/kdl/style.kdl index 2e45aad..74e0e0b 100644 --- a/modules/desktop/home/niri/kdl/style.kdl +++ b/modules/desktop/home/niri/kdl/style.kdl @@ -2,7 +2,7 @@ prefer-no-csd cursor { xcursor-theme "phinger-cursors-dark" - xcursor-size 16 + xcursor-size 32 hide-when-typing hide-after-inactive-ms 10000 } @@ -71,3 +71,15 @@ window-rule { to="#ff9a56" } } + +layer-rule { + match namespace="launcher" + geometry-corner-radius 10 + shadow { + on + offset x=0 y=0 + softness 40 + color "#bab9e5af" + } + baba-is-float true +} diff --git a/modules/editors/default.nix b/modules/editors/default.nix index e7b5b71..ef3baf7 100644 --- a/modules/editors/default.nix +++ b/modules/editors/default.nix @@ -3,7 +3,6 @@ let discord-presence-lsp = pkgs.callPackage ./discord-presence-lsp.nix { }; in { - programs.niri.enable = true; imports = [ ./zed ]; diff --git a/modules/media/fonts.nix b/modules/media/fonts.nix index 77cd112..0c9fc02 100644 --- a/modules/media/fonts.nix +++ b/modules/media/fonts.nix @@ -5,10 +5,13 @@ src = pkgs.fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "8a0041ea7b92e339a7ce13e4e1dadcc85cb8f5df"; - sha256 = "sha256-9TzeihEKIEDRtDuv+NmLWjTpoGnBR+RP/jIBfB1O06U="; + rev = "0bd2d5599819aa0774f5ca64c8ac3f54ae3fd54f"; + sha256 = "sha256-E89GYJKG65Dh7TPI6TVre/4LCxXnxvTAPYS/OPj7nPg="; }; - installPhase = oldAttrs.installPhase + "mv $out/share/fonts/truetype $out/share/fonts/ttf"; + installPhase = + oldAttrs.installPhase + + "mv $out/share/fonts/truetype $out/share/fonts/ttf\n" + + "rm $out/share/fonts/ttf/Noto*Emoji*.ttf"; }); }; @@ -17,8 +20,8 @@ nerd-fonts.fira-code nerd-fonts.departure-mono google-fonts + noto-fonts-color-emoji montserrat - noto-fonts atkinson-hyperlegible arkpandora_ttf liberation_ttf @@ -42,7 +45,7 @@ fonts.fontconfig = { enable = true; defaultFonts = { - emoji = [ ]; + emoji = [ "Noto Color Emoji" ]; monospace = [ ]; sansSerif = [ "Atkinson Hyperlegible" ]; serif = [ ];