add ghostty terminal & fix gtk cursor

This commit is contained in:
DACHXY 2024-12-28 13:51:21 +08:00
parent 155d78a407
commit f799d7eca2
14 changed files with 206 additions and 28 deletions

View file

@ -0,0 +1,14 @@
font-family = "CaskaydiaCove Nerd Font Mono"
font-size = 16
theme = catppuccin-macchiato
unfocused-split-opacity = 0.85
wait-after-command = false
shell-integration = detect
window-theme = ghostty
confirm-close-surface = false
window-decoration = false
keybind = ctrl+shift+zero=toggle_tab_overview

View file

@ -1,11 +1,14 @@
$mainMod = SUPER
$scripts = ~/.config/scripts/
$terminal = ghostty
$filemanager = thunar
$browser = firefox
bind = CTRL ALT, T, exec, kitty
bind = $mainMod, Return, exec, kitty
bind = CTRL ALT, T, exec, $terminal
bind = $mainMod, Return, exec, $terminal
bind = $mainMod, Q, killactive,
bind = $mainMod, M, exec, wlogout --protocol layer-shell
bind = $mainMod, E, exec, thunar
bind = $mainMod, E, exec, $filemanager
bind = $mainMod, V, togglefloating,
bind = ALT, SPACE, exec, rofi -config ~/.config/rofi/apps.rasi -show drun
bind = $mainMod ALT, W, exec, $scripts/waybarRestart.sh
@ -19,14 +22,13 @@ bind = $mainMod, PERIOD, exec, flatpak run it.mijorus.smile
bind = $mainMod, X, exec, sleep 0.1 && swaync-client -t -sw
bind = $mainMod SHIFT, C, centerwindow
bind = ,F11, fullscreen
bind = $mainMod, F, exec, $browser
bind = $mainMod, C, exec, NIXOS_OZONE_WL=1 code
# Cycle windows
bind = ALT, TAB, cyclenext
bind = ALT, TAB, bringactivetotop
bind = $mainMod, F, exec, firefox
bind = $mainMod, C, exec, NIXOS_OZONE_WL=1 code
bind = $mainMod, h, movefocus, l
bind = $mainMod, l, movefocus, r
bind = $mainMod, k, movefocus, u

View file

@ -97,7 +97,7 @@
"temperature",
"memory",
"custom/swaync",
"pulseaudio",
"pulseaudio"
]
}
]

View file

@ -58,7 +58,7 @@
"offscreen-css": true,
"offscreen-css-text": "(inactive)",
"rewrite": {
"(.*)> nvim": " $1",
"nvim . (.*)": " $1",
"(.*) - Discord": " $1",
"(.*) — Mozilla Firefox": " $1"
}
@ -159,7 +159,8 @@
"Brave-browser",
"Spotify",
"thunar",
"vlc"
"vlc",
"com.mitchellh.ghostty"
]
},

View file

@ -39,5 +39,9 @@ in
source = "${configDir}/fcitx5";
};
".config/electron-flags.conf".source = "${configDir}/electron/electron-flags.conf";
".config/ghostty" = {
recursive = true;
source = "${configDir}/ghostty";
};
};
}

View file

@ -16,7 +16,8 @@
WLR_NO_HARDWARE_CURSORS = "1";
CLUTTER_BACKEND = "wayland";
WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "32";
XCURSOR_THEME = "catppuccin-macchiato-lavender-cursors";
XCURSOR_SIZE = "24";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";

View file

@ -4,7 +4,7 @@
enable = true;
cursorTheme = {
name = "Catppuccin-Macchiato-Lavender";
name = "catppuccin-macchiato-lavender-cursors";
package = pkgs.catppuccin-cursors.macchiatoLavender;
};

View file

@ -1,4 +1,4 @@
{ pkgs, inputs, ... }: {
{ pkgs, ... }: {
programs = {
neovim = {
enable = true;
@ -13,6 +13,14 @@
package = pkgs.vscode.fhs;
};
obs-studio = {
enable = true;
plugins = with pkgs.obs-studio-plugins; [
obs-backgroundremoval
obs-pipewire-audio-capture
];
};
firefox.profiles.danny.settings = {
# about:config
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;

View file

@ -18,7 +18,6 @@ in
# envFile.source = ../config/nushell/env.nu;
# };
fish = {
enable = true;
interactiveShellInit = ''
@ -30,6 +29,16 @@ in
shellAliases = shellAlias;
};
bash = {
enable = true;
# Ghostty intergration in nix-shell
bashrcExtra = ''
if [ -n "''${GHOSTTY_RESOURCES_DIR}" ]; then
builtin source "''${GHOSTTY_RESOURCES_DIR}/shell-integration/bash/ghostty.bash"
fi
'';
};
carapace = {
enable = true;
enableFishIntegration = true;