diff --git a/home/apps/ghostty.nix b/home/apps/ghostty.nix index 5dc0cdbc..db9fbd40 100644 --- a/home/apps/ghostty.nix +++ b/home/apps/ghostty.nix @@ -3,6 +3,7 @@ device, ... }: { + stylix.targets.ghostty.enable = false; programs.ghostty = { enable = device.is "ryu"; installBatSyntax = false; @@ -14,6 +15,36 @@ title = ""; command = "fish"; background-opacity = 0.8; + theme = "catppuccin-mocha"; + }; + systemd.enable = true; + themes = { + catppuccin-mocha = { + # background = "1e1e2e"; + background = "000000"; + cursor-color = "f5e0dc"; + foreground = "cdd6f4"; + palette = [ + "0=#45475a" + "1=#f38ba8" + "2=#a6e3a1" + "3=#f9e2af" + "4=#89b4fa" + "5=#f5c2e7" + "6=#94e2d5" + "7=#bac2de" + "8=#585b70" + "9=#f38ba8" + "10=#a6e3a1" + "11=#f9e2af" + "12=#89b4fa" + "13=#f5c2e7" + "14=#94e2d5" + "15=#a6adc8" + ]; + selection-background = "353749"; + selection-foreground = "cdd6f4"; + }; }; }; } diff --git a/home/apps/wezterm.nix b/home/apps/wezterm.nix index 8db65ffd..09020f20 100644 --- a/home/apps/wezterm.nix +++ b/home/apps/wezterm.nix @@ -20,7 +20,7 @@ colors = { background = "#000000", }, - font_size = 16, + font_size = 13, initial_cols = 200, hide_tab_bar_if_only_one_tab = true, window_background_opacity = 0.8, diff --git a/home/programs/fastfetch.nix b/home/programs/fastfetch.nix index 47872c5a..a7215912 100644 --- a/home/programs/fastfetch.nix +++ b/home/programs/fastfetch.nix @@ -13,6 +13,7 @@ in { settings = { logo = lib.mkIf (device.is "ryu") { source = nextcloudWallpapers "hornet.png"; + type = "kitty"; width = 70; }; modules = [ diff --git a/home/programs/fish.nix b/home/programs/fish.nix index 79bdec87..acef0f50 100644 --- a/home/programs/fish.nix +++ b/home/programs/fish.nix @@ -35,7 +35,7 @@ ''; # ${pkgs.spotify-player}/bin/spotify_player generate fish | source interactiveShellInit = '' - ${pkgs.pfetch-rs}/bin/pfetch + ${lib.getExe pkgs.fastfetch} # ${pkgs.nb}/bin/nb todo undone ${lib.optionalString (device.isLinux && !device.isNix) "source /etc/profile.d/nix-daemon.fish"} ${lib.optionalString (device.is "ryu") '' diff --git a/home/services/hyprland.nix b/home/services/hyprland.nix index 60aa5357..b3d4b471 100644 --- a/home/services/hyprland.nix +++ b/home/services/hyprland.nix @@ -188,8 +188,8 @@ ]; bind = [ # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more - "$mainMod, Return, exec, ${lib.getExe pkgs.kitty}" - "$mainModShift, Return, exec, ${lib.getExe pkgs.wezterm}" + "$mainMod, Return, exec, ${lib.getExe pkgs.wezterm}" + "$mainModShift, Return, exec, ${lib.getExe pkgs.kitty}" # "$mainModShift, Return, exec, ${pkgs.foot}/bin/foot" "$mainModShift, Q, killactive," "$mainModShift, s, exec, ${lib.getExe pkgs.hyprshot} -m region -o ~/Pictures/Screenshots/"