This commit is contained in:
2025-05-08 09:06:55 -04:00
parent 115e297e06
commit a033cda5da
16 changed files with 835 additions and 208 deletions

View File

@@ -11,6 +11,7 @@ inputs,
settings = {
monitor = [
"eDP-1,1920x1080@60,0x0,1.00"
"Virtual-1,1920x1080@60,0x0,1.00"
];
exec-once = [
"waybar"

View File

@@ -1,37 +1,38 @@
set $rosewater #f5e0dc
set $flamingo #f2cdcd
set $pink #f5c2e7
set $mauve #cba6f7
set $red #f38ba8
set $maroon #eba0ac
set $peach #fab387
set $yellow #f9e2af
set $green #a6e3a1
set $teal #94e2d5
set $sky #89dceb
set $sapphire #74c7ec
set $blue #89b4fa
set $lavender #b4befe
set $text #cdd6f4
set $subtext1 #bac2de
set $subtext0 #a6adc8
set $overlay2 #9399b2
set $overlay1 #7f849c
set $overlay0 #6c7086
set $surface2 #585b70
set $surface1 #45475a
set $surface0 #313244
set $base #1e1e2e
set $mantle #181825
set $crust #11111b
# set $rosewater #f5e0dc
# set $flamingo #f2cdcd
# set $pink #f5c2e7
# set $mauve #cba6f7
# set $red #f38ba8
# set $maroon #eba0ac
# set $peach #fab387
# set $yellow #f9e2af
# set $green #a6e3a1
# set $teal #94e2d5
# set $sky #89dceb
# set $sapphire #74c7ec
# set $blue #89b4fa
# set $lavender #b4befe
# set $text #cdd6f4
# set $subtext1 #bac2de
# set $subtext0 #a6adc8
# set $overlay2 #9399b2
# set $overlay1 #7f849c
# set $overlay0 #6c7086
# set $surface2 #585b70
# set $surface1 #45475a
# set $surface0 #313244
# set $base #1e1e2e
# set $mantle #181825
# set $crust #11111b
#
# # target title bg text indicator border
# client.focused $lavender $base $text $rosewater $lavender
# client.focused_inactive $overlay0 $base $text $rosewater $overlay0
# client.unfocused $overlay0 $base $text $rosewater $overlay0
# client.urgent $peach $base $peach $overlay0 $peach
# client.placeholder $overlay0 $base $text $overlay0 $overlay0
# client.background $base
# target title bg text indicator border
client.focused $lavender $base $text $rosewater $lavender
client.focused_inactive $overlay0 $base $text $rosewater $overlay0
client.unfocused $overlay0 $base $text $rosewater $overlay0
client.urgent $peach $base $peach $overlay0 $peach
client.placeholder $overlay0 $base $text $overlay0 $overlay0
client.background $base
# This file has been auto-generated by i3-config-wizard(1).
# It will not be overwritten, so edit it as you like.
#
@@ -221,24 +222,24 @@ bindsym $mod+r mode "resize"
# finds out, if available)
bar {
status_command i3status
colors {
background $base
statusline $text
focused_statusline $text
active_workspace $base $text $blue
focused_separator $base
focused_workspace $base $base $green
active_workspace $base $base $blue
inactive_workspace $base $base $surface1
urgent_workspace $base $base $surface1
binding_mode $base $base $surface1
}
# colors {
# background $base
# statusline $text
# focused_statusline $text
# active_workspace $base $text $blue
# focused_separator $base
# focused_workspace $base $base $green
# active_workspace $base $base $blue
# inactive_workspace $base $base $surface1
# urgent_workspace $base $base $surface1
# binding_mode $base $base $surface1
# }
}
# Gaps
for_window [class="^.*"] border pixel 2
gaps inner 10
gaps outer -2
gaps inner 0
gaps outer 0
hide_edge_borders both
# wallpaper

View File

@@ -10,9 +10,9 @@
# size = 12;
# };
font = {
name = "JetBrainsMono Nerd Font Mono";
# name = "JetBrainsMono Nerd Font Mono";
size = 12;
package = pkgs.nerd-fonts.jetbrains-mono;
# package = pkgs.nerd-fonts.jetbrains-mono;
};
shellIntegration = {
enableZshIntegration = true;
@@ -26,86 +26,86 @@
# background_blur = 5;
hide_window_decorations = "titlebar-only";
};
extraConfig = ''
# vim:ft=kitty
## name: Gruber-dark
## author: ring0-rootkit
## license: MIT
## upstream: https://github.com/ring0-rootkit/gruber-darker-kitty/blob/main/gruber.conf
# The basic colors
foreground #e4e4e4
background #181818
selection_foreground #181818
selection_background #F5F5F5
# Cursor colors
cursor #FFDD33
cursor_text_color #000000
# URL underline color when hovering with mouse
url_color #FF4F58
# Kitty window border colors
active_border_color #96A6C8
inactive_border_color #565F73
bell_border_color #C73C3F
# OS Window titlebar colors
wayland_titlebar_color #181818
macos_titlebar_color #181818
# Tab bar colors
active_tab_foreground #101010
active_tab_background #F43841
inactive_tab_foreground #E4E4E4
inactive_tab_background #282828
tab_bar_background #101010
# Colors for marks (marked text in the terminal)
mark1_foreground #181818
mark1_background #96A6C8
mark2_foreground #181818
mark2_background #F43841
mark3_foreground #181818
mark3_background #73D936
# The 16 terminal colors
# black
color0 #101010
color8 #453D41
# red
color1 #F43841
color9 #F43841
# green
color2 #73D936
color10 #73D936
# yellow
color3 #FFDD33
color11 #FFDD33
# blue
color4 #96A6C8
color12 #96A6C8
# magenta
color5 #9E95C7
color13 #9E95C7
# cyan
color6 #95A99F
color14 #95A99F
# white
color7 #E4E4E4
color15 #FFFFFF
'';
# extraConfig = ''
# # vim:ft=kitty
#
# ## name: Gruber-dark
# ## author: ring0-rootkit
# ## license: MIT
# ## upstream: https://github.com/ring0-rootkit/gruber-darker-kitty/blob/main/gruber.conf
#
#
#
# # The basic colors
# foreground #e4e4e4
# background #181818
# selection_foreground #181818
# selection_background #F5F5F5
#
# # Cursor colors
# cursor #FFDD33
# cursor_text_color #000000
#
# # URL underline color when hovering with mouse
# url_color #FF4F58
#
# # Kitty window border colors
# active_border_color #96A6C8
# inactive_border_color #565F73
# bell_border_color #C73C3F
#
# # OS Window titlebar colors
# wayland_titlebar_color #181818
# macos_titlebar_color #181818
#
# # Tab bar colors
# active_tab_foreground #101010
# active_tab_background #F43841
# inactive_tab_foreground #E4E4E4
# inactive_tab_background #282828
# tab_bar_background #101010
#
# # Colors for marks (marked text in the terminal)
# mark1_foreground #181818
# mark1_background #96A6C8
# mark2_foreground #181818
# mark2_background #F43841
# mark3_foreground #181818
# mark3_background #73D936
#
# # The 16 terminal colors
#
# # black
# color0 #101010
# color8 #453D41
#
# # red
# color1 #F43841
# color9 #F43841
#
# # green
# color2 #73D936
# color10 #73D936
#
# # yellow
# color3 #FFDD33
# color11 #FFDD33
#
# # blue
# color4 #96A6C8
# color12 #96A6C8
#
# # magenta
# color5 #9E95C7
# color13 #9E95C7
#
# # cyan
# color6 #95A99F
# color14 #95A99F
#
# # white
# color7 #E4E4E4
# color15 #FFFFFF
# '';
};
}

