diff --git a/buildfiles/st/config.h b/buildfiles/st/config.h index 4ca6104..6efafda 100644 --- a/buildfiles/st/config.h +++ b/buildfiles/st/config.h @@ -96,42 +96,39 @@ unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ - "#313131", - "#e5786c", - "#94e453", - "#cbe784", - "#88b8f6", - "#d685ff", - "#88dbf6", - "#e3e0d7", + "#45475A", + "#F38BA8", + "#A6E3A1", + "#F9E2AF", + "#89B4FA", + "#F5C2E7", + "#94E2D5", + "#BAC2DE", /* 8 bright colors */ - "#313131", - "#e5786c", - "#94e453", - "#cbe784", - "#88b8f6", - "#d685ff", - "#88dbf6", - "#e3e0d7", + "#585B70", + "#F38BA8", + "#A6E3A1", + "#F9E2AF", + "#89B4FA", + "#F5C2E7", + "#94E2D5", + "#A6ADC8", - [255] = 0, +[256] = "#CDD6F4", /* default foreground colour */ +[257] = "#1E1E2E", /* default background colour */ +[258] = "#F5E0DC", /*575268*/ - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", - "#141414", }; /* - * Default colors (colorname index) * foreground, background, cursor, reverse cursor */ -unsigned int defaultfg = 7; -unsigned int defaultbg = 258; -unsigned int defaultcs = 256; -static unsigned int defaultrcs = 257; +unsigned int defaultfg = 256; +unsigned int defaultbg = 257; +unsigned int defaultcs = 258; +static unsigned int defaultrcs = 258; /* * Default shape of cursor diff --git a/dunst/dunstrc b/dunst/dunstrc index bccd2b1..015bf88 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -1,6 +1,21 @@ [global] - width = (100, 600) - offset = 50x50 - frame_color = "#00ff00" - font = Monospace 18 - corner_radius = 15 +width = (100, 600) +offset = 50x50 +corner_radius = 15 +font = Monospace 18 + +frame_color = "#89B4FA" +separator_color= frame + +[urgency_low] +background = "#1E1E2E" +foreground = "#CDD6F4" + +[urgency_normal] +background = "#1E1E2E" +foreground = "#CDD6F4" + +[urgency_critical] +background = "#1E1E2E" +foreground = "#CDD6F4" +frame_color = "#FAB387" diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart index d82479a..f862813 100755 --- a/herbstluftwm/autostart +++ b/herbstluftwm/autostart @@ -17,8 +17,8 @@ if hc silent new_attr bool my_picom_is_running; then fi hc lock -xsetroot -solid "#080808" -cursor_name left_ptr & -feh --bg-fill ~/.config/herbstluftwm/wallpaper.jpg +xsetroot -solid "#1e1e2e" -cursor_name left_ptr & +feh --bg-fill ~/.config/herbstluftwm/wallpaper.png xobpipe="$XDG_RUNTIME_DIR/xobpipe" # theme @@ -27,15 +27,15 @@ hc attr theme.floating.reset 1 hc set always_show_frame on hc set frame_bg_transparent off -hc attr theme.active.color '#95e454' -hc attr theme.normal.color '#88b8f6' -hc attr theme.urgent.color '#e5796d' +hc attr theme.active.color '#a6e3a1' +hc attr theme.normal.color '#89b4fa' +hc attr theme.urgent.color '#f38ba8' hc attr theme.inner_color black hc attr theme.border_width 1 hc attr theme.floating.border_width 2 hc attr theme.floating.outer_width 1 hc attr theme.floating.outer_color black -hc attr theme.background_color '#080808' +hc attr theme.background_color '#1e1e2e' hc set window_gap 0 hc set frame_padding 0 diff --git a/herbstluftwm/panel.sh b/herbstluftwm/panel.sh index 4d563d4..2660558 100755 --- a/herbstluftwm/panel.sh +++ b/herbstluftwm/panel.sh @@ -11,19 +11,19 @@ done { sleep 1; exec trayer --SetPartialStrut false --edge top --height 20 --widthtype request --align right --tint 0x080808 --transparent true --alpha 0; } & -fggreen='%{F#95e454}' -fgblue='%{F#88b8f6}' -fgred='%{F#e5796d}' -fgdark='%{F#080808}' +fggreen='%{F#a6e3a1}' +fgblue='%{F#89b4fa}' +fgred='%{F#f38ba8}' +fgdark='%{F#313244}' fgend='%{F-}' -bggreen='%{B#95e454}' -bgblue='%{B#88b8f6}' -bgred='%{B#e5796d}' -bglight='%{B#333333}' +bggreen='%{B#a6e3a1}' +bgblue='%{B#89b4fa}' +bgred='%{B#f38ba8}' +bglight='%{B#313244}' bgend='%{B-}' -ulblue='%{U#88b8f6+u}' +ulblue='%{U#89b4fa+u}' ulend='%{-u}' handle_signal() { @@ -65,7 +65,7 @@ fi done < "$msgfifo" } & -tail -f "$fifo" | stdbuf -oL lemonbar -d -p -a 100 -g "x${panel_height}" -f "Drafting* Mono:pixelsize=18:antialias=true" -f "Unifont:pixelsize=18:antialias=true" -B "#080808" -F "#e3e0d7" > "$msgfifo" & +tail -f "$fifo" | stdbuf -oL lemonbar -d -p -a 100 -g "x${panel_height}" -f "Drafting* Mono:pixelsize=18:antialias=true" -f "Unifont:pixelsize=18:antialias=true" -B "#11111b" -F "#cdd6f4" > "$msgfifo" & append_segment() { local seconds=$1 diff --git a/herbstluftwm/wallpaper.png b/herbstluftwm/wallpaper.png new file mode 100644 index 0000000..a4a217c Binary files /dev/null and b/herbstluftwm/wallpaper.png differ diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua index bb48ded..8864205 100644 --- a/nvim/lua/config.lua +++ b/nvim/lua/config.lua @@ -1,5 +1,4 @@ vim.o.termguicolors = true -vim.cmd('colo wormbait') vim.g.mapleader = ',' diff --git a/nvim/lua/plugins-conf.lua b/nvim/lua/plugins-conf.lua index b6f38e3..a03b195 100644 --- a/nvim/lua/plugins-conf.lua +++ b/nvim/lua/plugins-conf.lua @@ -7,6 +7,11 @@ local lspatt = function(_, bufnr) vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') end +-- color scheme setup +vim.g.catppuccin_flavour = 'mocha' +require('catppuccin').setup() +vim.cmd [[colorscheme catppuccin]] + -- replace built in selector with telescope require('telescope').setup { extensions = { @@ -154,7 +159,7 @@ lsp.arduino_language_server.setup { -- status line setup require'lualine'.setup { options = { - theme = 'wombat', + theme = 'catppuccin', component_separators = { left = '', right = '' }, section_separators = { left = '', right = '' }, }, diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index ede4864..2f844db 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -3,7 +3,10 @@ return require('packer').startup(function() use 'wbthomason/packer.nvim' -- plugin manager use 'rktjmp/lush.nvim' - use 'https://code.sitosis.com/rudism/wormbait.nvim.git' -- color scheme + use { -- color scheme + 'catppuccin/nvim', + as = 'cattppuccin' + } use 'hoob3rt/lualine.nvim' -- status line use { -- file picker and grepper 'nvim-telescope/telescope.nvim', diff --git a/rofi/config.rasi b/rofi/config.rasi index e868acc..87d7938 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -1,4 +1,17 @@ -configuration { - font: "monospace 12"; +configuration{ + modi: "run,drun,window"; + icon-theme: "Oranchelo"; + show-icons: true; + terminal: "st"; + drun-display-format: "{icon} {name}"; + location: 0; + disable-history: false; + hide-scrollbar: true; + display-drun: "  Apps "; + display-run: "  Run "; + display-window: " 﩯 Window"; + display-Network: " 󰤨 Network"; + sidebar-mode: true; } -@theme "/usr/share/rofi/themes/Arc-Dark.rasi" + +@theme "catppuccin-mocha" diff --git a/rofi/dot-local-share-rofi-themes/catppuccin-mocha.rasi b/rofi/dot-local-share-rofi-themes/catppuccin-mocha.rasi new file mode 100644 index 0000000..7324c84 --- /dev/null +++ b/rofi/dot-local-share-rofi-themes/catppuccin-mocha.rasi @@ -0,0 +1,104 @@ +* { + bg-col: #1e1e2e; + bg-col-light: #1e1e2e; + border-col: #1e1e2e; + selected-col: #1e1e2e; + blue: #89b4fa; + fg-col: #cdd6f4; + fg-col2: #f38ba8; + grey: #6c7086; + + width: 600; + font: "monospace 14"; +} + +element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; +} + +window { + height: 360px; + border: 3px; + border-color: @border-col; + background-color: @bg-col; +} + +mainbox { + background-color: @bg-col; +} + +inputbar { + children: [prompt,entry]; + background-color: @bg-col; + border-radius: 5px; + padding: 2px; +} + +prompt { + background-color: @blue; + padding: 6px; + text-color: @bg-col; + border-radius: 3px; + margin: 20px 0px 0px 20px; +} + +textbox { + padding: 20px 20px 0 20px; + text-color: @fg-col; + background-color: @bg-col; +} + +textbox-prompt-colon { + expand: false; + str: ":"; +} + +entry { + padding: 6px; + margin: 20px 0px 0px 10px; + text-color: @fg-col; + background-color: @bg-col; +} + +listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 20px; + columns: 1; + lines: 5; + background-color: @bg-col; +} + +element { + padding: 5px; + background-color: @bg-col; + text-color: @fg-col ; +} + +element-icon { + size: 25px; +} + +element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; +} + +mode-switcher { + spacing: 0; + } + +button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; +} + +button selected { + background-color: @bg-col; + text-color: @blue; +} + diff --git a/xorg/gtk-3.0/bookmarks b/xorg/gtk-3.0/bookmarks deleted file mode 100644 index 110d36e..0000000 --- a/xorg/gtk-3.0/bookmarks +++ /dev/null @@ -1 +0,0 @@ -file:///home/rudism/mri/_notes diff --git a/xorg/gtk-3.0/settings.ini b/xorg/gtk-3.0/settings.ini index 0058a2a..c49399a 100644 --- a/xorg/gtk-3.0/settings.ini +++ b/xorg/gtk-3.0/settings.ini @@ -1,4 +1,16 @@ [Settings] -gtk-icon-theme-name = Arc-Dark -gtk-theme-name = Arc-Dark -gtk-application-prefer-dark-theme = true +gtk-icon-theme-name=Catppuccin-Mocha-Dark-Cursors +gtk-theme-name=Catppuccin-Mocha +gtk-application-prefer-dark-theme=0 +gtk-font-name=Sans 10 +gtk-cursor-theme-name=Catppuccin-Mocha-Dark-Cursors +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=0 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintmedium