diff --git a/home/Aloria.nix b/home/Aloria.nix index 8b4f462..19921ad 100644 --- a/home/Aloria.nix +++ b/home/Aloria.nix @@ -29,14 +29,6 @@ in gnome-power-manager discord smile - (pkgs.appimageTools.wrapType2 { - pname = "Helium"; - version = "0.4.7.1"; - src = pkgs.fetchurl { - url = "https://github.com/imputnet/helium-linux/releases/download/0.4.7.1/helium-0.4.7.1-x86_64.AppImage"; - sha256 = "b7a64d9cd96c841119f4729545d7b88ed804fdcac99d3878099f338766dfdd2d"; - }; - }) ]; services.hyprpaper = { @@ -63,6 +55,6 @@ in general.gaps_out = 1; }; - programs.alacritty.settings.font.size = 16; + programs.alacritty.settings.font.size = 13; programs.kitty.font.size = 13; } diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix index c543422..1556bff 100644 --- a/home/alacritty/default.nix +++ b/home/alacritty/default.nix @@ -40,27 +40,8 @@ }; }; font = { - size = pkgs.lib.mkDefault 15; - bold = { - family = "ZedMono Nerd Font"; - style = "Extended Bold"; - features = "+ss05"; - }; - bold_italic = { - family = "ZedMono Nerd Font"; - style = "Extended Bold Italic"; - features = "+ss05"; - }; - italic = { - family = "ZedMono Nerd Font"; - style = "Extended Italic"; - features = "+ss05"; - }; - normal = { - family = "ZedMono Nerd Font"; - style = "Extended Light"; - features = "+ss05"; - }; + size = pkgs.lib.mkDefault 13; + normal.family = "DejaVu Sans Mono"; }; keyboard.bindings = [ { diff --git a/home/firefox/files/Chrome/Cached Theme.pak b/home/firefox/files/Chrome/Cached Theme.pak index c7a219e..836c956 100644 Binary files a/home/firefox/files/Chrome/Cached Theme.pak and b/home/firefox/files/Chrome/Cached Theme.pak differ diff --git a/home/foot/default.nix b/home/foot/default.nix index 4cca39e..13fdac2 100644 --- a/home/foot/default.nix +++ b/home/foot/default.nix @@ -5,8 +5,9 @@ server.enable = true; settings = { main = { - font = "Iosevka:size=14:style=Extended:fontfeatures=+ss05"; + font = "DejaVu Sans Mono:size=13"; term = "xterm-256color"; + line-height = "18"; }; tweak = { sixel = "yes"; diff --git a/home/helium/default.nix b/home/helium/default.nix new file mode 100644 index 0000000..3d9c190 --- /dev/null +++ b/home/helium/default.nix @@ -0,0 +1,43 @@ +{ pkgs, ... }: +{ + home.packages = [ + (pkgs.appimageTools.wrapType2 { + pname = "Helium"; + version = "0.4.7.1"; + src = pkgs.fetchurl { + url = "https://github.com/imputnet/helium-linux/releases/download/0.4.7.1/helium-0.4.7.1-x86_64.AppImage"; + sha256 = "b7a64d9cd96c841119f4729545d7b88ed804fdcac99d3878099f338766dfdd2d"; + }; + }) + ]; + xdg.desktopEntries = { + helium = { + name = "Helium"; + genericName = "Web Browser"; + comment = "Access the Internet"; + exec = "Helium --enable-features=TouchpadOverscrollHistoryNavigation %U"; + startupNotify = true; + terminal = false; + icon = "chromium"; + type = "Application"; + categories = [ "Network" "WebBrowser" ]; + mimeType = [ + "x-scheme-handler/webcal" + "application/pdf" + "application/rdf+xml" + "application/rss+xml" + "application/xhtml+xml" + "application/xhtml_xml" + "application/xml" + "image/gif" + "image/jpeg" + "image/png" + "image/webp" + "text/html" + "text/xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; + }; + }; +} diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index c403f49..fb7378d 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,12 +1,12 @@ -{ inputs, pkgs, ... }: +{ pkgs, ... }: let playerctl = "${pkgs.playerctl}/bin/playerctl"; wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste"; nautilus = "${pkgs.nautilus}/bin/nautilus"; gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar"; wpctl = "${pkgs.wireplumber}/bin/wpctl"; - terminal-name = ".kitty-wrapped"; - terminal = "${pkgs.kitty}/bin/kitty -1"; + terminal-name = "foot"; + terminal = "${pkgs.foot}/bin/footclient"; rofi = "${pkgs.rofi}/bin/rofi"; jq = "${pkgs.jq}/bin/jq"; rofi-ykman = pkgs.writeShellScriptBin "rofi-ykman" '' @@ -134,6 +134,7 @@ in { "$altMod" = pkgs.lib.mkDefault "ALT_L"; exec-once = [ "hyprpaper" + "foot --server" "hyprctl dispatch exec ags run" "${wl-paste} --type text --watch cliphist store" "${wl-paste} --type image --watch cliphist store" @@ -201,8 +202,10 @@ in { preserve_split = "yes"; force_split = 2; }; + gesture = [ + "3, horizontal, workspace" + ]; gestures = { - workspace_swipe = "on"; workspace_swipe_invert = false; }; device = [ @@ -238,7 +241,7 @@ in { "$mainMod, Q, killactive," "$mainMod, A, exec, ${nautilus}" "$mainMod, S, exec, LC_TIME=\"en_GB.UTF-8\" ${gnome-calendar}" - "$mainMod, B, exec, MOZ_ENABLE_WAYLAND=1 firefox" + "$mainMod, B, exec, Helium" "$mainMod, M, fullscreen, 1" "$mainMod, F11, fullscreen" "$mainMod, F, togglefloating," diff --git a/home/utils/desktop.nix b/home/utils/desktop.nix index 1eb6791..109cafa 100644 --- a/home/utils/desktop.nix +++ b/home/utils/desktop.nix @@ -10,6 +10,7 @@ ../foot ../kitty ../firefox + ../helium ../ssh ../mpv ]; @@ -104,4 +105,6 @@ "image/png" = "org.gnome.Loupe.desktop"; }; }; + + fonts.fontconfig.enable = true; } diff --git a/home/zsh/default.nix b/home/zsh/default.nix index de4301e..19e87a4 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -15,7 +15,7 @@ inputs.fzgo.packages.${pkgs.system}.default ]; home.sessionVariables = { - BROWSER = "firefox"; + BROWSER = "Helium"; PDF_VIEWER = "evince"; GPULAB_CERT = "${config.xdg.configHome}/../.secrets/GPULab/certificate.pem"; GPULAB_DEV = "False"; @@ -78,6 +78,9 @@ function o() { ${pkgs.handlr-regex}/bin/handlr open $@ < /dev/null &> /dev/null & disown } + precmd() { + print -Pn "\e]133;A\e\\" + } ''; shellAliases = {