View File

@@ -65,6 +65,7 @@ in {
vim-sleuth
oil-nvim
plenary-nvim
vim-tmux-navigator
];
};

View File

@@ -123,7 +123,7 @@ vim.keymap.set({'n', 'v', 'x'}, '<leader>p', '"+p', { noremap = true, silent = t
vim.keymap.set('i', '<C-p>', '<C-r><C-p>+', { noremap = true, silent = true, desc = 'Paste from clipboard from within insert mode' })
vim.keymap.set("x", "<leader>P", '"_dP', { noremap = true, silent = true, desc = 'Paste over selection without erasing unnamed register' })
vim.cmd.colorscheme('gruber-darker')
vim.cmd.colorscheme('gruvbox')
require("oil").setup()
vim.keymap.set("n", "<leader>fe", "<cmd>Oil<CR>", { desc = 'Oil' })

View File

@@ -0,0 +1,37 @@
{
inputs,
pkgs,
config,
lib,
...
}: {
imports = [
inputs.stylix.homeManagerModules.stylix
];
stylix = {
enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
fonts = {
serif = {
package = pkgs.inter;
name = "Inter";
};
sansSerif = {
package = pkgs.inter;
name = "Inter";
};
monospace = {
package = pkgs.nerd-fonts.jetbrains-mono;
name = "JetBrainsMono Nerd Font Mono";
};
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
};
};
}

View File

@@ -14,8 +14,13 @@ lib,
terminal = "kitty";
startup = [
# Launch Firefox on start
{command = "firefox";}
{command = "kitty";}
];
output = {
"Virtual-1" = {
mode = "1920x1080@60Hz";
};
};
};
};

View File

@@ -8,21 +8,14 @@
extraConfig = ''
return {
-- color_scheme = 'Ayu Dark (Gogh)',
font = wezterm.font('JetBrainsMono Nerd Font'),
font_size = 16,
-- font = wezterm.font('JetBrainsMono Nerd Font'),
font_size = 12,
use_fancy_tab_bar = false,
native_macos_fullscreen_mode = false,
enable_scroll_bar = false,
window_decorations = "RESIZE",
enable_kitty_graphics = true,
hide_tab_bar_if_only_one_tab = true,
keys = {
{
key = 'n',
mods = 'CMD|SHIFT',
action = wezterm.action.ToggleFullScreen,
},
},
window_padding = {
left = 0,
right = 0,
@@ -33,24 +26,6 @@
macos_window_background_blur = 0,
front_end = "WebGpu",
force_reverse_video_cursor = true,
colors = {
foreground = "#dcd7ba",
background = "#1f1f28",
cursor_bg = "#c8c093",
cursor_fg = "#c8c093",
cursor_border = "#c8c093",
selection_fg = "#c8c093",
selection_bg = "#2d4f67",
scrollbar_thumb = "#16161d",
split = "#16161d",
ansi = { "#090618", "#c34043", "#76946a", "#c0a36e", "#7e9cd8", "#957fb8", "#6a9589", "#c8c093" },
brights = { "#727169", "#e82424", "#98bb6c", "#e6c384", "#7fb4ca", "#938aa9", "#7aa89f", "#dcd7ba" },
indexed = { [16] = "#ffa066", [17] = "#ff5d62" },
},
}
'';
};

View File

@@ -1,9 +1,9 @@
local wezterm = require 'wezterm'
return {
color_scheme = 'catppuccin-frappe',
-- color_scheme = 'catppuccin-frappe',
font = wezterm.font('PragmataPro Liga'),
font_size = 16,
font_size = 14,
use_fancy_tab_bar = false,
native_macos_fullscreen_mode = false,
enable_scroll_bar = false,