updates
This commit is contained in:
parent
0085880ef0
commit
92bec8a741
SSH key fingerprint:
SHA256:odOD9vln9U7qNe1R8o3UCbE3jkQCkr5/q5mgd5hwua0
14 changed files with 86 additions and 182 deletions
|
|
@ -1,5 +1,6 @@
|
|||
#include ".Xresources.d/catppuccin-dark"
|
||||
!#include ".Xresources.d/gruvbox-dark"
|
||||
!#include ".Xresources.d/gruvbox-light"
|
||||
#include ".Xresources.d/gruvbox-material-dark"
|
||||
|
||||
Xcursor.size: 14
|
||||
|
||||
st.alpha: 0.95
|
||||
st.font: Roboto Mono Nerd Font Mono:style=Regular:pixelsize=18:antialias=true:autohint=true
|
||||
|
|
|
|||
22
.Xresources.d/catppuccin-light
Normal file
22
.Xresources.d/catppuccin-light
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
*.background: #EFF1F5
|
||||
*.foreground: #4C4F69
|
||||
|
||||
*.cursorColor: #4C4F69
|
||||
*.color0: #5C5F77
|
||||
*.color8: #6C6F85
|
||||
*.color1: #D20F39
|
||||
*.color9: #D20F39
|
||||
*.color2: #40A02B
|
||||
*.color10: #40A02B
|
||||
*.color3: #DF8E1D
|
||||
*.color11: #DF8E1D
|
||||
*.color4: #1E66F5
|
||||
*.color12: #1E66F5
|
||||
*.color5: #EA76CB
|
||||
*.color13: #EA76CB
|
||||
*.color6: #179299
|
||||
*.color14: #179299
|
||||
*.color7: #ACB0BE
|
||||
*.color15: #BCC0CC
|
||||
|
||||
i3wm.border: #4C4F69
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
*.foreground: #D4BE98
|
||||
|
||||
*.cursorColor: #D4BE98
|
||||
*.color0: #32302F
|
||||
*.color8: #32302F
|
||||
*.color1: #EA6962
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
*.foreground: #654735
|
||||
|
||||
*.cursorColor: #654735
|
||||
*.color0: #FBF1C7
|
||||
*.color8: #FBF1C7
|
||||
*.color1: #C14A4A
|
||||
|
|
@ -22,4 +23,4 @@
|
|||
*.color7: #654735
|
||||
*.color15: #654735
|
||||
|
||||
i3wm.border: #F3EAC7
|
||||
i3wm.border: #654735
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[global]
|
||||
frame_color = "#D4BE98"
|
||||
background = "#282828"
|
||||
background = "#1D2021"
|
||||
foreground = "#D4BE98"
|
||||
separator_color= frame
|
||||
width = (200,370)
|
||||
offset = 3x35
|
||||
width = (200,370)
|
||||
height = 350
|
||||
font = Roboto Mono Nerd Font 9
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ set $mod2 Mod4
|
|||
set $browser firefox
|
||||
set $terminal st
|
||||
set $theme_selector $HOME/.local/share/scripts/theme-selector.sh
|
||||
set $monitor_script $HOME/.local/share/scripts/monitor.sh
|
||||
|
||||
# Font for window titles. Will also be used by the bar unless a different font
|
||||
# is used in the bar {} block below.
|
||||
|
|
@ -85,6 +86,9 @@ bindsym $mod+p exec --no-startup-id $HOME/.config/rofi/applets/bin/powermenu.sh
|
|||
# theme selector
|
||||
bindsym $mod+Shift+t exec --no-startup-id $theme_selector
|
||||
|
||||
# monitor
|
||||
bindsym $mod+m exec --no-startup-id $monitor_script
|
||||
|
||||
# launch a browser
|
||||
bindsym $mod+b exec --no-startup-id $browser
|
||||
# change focus
|
||||
|
|
@ -120,6 +124,9 @@ bindsym $mod+v split v
|
|||
# enter fullscreen mode for the focused container
|
||||
bindsym $mod+f fullscreen toggle
|
||||
|
||||
# toggle sticky floating windows
|
||||
bindsym $mod+Shift+s sticky toggle
|
||||
|
||||
# change container layout (stacked, tabbed, toggle split)
|
||||
bindsym $mod+s layout stacking
|
||||
bindsym $mod+t layout tabbed
|
||||
|
|
@ -218,7 +225,7 @@ assign [class="thunderbird"] 7
|
|||
|
||||
# startup programs
|
||||
# sets up monitors and picom
|
||||
exec_always --no-startup-id ~/.local/share/scripts/monitor.sh
|
||||
exec --no-startup-id $monitor_script
|
||||
exec --no-startup-id nextcloud
|
||||
exec --no-startup-id nitrogen --restore
|
||||
exec --no-startup-id i3-msg 'workspace 1; exec $terminal'
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ return {
|
|||
json = { "prettierd" },
|
||||
yaml = { "prettierd" },
|
||||
markdown = { "prettierd" },
|
||||
}
|
||||
},
|
||||
})
|
||||
-- vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
-- pattern = "*",
|
||||
|
|
@ -30,5 +30,5 @@ return {
|
|||
-- }),
|
||||
-- }
|
||||
-- })
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -245,6 +245,7 @@ return {
|
|||
lspconfig.hls.setup({
|
||||
settings = {
|
||||
haskell = {
|
||||
formattingProvider = "fourmolu",
|
||||
plugin = {
|
||||
stan = { globalOn = false },
|
||||
hlint = { config = { flags = { "--ignore=Eta reduce" } } },
|
||||
|
|
|
|||
|
|
@ -10,102 +10,16 @@ transition-pow-w = 0.1
|
|||
transition-pow-h = 0.1
|
||||
size-transition = true
|
||||
|
||||
|
||||
#################################
|
||||
# Corners #
|
||||
#################################
|
||||
# requires: https://github.com/sdhand/compton or https://github.com/jonaburg/picom
|
||||
corner-radius = 4.0;
|
||||
rounded-corners-exclude = [
|
||||
#"window_type = 'normal'",
|
||||
"class_g = 'Rofi'",
|
||||
"class_g = 'awesome'",
|
||||
"class_g = 'URxvt'",
|
||||
"class_g = 'XTerm'",
|
||||
"class_g = 'kitty'",
|
||||
"class_g = 'Polybar'",
|
||||
"class_g = 'code-oss'",
|
||||
#"class_g = 'TelegramDesktop'",
|
||||
#"class_g = 'Thunderbird'"
|
||||
];
|
||||
round-borders = 0;
|
||||
round-borders-exclude = [
|
||||
#"class_g = 'TelegramDesktop'",
|
||||
];
|
||||
|
||||
#################################
|
||||
# Shadows #
|
||||
#################################
|
||||
|
||||
|
||||
# Enabled client-side shadows on windows. Note desktop windows
|
||||
# (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow,
|
||||
# unless explicitly requested using the wintypes option.
|
||||
#
|
||||
# shadow = false
|
||||
shadow = false;
|
||||
|
||||
# The blur radius for shadows, in pixels. (defaults to 12)
|
||||
# shadow-radius = 12
|
||||
shadow-radius = 7;
|
||||
|
||||
# The opacity of shadows. (0.0 - 1.0, defaults to 0.75)
|
||||
# shadow-opacity = .75
|
||||
|
||||
# The left offset for shadows, in pixels. (defaults to -15)
|
||||
# shadow-offset-x = -15
|
||||
shadow-offset-x = -7;
|
||||
|
||||
# The top offset for shadows, in pixels. (defaults to -15)
|
||||
# shadow-offset-y = -15
|
||||
shadow-offset-y = -7;
|
||||
|
||||
# Avoid drawing shadows on dock/panel windows. This option is deprecated,
|
||||
# you should use the *wintypes* option in your config file instead.
|
||||
#
|
||||
# no-dock-shadow = false
|
||||
|
||||
# Don't draw shadows on drag-and-drop windows. This option is deprecated,
|
||||
# you should use the *wintypes* option in your config file instead.
|
||||
#
|
||||
# no-dnd-shadow = false
|
||||
|
||||
# Red color value of shadow (0.0 - 1.0, defaults to 0).
|
||||
# shadow-red = 0
|
||||
|
||||
# Green color value of shadow (0.0 - 1.0, defaults to 0).
|
||||
# shadow-green = 0
|
||||
|
||||
# Blue color value of shadow (0.0 - 1.0, defaults to 0).
|
||||
# shadow-blue = 0
|
||||
|
||||
# Do not paint shadows on shaped windows. Note shaped windows
|
||||
# here means windows setting its shape through X Shape extension.
|
||||
# Those using ARGB background is beyond our control.
|
||||
# Deprecated, use
|
||||
# shadow-exclude = 'bounding_shaped'
|
||||
# or
|
||||
# shadow-exclude = 'bounding_shaped && !rounded_corners'
|
||||
# instead.
|
||||
#
|
||||
# shadow-ignore-shaped = ''
|
||||
|
||||
# Specify a list of conditions of windows that should have no shadow.
|
||||
#
|
||||
# examples:
|
||||
# shadow-exclude = "n:e:Notification";
|
||||
#
|
||||
# shadow-exclude = []
|
||||
shadow-exclude = [
|
||||
"name = 'Notification'",
|
||||
"class_g = 'Conky'",
|
||||
"class_g ?= 'Notify-osd'",
|
||||
"class_g = 'Cairo-clock'",
|
||||
"class_g = 'slop'",
|
||||
"class_g = 'Polybar'",
|
||||
"_GTK_FRAME_EXTENTS@:c"
|
||||
];
|
||||
|
||||
# Specify a X geometry that describes the region in which shadow should not
|
||||
# be painted in, such as a dock window region. Use
|
||||
# shadow-exclude-reg = "x10+0+0"
|
||||
|
|
@ -120,42 +34,10 @@ shadow-exclude = [
|
|||
#################################
|
||||
# Fading #
|
||||
#################################
|
||||
|
||||
|
||||
# Fade windows in/out when opening/closing and when opacity changes,
|
||||
# unless no-fading-openclose is used.
|
||||
# fading = false
|
||||
fading = false;
|
||||
|
||||
# Opacity change between steps while fading in. (0.01 - 1.0, defaults to 0.028)
|
||||
# fade-in-step = 0.028
|
||||
fade-in-step = 0.03;
|
||||
|
||||
# Opacity change between steps while fading out. (0.01 - 1.0, defaults to 0.03)
|
||||
# fade-out-step = 0.03
|
||||
fade-out-step = 0.03;
|
||||
|
||||
# The time between steps in fade step, in milliseconds. (> 0, defaults to 10)
|
||||
# fade-delta = 10
|
||||
|
||||
# Specify a list of conditions of windows that should not be faded.
|
||||
# don't need this, we disable fading for all normal windows with wintypes: {}
|
||||
fade-exclude = [
|
||||
"class_g = 'slop'" # maim
|
||||
]
|
||||
|
||||
# Do not fade on window open/close.
|
||||
# no-fading-openclose = false
|
||||
|
||||
# Do not fade destroyed ARGB windows with WM frame. Workaround of bugs in Openbox, Fluxbox, etc.
|
||||
# no-fading-destroyed-argb = false
|
||||
|
||||
|
||||
#################################
|
||||
# Transparency / Opacity #
|
||||
#################################
|
||||
|
||||
|
||||
# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0)
|
||||
# inactive-opacity = 1
|
||||
inactive-opacity = 1;
|
||||
|
|
@ -207,7 +89,7 @@ opacity-rule = [
|
|||
# "100:class_g = 'Polybar'",
|
||||
# "100:class_g = 'firefox'",
|
||||
# "100:class_g = 'librewolf'",
|
||||
# "100:class_g = 'android-studio'",
|
||||
"100:class_g = 'android-studio'",
|
||||
];
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ format-charging = <animation-charging> <label-charging>
|
|||
format-discharging = <ramp-capacity> <label-discharging>
|
||||
format-full= <label-full>
|
||||
format-low= <animation-low> <label-low>
|
||||
label-charging = %percentage%%
|
||||
label-charging = %percentage%% %time%
|
||||
label-discharging = %percentage%% %time%
|
||||
label-full = %percentage%%
|
||||
label-low = BATTERY LOW
|
||||
|
|
@ -234,38 +234,19 @@ ramp-capacity-6 =
|
|||
ramp-capacity-7 =
|
||||
ramp-capacity-8 =
|
||||
ramp-capacity-9 =
|
||||
; ramp-capacity-0-foreground = ${colors.blue}
|
||||
; ramp-capacity-1-foreground = ${colors.blue}
|
||||
; ramp-capacity-2-foreground = ${colors.blue}
|
||||
; ramp-capacity-3-foreground = ${colors.blue}
|
||||
; ramp-capacity-4-foreground = ${colors.blue}
|
||||
; ramp-capacity-5-foreground = ${colors.blue}
|
||||
; ramp-capacity-6-foreground = ${colors.blue}
|
||||
; ramp-capacity-7-foreground = ${colors.blue}
|
||||
; ramp-capacity-8-foreground = ${colors.blue}
|
||||
; ramp-capacity-9-foreground = ${colors.blue}
|
||||
ramp-capacity-foreground = ${colors.blue}
|
||||
bar-capacity-width = 10
|
||||
animation-charging-0 =
|
||||
animation-charging-0-foreground = ${colors.green}
|
||||
animation-charging-1 =
|
||||
animation-charging-1-foreground = ${colors.green}
|
||||
animation-charging-2 =
|
||||
animation-charging-2-foreground = ${colors.green}
|
||||
animation-charging-3 =
|
||||
animation-charging-3-foreground = ${colors.green}
|
||||
animation-charging-4 =
|
||||
animation-charging-4-foreground = ${colors.green}
|
||||
animation-charging-5 =
|
||||
animation-charging-5-foreground = ${colors.green}
|
||||
animation-charging-6 =
|
||||
animation-charging-6-foreground = ${colors.green}
|
||||
animation-charging-7 =
|
||||
animation-charging-7-foreground = ${colors.green}
|
||||
animation-charging-8 =
|
||||
animation-charging-8-foreground = ${colors.green}
|
||||
animation-charging-9 =
|
||||
animation-charging-9-foreground = ${colors.green}
|
||||
animation-charging-foreground = ${colors.green}
|
||||
animation-charging-framerate = 750
|
||||
animation-low-0 =
|
||||
animation-low-0-foreground = ${colors.red}
|
||||
|
|
|
|||
|
|
@ -6,3 +6,5 @@
|
|||
active: #A6DA95FF;
|
||||
urgent: #ED8796FF;
|
||||
}
|
||||
#8AADF4
|
||||
#A6DA95
|
||||
|
|
|
|||
8
.config/rofi/colors/catppuccin-light.rasi
Normal file
8
.config/rofi/colors/catppuccin-light.rasi
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
* {
|
||||
background: #EFF1F5FF;
|
||||
background-alt: #EFF1F5FF;
|
||||
foreground: #4C4F69FF;
|
||||
selected: #1E66F5FF;
|
||||
active: #40A02BFF;
|
||||
urgent: #D20F39FF;
|
||||
}
|
||||
|
|
@ -9,6 +9,7 @@ set-option -g status-position top
|
|||
set-option -g status-right ""
|
||||
set -g status-left-length 20
|
||||
set-option -sg escape-time 10
|
||||
set -g mouse on
|
||||
|
||||
bind r source-file ~/.config/tmux/tmux.conf
|
||||
set -g base-index 1
|
||||
|
|
|
|||
3
.xinitrc
3
.xinitrc
|
|
@ -38,9 +38,6 @@ fi
|
|||
|
||||
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
|
||||
|
||||
setxkbmap -layout us,pt
|
||||
setxkbmap -option grp:win_space_toggle
|
||||
|
||||
# setup monitors (laptop only)
|
||||
if [ -f /usr/bin/envycontrol ]; then
|
||||
gpu_mode=$(/usr/bin/envycontrol -q)
|
||||
|
|
|
|||
Loading…
Reference in a new issue