Compare commits

...

2 commits

Author SHA1 Message Date
321bf2110e changed resize keybinds 2023-11-06 11:32:16 +00:00
1b94f147e5 minor visual changes 2023-11-06 11:26:02 +00:00
15 changed files with 79 additions and 131 deletions

View file

@ -10,6 +10,7 @@
# to the user's home directory starting with `~/`.
import:
- ~/.config/alacritty/themes/catppuccin/catppuccin-macchiato.yml
# - ~/.config/alacritty/themes/gruvbox-dark.yaml
# Any items in the `env` entry below will be added as
# environment variables. Some entries may override variables

View file

@ -1,37 +1,37 @@
# This file contains fish universal variable definitions.
# VERSION: 3.0
SETUVAR __fish_initialized:3400
SETUVAR fish_color_autosuggestion:737994
SETUVAR fish_color_cancel:e78284
SETUVAR fish_color_command:8caaee
SETUVAR fish_color_comment:838ba7
SETUVAR fish_color_cwd:e5c890
SETUVAR fish_color_autosuggestion:6e738d
SETUVAR fish_color_cancel:ed8796
SETUVAR fish_color_command:8aadf4
SETUVAR fish_color_comment:8087a2
SETUVAR fish_color_cwd:eed49f
SETUVAR fish_color_cwd_root:red
SETUVAR fish_color_end:ef9f76
SETUVAR fish_color_error:e78284
SETUVAR fish_color_escape:ea999c
SETUVAR fish_color_gray:737994
SETUVAR fish_color_end:f5a97f
SETUVAR fish_color_error:ed8796
SETUVAR fish_color_escape:ee99a0
SETUVAR fish_color_gray:6e738d
SETUVAR fish_color_history_current:\x2d\x2dbold
SETUVAR fish_color_host:8caaee
SETUVAR fish_color_host_remote:a6d189
SETUVAR fish_color_keyword:e78284
SETUVAR fish_color_normal:c6d0f5
SETUVAR fish_color_operator:f4b8e4
SETUVAR fish_color_host:8aadf4
SETUVAR fish_color_host_remote:a6da95
SETUVAR fish_color_keyword:ed8796
SETUVAR fish_color_normal:cad3f5
SETUVAR fish_color_operator:f5bde6
SETUVAR fish_color_option:\x1d
SETUVAR fish_color_param:eebebe
SETUVAR fish_color_quote:a6d189
SETUVAR fish_color_redirection:f4b8e4
SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d414559
SETUVAR fish_color_selection:\x2d\x2dbackground\x3d414559
SETUVAR fish_color_status:e78284
SETUVAR fish_color_user:81c8be
SETUVAR fish_color_param:f0c6c6
SETUVAR fish_color_quote:a6da95
SETUVAR fish_color_redirection:f5bde6
SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d363a4f
SETUVAR fish_color_selection:\x2d\x2dbackground\x3d363a4f
SETUVAR fish_color_status:ed8796
SETUVAR fish_color_user:8bd5ca
SETUVAR fish_color_valid_path:\x2d\x2dunderline
SETUVAR fish_key_bindings:fish_vi_key_bindings
SETUVAR fish_pager_color_background:\x1d
SETUVAR fish_pager_color_completion:c6d0f5
SETUVAR fish_pager_color_description:737994
SETUVAR fish_pager_color_prefix:f4b8e4
SETUVAR fish_pager_color_progress:737994
SETUVAR fish_pager_color_completion:cad3f5
SETUVAR fish_pager_color_description:6e738d
SETUVAR fish_pager_color_prefix:f5bde6
SETUVAR fish_pager_color_progress:6e738d
SETUVAR fish_pager_color_secondary_background:\x1d
SETUVAR fish_pager_color_secondary_completion:\x1d
SETUVAR fish_pager_color_secondary_description:\x1d
@ -40,5 +40,4 @@ SETUVAR fish_pager_color_selected_background:\x1d
SETUVAR fish_pager_color_selected_completion:\x1d
SETUVAR fish_pager_color_selected_description:\x1d
SETUVAR fish_pager_color_selected_prefix:\x1d
SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin
SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2ecargo/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin

View file

@ -0,0 +1,3 @@
function conf --wraps='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' --description 'Git command to manage dotfiles'
/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME $argv
end

View file

@ -1,3 +0,0 @@
function config --wraps='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' --description 'Git command to manage dotfiles'
/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME $argv
end

View file

@ -1,30 +0,0 @@
function fish_prompt --description 'Write out the prompt'
set -l last_status $status
set -l normal (set_color normal)
set -l status_color (set_color brgreen)
set -l cwd_color (set_color $fish_color_cwd)
set -l vcs_color (set_color brpurple)
set -l prompt_status ""
# Since we display the prompt on a new line allow the directory names to be longer.
set -q fish_prompt_pwd_dir_length
or set -lx fish_prompt_pwd_dir_length 0
# Color the prompt differently when we're root
set -l suffix ''
if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root
set cwd_color (set_color $fish_color_cwd_root)
end
set suffix '#'
end
# Color the prompt in red on error
if test $last_status -ne 0
set status_color (set_color $fish_color_error)
set prompt_status $status_color "[" $last_status "]" $normal
end
echo -s (prompt_login) ' ' $cwd_color (prompt_pwd) $vcs_color (fish_vcs_prompt) $normal ' ' $prompt_status
echo -n -s $status_color $suffix ' ' $normal
end

View file

@ -1,30 +0,0 @@
function fish_prompt --description 'Write out the prompt'
set -l last_status $status
set -l normal (set_color normal)
set -l status_color (set_color brgreen)
set -l cwd_color (set_color $fish_color_cwd)
set -l vcs_color (set_color brpurple)
set -l prompt_status ""
# Since we display the prompt on a new line allow the directory names to be longer.
set -q fish_prompt_pwd_dir_length
or set -lx fish_prompt_pwd_dir_length 0
# Color the prompt differently when we're root
set -l suffix ''
if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root
set cwd_color (set_color $fish_color_cwd_root)
end
set suffix '#'
end
# Color the prompt in red on error
if test $last_status -ne 0
set status_color (set_color $fish_color_error)
set prompt_status $status_color "[" $last_status "]" $normal
end
echo -s (prompt_login) ' ' $cwd_color (prompt_pwd) $vcs_color (fish_vcs_prompt) $normal ' ' $prompt_status
echo -n -s $status_color $suffix ' ' $normal
end

View file

@ -1,2 +0,0 @@
function fish_right_prompt
end

View file

@ -10,6 +10,7 @@
# Please see https://i3wm.org/docs/userguide.html for a complete reference!
set $mod Mod1
set $mod2 Mod4
set $browser firefox
set $terminal alacritty
@ -181,34 +182,38 @@ bindsym $mod+Shift+c reload
bindsym $mod+Shift+r restart
# resize window (you can also use the mouse for that)
mode "resize" {
# These bindings trigger as soon as you enter the resize mode
# Pressing left will shrink the windows width.
# Pressing right will grow the windows width.
# Pressing up will shrink the windows height.
# Pressing down will grow the windows height.
bindsym h resize shrink width 10 px or 10 ppt
bindsym j resize grow height 10 px or 10 ppt
bindsym k resize shrink height 10 px or 10 ppt
bindsym l resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys
bindsym Left resize shrink width 10 px or 10 ppt
bindsym Down resize grow height 10 px or 10 ppt
bindsym Up resize shrink height 10 px or 10 ppt
bindsym Right resize grow width 10 px or 10 ppt
# back to normal: Enter or Escape or $mod+r
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym $mod+r mode "default"
}
bindsym $mod+r mode "resize"
bindsym $mod2+Shift+h resize shrink width 10 px or 10 ppt
bindsym $mod2+Shift+j resize grow height 10 px or 10 ppt
bindsym $mod2+Shift+k resize shrink height 10 px or 10 ppt
bindsym $mod2+Shift+l resize grow width 10 px or 10 ppt
#mode "resize" {
# # These bindings trigger as soon as you enter the resize mode
#
# # Pressing left will shrink the windows width.
# # Pressing right will grow the windows width.
# # Pressing up will shrink the windows height.
# # Pressing down will grow the windows height.
# bindsym h resize shrink width 10 px or 10 ppt
# bindsym j resize grow height 10 px or 10 ppt
# bindsym k resize shrink height 10 px or 10 ppt
# bindsym l resize grow width 10 px or 10 ppt
#
# # same bindings, but for the arrow keys
# bindsym Left resize shrink width 10 px or 10 ppt
# bindsym Down resize grow height 10 px or 10 ppt
# bindsym Up resize shrink height 10 px or 10 ppt
# bindsym Right resize grow width 10 px or 10 ppt
#
# # back to normal: Enter or Escape or $mod+r
# bindsym Return mode "default"
# bindsym Escape mode "default"
# bindsym $mod+r mode "default"
#}
#bindsym $mod+r mode "resize"
# window settings
gaps inner 10
gaps top 40
gaps inner 5
gaps top 37
assign [class="^tidal-hifi$"] 5
assign [class="discord"] 5

View file

@ -2,7 +2,7 @@ require('lualine').setup {
options = {
icons_enabled = true,
theme = 'auto',
component_separators = { left = '', right = ''},
component_separators = { left = '|', right = '|'},
section_separators = { left = '', right = ''},
disabled_filetypes = {
statusline = {},
@ -21,7 +21,7 @@ require('lualine').setup {
lualine_a = {'mode'},
lualine_b = {'branch', 'diff', 'diagnostics'},
lualine_c = {'filename'},
lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_x = {'encoding', 'filetype'},
lualine_y = {'progress'},
lualine_z = {'location'}
},

View file

@ -27,28 +27,27 @@ pseudo-transparency = true
monitor = ${env:MONITOR:eDP1}
tray-position = ${env:TRAY_POS:right}
font-0 = Firacode Nerd Font:style=medium:size=10;2
font-1 = jetbrainsmono nerd font:size=10:weight=bold;2
font-0 = JetbrainsMono Nerd Font:size=10:weight=medium;2
font-1 = Firacode Nerd Font:style=medium:size=10;2
font-2 = inter:size=10:weight=regular;2
[bar/laptop]
inherit = section/base
width = 99.4%
width = 99.5%
height = 24pt
offse-x = 0.3%
offset-y = 0.7%
offset-x = 0.3%
offset-y = 0.5%
;radius = 8
modules-left = i3 sep title
modules-center = date dot time
modules-right = cpu dot gpu dot memory dot backlight dot pulseaudio sep filesystem sep battery
modules-right = cpu dot gpu dot memory dot backlight dot pulseaudio sep filesystem sep battery
background = ${colors.base}
foreground = ${colors.text}
line-size = 3pt
padding-right = 1
cursor-click = pointer
enable-ipc = true

View file

@ -15,4 +15,4 @@
/* Import color-scheme from `colors` directory */
@import "~/.config/rofi/colors/onedark.rasi"
@import "~/.config/rofi/colors/catppuccin.rasi"

View file

@ -1,4 +1,4 @@
## Current Theme
type="$HOME/.config/rofi/applets/type-5"
style='style-2.rasi'
type="$HOME/.config/rofi/applets/type-4"
style='style-1.rasi'

View file

@ -21,7 +21,7 @@ configuration {
/*****----- Global Properties -----*****/
* {
font: "JetBrains Mono Nerd Font 10";
font: "JetBrains Mono Nerd Font 11";
background: #11092D;
background-alt: #281657;
foreground: #FFFFFF;

View file

@ -11,7 +11,7 @@
## style-6 style-7 style-8 style-9 style-10
dir="$HOME/.config/rofi/launchers/type-7"
theme='style-1'
theme='style-2'
## Run
rofi \

View file

@ -2,6 +2,12 @@
add_newline = false
palette = "catppuccin_macchiato"
[line_break]
disabled = true
[cmd_duration]
disabled = true
[aws]
symbol = " "