Switched to catppuccin
This commit is contained in:
parent
a7a8b638b0
commit
6ab7837acf
15 changed files with 114 additions and 78 deletions
|
@ -15,7 +15,7 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
config.theme = "gruvbox-dark";
|
||||
catppuccin.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -15,10 +15,10 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
programs.btop = {
|
||||
enable = true;
|
||||
catppuccin.enable = true;
|
||||
settings = {
|
||||
theme_background = false;
|
||||
vim_keys = true;
|
||||
color_theme = "gruvbox_dark_v2";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -16,10 +16,9 @@ in {
|
|||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
xdg.dataFile."tmux-theme".source = ./tmux_theme;
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
catppuccin.enable = true;
|
||||
keyMode = "vi";
|
||||
newSession = true;
|
||||
sensibleOnTop = true;
|
||||
|
@ -73,11 +72,6 @@ in {
|
|||
bind '"' split-window -c "#{pane_current_path}"
|
||||
bind % split-window -h -c "#{pane_current_path}"
|
||||
|
||||
# Eye Candy
|
||||
# set -g @plugin 'mattdavis90/base16-tmux'
|
||||
# set -g @colors-base16 'darktooth'
|
||||
source-file ${config.xdg.dataHome}/tmux-theme;
|
||||
|
||||
# Smart pane switching with awareness of Vim splits.
|
||||
# See: https://github.com/christoomey/vim-tmux-navigator
|
||||
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
# This tmux statusbar config was created by tmuxline.vim
|
||||
# on Sun, 02 Apr 2023
|
||||
# Some modifications made by hand
|
||||
|
||||
set -g status-justify "left"
|
||||
set -g status "on"
|
||||
set -g status-left-style "none"
|
||||
set -g message-command-style "fg=#a89984,bg=#504945"
|
||||
set -g status-right-style "none"
|
||||
set -g pane-active-border-style "fg=#504945"
|
||||
set -g status-style "none,bg=#32302f"
|
||||
set -g message-style "fg=#a89984,bg=#504945"
|
||||
set -g pane-border-style "fg=#32302f"
|
||||
set -g status-right-length "100"
|
||||
set -g status-left-length "100"
|
||||
setw -g window-status-activity-style "none"
|
||||
setw -g window-status-separator ""
|
||||
setw -g window-status-style "none,fg=#928374,bg=#32302f"
|
||||
set -g status-left "#[fg=#928374,bg=#32302f] #S #[fg=#32302f,bg=#32302f,nobold,nounderscore,noitalics]"
|
||||
set -g status-right "#[fg=#32302f,bg=#32302f,nobold,nounderscore,noitalics]#[fg=#928374,bg=#32302f] %Y-%m-%d %H:%M #[fg=#32302f,bg=#32302f,nobold,nounderscore,noitalics]#[fg=#928374,bg=#32302f] #h "
|
||||
setw -g window-status-format "#[fg=#928374,bg=#32302f] #I )#[fg=#928374,bg=#32302f] #W "
|
||||
setw -g window-status-current-format "#[fg=#32302f,bg=#504945,nobold,nounderscore,noitalics]#[fg=#a89984,bg=#504945] #I #[fg=#a89984,bg=#504945] #W #[fg=#504945,bg=#32302f,nobold,nounderscore,noitalics]"
|
22
modules/home/programs/k9s/default.nix
Normal file
22
modules/home/programs/k9s/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
namespace,
|
||||
...
|
||||
}: let
|
||||
cfg = config.${namespace}.programs.k9s;
|
||||
in {
|
||||
options.${namespace}.programs.k9s = {
|
||||
enable = lib.mkEnableOption "k9s";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.k9s = {
|
||||
enable = true;
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
transparent = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -16,6 +16,7 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
catppuccin.enable = true;
|
||||
font = {
|
||||
size = 12;
|
||||
package = pkgs.nerdfonts.override {fonts = ["Hack"];};
|
||||
|
|
|
@ -18,7 +18,7 @@ in {
|
|||
enable = true;
|
||||
# TODO: How to ensure this font is installed?
|
||||
font = "Hack Nerd Font 10";
|
||||
theme = "gruvbox-dark-hard";
|
||||
catppuccin.enable = true;
|
||||
plugins = [pkgs.rofi-emoji];
|
||||
extraConfig = {
|
||||
show-icons = true;
|
||||
|
|
|
@ -15,9 +15,7 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
programs.swaylock = {
|
||||
enable = true;
|
||||
settings = {
|
||||
image = "${config.xdg.dataHome}/${config.${namespace}.windowManagers.sway.wallpaperPath}";
|
||||
};
|
||||
catppuccin.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@ in {
|
|||
settings = {
|
||||
widgets = ["title" "dnd" "notifications" "mpris"];
|
||||
};
|
||||
style = builtins.readFile "${pkgs.aa.catppuccin-swaync}/catppuccin.css";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -36,6 +36,7 @@ in {
|
|||
programs.git = {
|
||||
delta = {
|
||||
enable = true;
|
||||
catppuccin.enable = true;
|
||||
options = {
|
||||
line-numbers = true;
|
||||
navigate = true;
|
||||
|
@ -86,6 +87,7 @@ in {
|
|||
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
catppuccin.enable = true;
|
||||
settings = {
|
||||
quitOnTopLevelReturn = true;
|
||||
gui.nerdFontsVersion = "3";
|
||||
|
|
|
@ -23,7 +23,6 @@ in {
|
|||
export EDITOR=nvim
|
||||
'';
|
||||
initExtra = ''
|
||||
base16_darktooth
|
||||
bindkey -v
|
||||
bindkey '^A' beginning-of-line
|
||||
bindkey '^E' end-of-line
|
||||
|
@ -48,11 +47,6 @@ in {
|
|||
src = lib.cleanSource ./.;
|
||||
file = "p10k.zsh";
|
||||
}
|
||||
{
|
||||
name = "base16-shell";
|
||||
src = inputs.base16-shell;
|
||||
file = "base16-shell.plugin.zsh";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -65,11 +65,17 @@ in {
|
|||
xdg-utils
|
||||
];
|
||||
|
||||
home.pointerCursor = {
|
||||
package = pkgs.catppuccin-cursors.mochaDark;
|
||||
name = "catppuccin-mocha-dark-cursors";
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
catppuccin.pointerCursor = {
|
||||
enable = true;
|
||||
accent = "dark";
|
||||
};
|
||||
gtk.catppuccin = {
|
||||
enable = true;
|
||||
icon.enable = true;
|
||||
};
|
||||
qt.style.catppuccin = {
|
||||
enable = true;
|
||||
apply = true;
|
||||
};
|
||||
|
||||
# For screen sharing to work
|
||||
|
@ -86,6 +92,7 @@ in {
|
|||
checkConfig = false;
|
||||
|
||||
enable = true;
|
||||
catppuccin.enable = true;
|
||||
swaynag.enable = true;
|
||||
wrapperFeatures.gtk = true; # so that gtk works properly
|
||||
systemd.enable = true; # needed this for screen sharing to work
|
||||
|
@ -94,27 +101,43 @@ in {
|
|||
inherit terminal menu left right up down modifier;
|
||||
workspaceAutoBackAndForth = true;
|
||||
|
||||
# Use catppuccin colors
|
||||
colors = {
|
||||
background = "$base";
|
||||
focused = {
|
||||
border = "#2B3C44";
|
||||
background = "#4E3D45";
|
||||
text = "#FFFFFF";
|
||||
indicator = "#333333";
|
||||
childBorder = "#000000";
|
||||
border = "$lavender";
|
||||
background = "$base";
|
||||
text = "$text";
|
||||
indicator = "$rosewater";
|
||||
childBorder = "$lavender";
|
||||
};
|
||||
focusedInactive = {
|
||||
border = "#484848";
|
||||
background = "#333333";
|
||||
text = "#FFFFFF";
|
||||
indicator = "#000000";
|
||||
childBorder = "#000000";
|
||||
border = "$overlay0";
|
||||
background = "$base";
|
||||
text = "$text";
|
||||
indicator = "$rosewater";
|
||||
childBorder = "$overlay0";
|
||||
};
|
||||
unfocused = {
|
||||
border = "#484848";
|
||||
background = "#333333";
|
||||
text = "#FFFFFF";
|
||||
indicator = "#000000";
|
||||
childBorder = "#000000";
|
||||
border = "$overlay0";
|
||||
background = "$base";
|
||||
text = "$text";
|
||||
indicator = "$rosewater";
|
||||
childBorder = "$overlay0";
|
||||
};
|
||||
urgent = {
|
||||
border = "$peach";
|
||||
background = "$base";
|
||||
text = "$peach";
|
||||
indicator = "$overlay0";
|
||||
childBorder = "$peach";
|
||||
};
|
||||
placeholder = {
|
||||
border = "$overlay0";
|
||||
background = "$base";
|
||||
text = "$text";
|
||||
indicator = "$overlay0";
|
||||
childBorder = "$overlay0";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue