diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 09ca1bd..1748202 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -30,7 +30,7 @@ gsettings set org.gnome.desktop.interface cursor-size 24 # source = ~/.config/hypr/myColors.conf # Set programs that you use -$terminal = alacritty +$terminal = kitty $fileManager = nemo $menu = wofi -a --show drun --allow-images @@ -58,8 +58,8 @@ input { general { # See https://wiki.hyprland.org/Configuring/Variables/ for more - gaps_in = 2 - gaps_out = 5 + gaps_in = 3 + gaps_out = 6 border_size = 2 # col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg # col.inactive_border = rgba(595959aa) diff --git a/kitty/kitty-themes/themes/gruvbox_dark.conf b/kitty/kitty-themes/themes/gruvbox_dark.conf new file mode 100644 index 0000000..369da8d --- /dev/null +++ b/kitty/kitty-themes/themes/gruvbox_dark.conf @@ -0,0 +1,49 @@ +# gruvbox dark by morhetz, https://github.com/morhetz/gruvbox +# This work is licensed under the terms of the MIT license. +# For a copy, see https://opensource.org/licenses/MIT. + +background #282828 +foreground #ebdbb2 + +cursor #928374 + +selection_foreground #928374 +selection_background #3c3836 + +color0 #282828 +color8 #928374 + +# red +color1 #cc241d +# light red +color9 #fb4934 + +# green +color2 #98971a +# light green +color10 #b8bb26 + +# yellow +color3 #d79921 +# light yellow +color11 #fabd2d + +# blue +color4 #458588 +# light blue +color12 #83a598 + +# magenta +color5 #b16286 +# light magenta +color13 #d3869b + +# cyan +color6 #689d6a +# lighy cyan +color14 #8ec07c + +# light gray +color7 #a89984 +# dark gray +color15 #928374 diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 37e1ab7..54f0222 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,17 +1,23 @@ include ./theme.conf -font_family JetBrains Mono Light -font_size 10 + +font_family PragmataPro Mono Liga +bold_font PragmataPro Mono Liga Bold +italic_font PragmataPro Mono Liga Italic +bold_italic_font PragmataPro Mono Liga Bold Italic +font_size 12 clipboard_control write-clipboard write-primary read-clipboard-ask read-primary-ask -window_padding_width 12 +window_padding_width 5 remember_window_size no -hide_window_decorations no -wayland_titlebar_color background -enabled_layouts vertical -tab_bar_style slant -tab_bar_edge top -active_tab_foreground #2f7e25 -active_tab_background #112616 -active_tab_font_style bold -inactive_tab_foreground #637d75 -inactive_tab_background #000e07 -inactive_tab_font_style normal + +# hide_window_decorations no +# wayland_titlebar_color background +# enabled_layouts vertical +# tab_bar_style slant +# tab_bar_edge top +# active_tab_foreground #2f7e25 +# active_tab_background #112616 +# active_tab_font_style bold +# inactive_tab_foreground #637d75 +# inactive_tab_background #000e07 +# inactive_tab_font_style normal + diff --git a/kitty/theme.conf b/kitty/theme.conf new file mode 120000 index 0000000..6a6dc64 --- /dev/null +++ b/kitty/theme.conf @@ -0,0 +1 @@ +/home/thomas/dotfiles/kitty/kitty-themes/themes/gruvbox_dark.conf \ No newline at end of file diff --git a/nvim/lua/thomas/core/colourscheme.lua b/nvim/lua/thomas/core/colourscheme.lua index a000d4b..2f4cda5 100644 --- a/nvim/lua/thomas/core/colourscheme.lua +++ b/nvim/lua/thomas/core/colourscheme.lua @@ -11,16 +11,11 @@ local function update_hl(group, tbl) vim.api.nvim_set_hl(0, group, new_hl) end -update_hl("Function", { bold = false }) --- update_hl("Comment", { italic = true }) +-- update_hl("Function", { bold = true }) +update_hl("Comment", { italic = true }) update_hl("markdownH1", { bold = true }) update_hl("markdownH2", { bold = true }) update_hl("markdownH3", { bold = true }) update_hl("markdownH4", { bold = true }) update_hl("markdownH5", { bold = true }) - -vim.cmd("highlight String guifg='#8ec07c'") - -vim.g.gruvbox_material_background = "dark" -vim.g.gruvbox_material_better_performance = 1 diff --git a/nvim/lua/thomas/core/options.lua b/nvim/lua/thomas/core/options.lua index dc38526..cec7d59 100644 --- a/nvim/lua/thomas/core/options.lua +++ b/nvim/lua/thomas/core/options.lua @@ -1,4 +1,5 @@ -vim.g.onedark_terminal_italics = 1 +-- vim.g.onedark_terminal_italics = 1 +-- vim.g.gruvbox_material_enable_italic = 1 local opt = vim.opt opt.number = true @@ -26,3 +27,5 @@ opt.termguicolors = true opt.wrap = false opt.formatoptions = "cro" opt.backspace = "indent,eol,start" + +-- vim.g.gruvbox_material_enable_bold = 1 diff --git a/tmux/tmux.conf b/tmux/tmux.conf index c23421d..3db8ea0 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -1,4 +1,4 @@ -set -g default-terminal "screen-256color" +# set -g default-terminal "screen-256color" #set -ga terminal-overrides ",*256col*:Tc" set -g terminal-overrides ",alacritty:Tc"