diff --git a/.bashrc b/.bashrc index 60f7e58..6b50664 100644 --- a/.bashrc +++ b/.bashrc @@ -41,12 +41,14 @@ on() { # general aliases alias ls='ls --color=auto' alias vim='nvim' +alias tf='terraform' # git aliases alias ga='git add' alias gcm='git commit -m' alias gs='git status' alias gp='git push' +alias gl='git log' # config aliases alias vimc='nvim ~/.config/nvim/init.lua' @@ -55,7 +57,18 @@ alias wmc='nvim ~/.config/sway/config' # asus tools aliases alias sup='supergfxctl' -PS1='\[\e[1;33m\]\u ($HOSTNAME) \[\e[1;32m\]\w \[\e[0m\]$(parse_git_branch)\n\[\e[35m\]\[\e[1m\]\$ \[\e[0m\]' +# Shell prompt + +# Reset PS1 prompt everytime +resetPrompt() { + printf "\e[6 q" +} + +# Colors: https://misc.flogisoft.com/bash/tip_colors_and_formatting +PS1='$(resetPrompt)\[\e[1;36m\]\u ($HOSTNAME) \[\e[1;32m\]\w \[\e[0m\]$(parse_git_branch)\n\[\e[35m\]\[\e[1m\]\$ \[\e[0m\]' + +# export editor +export EDITOR=nvim # export pip path export PATH=$PATH:~/.local/bin @@ -75,4 +88,3 @@ export CHROME_EXECUTABLE=brave # pnpm export PNPM_HOME="/home/ayush/.local/share/pnpm" export PATH="$PNPM_HOME:$PATH" -# pnpm end diff --git a/.winitrc b/.winitrc index aba4d28..a2839f6 100755 --- a/.winitrc +++ b/.winitrc @@ -19,15 +19,17 @@ export LC_ALL="en_US.UTF-8" # wayland fixes export XDG_SESSION_TYPE=wayland export MOZ_ENABLE_WAYLAND=1 -export MOZ_USE_XINPUT2=1 export GTK_USE_PORTAL=0 -export SDL_VIDEODRIVER=wayland +#export SDL_VIDEODRIVER=wayland export _JAVA_AWT_WM_NONREPARENTING=1 export QT_QPA_PLATFORM=wayland export XDG_CURRENT_DESKTOP=Sway export XDG_SESSION_DESKTOP=Sway export WLR_NO_HARDWARE_CURSORS=1 +# fix for slow loads on igpu-only mode +export __EGL_VENDOR_LIBRARY_FILENAMES=/usr/share/glvnd/egl_vendor.d/50_mesa.json:/usr/share/glvnd/egl_vendor.d/10_nvidia.json + # gnome keyring eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) export SSH_AUTH_SOCK @@ -35,9 +37,8 @@ export SSH_AUTH_SOCK # start sway #status=$(sudo cat /sys/class/drm/card1-HDMI-A-2/status) #if [ "$status" = "connected" ]; then -# sway --unsupported-gpu -#else -# sway +# export WLR_RENDERER=vulkan +# export WLR_DRM_DEVICES=/dev/dri/card1 #fi -export WLR_DRM_DEVICES=/dev/dri/card0 + sway --unsupported-gpu diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index ee87fd7..fd3d1de 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -1,3 +1,6 @@ +import: + - ~/.config/alacritty/catppuccin/catppuccin-macchiato.yml + window: opacity: 1 padding: @@ -14,14 +17,19 @@ font: x: 0 y: 3 +cursor: + style: + shape: beam + blinking: on + draw_bold_text_with_bright_colors: false # Colors (One Dark) -colors: +#colors: # Default colors - primary: - background: '#282c34' - foreground: '#abb2bf' + #primary: + # background: '#282c34' + # foreground: '#abb2bf' # Bright and dim foreground colors # @@ -29,7 +37,7 @@ colors: # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors` # is `false`, the normal foreground color will be used. #dim_foreground: '0x9a9a9a' - bright_foreground: '0xe6efff' + # bright_foreground: '0xe6efff' # Cursor colors # @@ -40,37 +48,37 @@ colors: # cursor: '0xffffff' # Normal colors - normal: - black: '0x1e2127' - red: '0xe06c75' - green: '0x98c379' - yellow: '0xd19a66' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0x828791' + #normal: + #black: '0x1e2127' + #red: '0xe06c75' + #green: '0x98c379' + #yellow: '0xd19a66' + #blue: '0x61afef' + #magenta: '0xc678dd' + #cyan: '0x56b6c2' + #white: '0x828791' # Bright colors - bright: - black: '0x5c6370' - red: '0xe06c75' - green: '0x98c379' - yellow: '0xd19a66' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0xe6efff' + #bright: + #black: '0x5c6370' + #red: '0xe06c75' + #green: '0x98c379' + #yellow: '0xd19a66' + #blue: '0x61afef' + #magenta: '0xc678dd' + #cyan: '0x56b6c2' + #white: '0xe6efff' # Dim colors # # If the dim colors are not set, they will be calculated automatically based # on the `normal` colors. - dim: - black: '0x1e2127' - red: '0xe06c75' - green: '0x98c379' - yellow: '0xd19a66' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0x828791' + #dim: + #black: '0x1e2127' + #red: '0xe06c75' + #green: '0x98c379' + #yellow: '0xd19a66' + #blue: '0x61afef' + #magenta: '0xc678dd' + #cyan: '0x56b6c2' + #white: '0x828791' diff --git a/alacritty/catppuccin b/alacritty/catppuccin new file mode 160000 index 0000000..3c808cb --- /dev/null +++ b/alacritty/catppuccin @@ -0,0 +1 @@ +Subproject commit 3c808cbb4f9c87be43ba5241bc57373c793d2f17 diff --git a/foot/foot.ini b/foot/foot.ini index e5570a5..5eece98 100644 --- a/foot/foot.ini +++ b/foot/foot.ini @@ -1,14 +1,14 @@ # -*- conf -*- # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) -# term=foot (or xterm-256color if built with -Dterminfo=disabled) +term=xterm-256color # login-shell=no # app-id=foot # title=foot # locked-title=no -font=Roboto Mono for Powerline:size=10 +font=Roboto Mono for Powerline:size=14 # font-bold= # font-italic= # font-bold-italic= @@ -18,7 +18,7 @@ font=Roboto Mono for Powerline:size=10 # vertical-letter-offset=0 underline-offset=2px # box-drawings-uses-font-glyphs=no -dpi-aware=yes +dpi-aware=no # initial-window-size-pixels=700x500 # Or, # initial-window-size-chars= diff --git a/nvim/init.lua b/nvim/init.lua index a062827..78a37f4 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -27,7 +27,10 @@ require('packer').startup(function() 'RubixDev/mason-update-all', 'neovim/nvim-lspconfig' } - use 'joshdick/onedark.vim' + use { + 'catppuccin/nvim', + as = 'catpuccin' + } use 'nvim-treesitter/nvim-treesitter' @@ -48,6 +51,9 @@ end) require("user.basics") +vim.cmd.colorscheme 'catppuccin-macchiato' +vim.opt.guicursor = 'n:block-Number,i:ver30' + local function map(mode, shortcut, command) vim.keymap.set(mode, shortcut, command, { noremap = true }) end @@ -60,8 +66,8 @@ local use builtin = require("telescope.builtin") nmap("", builtin.find_files) require("lualine").setup{ - options = { - theme = 'onedark' + options = { + theme = 'auto' } } diff --git a/nvim/lua/user/basics.lua b/nvim/lua/user/basics.lua index ff02bae..a0c6b46 100644 --- a/nvim/lua/user/basics.lua +++ b/nvim/lua/user/basics.lua @@ -26,6 +26,5 @@ vim.opt.completeopt = { "menu", "menuone", "noselect" } vim.cmd([[ syntax on syntax enable -colorscheme onedark hi CursorLine cterm=NONE ctermbg=237 ctermfg=NONE ]]) diff --git a/nvim/lua/user/lsp/mason.lua b/nvim/lua/user/lsp/mason.lua index 9c9af59..4f474d6 100644 --- a/nvim/lua/user/lsp/mason.lua +++ b/nvim/lua/user/lsp/mason.lua @@ -1,7 +1,8 @@ local servers = { - 'sumneko_lua', + 'lua_ls', 'pyright', 'tsserver', + 'terraformls', } require('mason').setup() diff --git a/sway/config b/sway/config index 8955ee8..030bcf8 100644 --- a/sway/config +++ b/sway/config @@ -3,12 +3,13 @@ output eDP-1 { #mode 1920x1080@60.004Hz mode 1920x1080@144.003Hz scale 1.0 - adaptive_sync on + adaptive_sync off } -output HDMI-A-2 { +output DP-1 { mode 2560x1440@144.000Hz scale 1.0 + adaptive_sync off } # set mouse @@ -50,7 +51,7 @@ font pango:Roboto Mono for Powerline 10 floating_modifier $mod # start a terminal -bindsym $mod+Return exec foot +bindsym $mod+Return exec alacritty # kill focused window bindsym $mod+Shift+q kill @@ -232,6 +233,9 @@ exec "/usr/bin/sleep 5; /usr/bin/nextcloud --background" # start nm-applet exec --no-startup-id nm-applet --indicator +# start rog-control-center +exec --no-startup-id rog-control-center + # dunst keybinds bindsym Ctrl+space exec dunstctl close bindsym Ctrl+Shift+space exec dunstctl close-all @@ -271,8 +275,8 @@ bindsym $mod+n exec firefox #bindsym $mod+b exec "min --use-gl=desktop --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization --ozone-platform-hint=auto --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --disable-features=UseSkiaRenderer,UseChromeOSDirectVideoDecoder --canvas-oop-rasterization" bindsym $mod+b exec "notesnook --ozone-platform=wayland --ozone-platform-hint=wayland" -# Mod + Shift + b edge -bindsym $mod+Shift+b exec "microsoft-edge-beta --enable-features=UseOzonePlatform,VaapiVideoDecoder,VaapiVideoEncoder,WebRTCPipeWireCapturer --ozone-platform=wayland --ozone-platform-hint=wayland --disable-features=UseChromeOSDirectVideoDecoder --use-gl=egl" +# Mod + Shift + b mercury +bindsym $mod+Shift+b exec "mercury-browser" # Mod + m pantheon files bindsym $mod+m exec io.elementary.files @@ -282,7 +286,7 @@ bindsym $mod+Shift+x exec /usr/local/bin/emotes # Assign windows to workspaces assign [class="Brave-browser"] 3 -assign [class="Steam"] 4 +#assign [class="Steam"] 4 assign [class="discord"] 10 # make notification windows floating diff --git a/sway/wall.jpg b/sway/wall.jpg index 229462a..3603b2a 100644 Binary files a/sway/wall.jpg and b/sway/wall.jpg differ diff --git a/waybar/config b/waybar/config index 7c5d6a7..7a2986b 100644 --- a/waybar/config +++ b/waybar/config @@ -39,7 +39,7 @@ "states": { // "good": 95, "warning": 50, - "critical": 40, + "critical": 19, }, "format": " {capacity}%", "format-time": "{H}h {M}m", diff --git a/waybar/style.css b/waybar/style.css index 209977d..db06640 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -4,8 +4,8 @@ } window#waybar { - background-color: #1e222a; - color: #979eab; + background-color: #24273A; + color: #CAD3F5; padding: 0 500px; } @@ -13,7 +13,7 @@ window#waybar { margin: 4px 0; padding: 0 2px; background: transparent; - color: #979eab; + color: #CAD3F5; box-shadow: inset 0 -2px transparent; border: none; border-radius: 0; @@ -28,8 +28,8 @@ window#waybar { } #workspaces button.focused { - background-color: #282c35; - box-shadow: inset 0 -2px #61afef; + background-color: #8aadf4; + color: #494D64; } #workspaces button.urgent { @@ -38,7 +38,7 @@ window#waybar { #custom-left-semi, #custom-right-semi { - color: #2b2f37; + color: #1e2030; margin: 0; padding: 0; } @@ -82,18 +82,18 @@ window#waybar { } #clock { - background-color: #282c35; + background-color: #1e2030; color: #abb2bf; padding: 0 10px; } #battery { - background-color: #282c35; + background-color: #1e2030; } #battery.charging, #battery.plugged { - color: #5dabeb; - background-color: #282c35; + color: #8AADF4; + background-color: #1e2030; } @keyframes blink { @@ -119,16 +119,16 @@ label:focus { } #cpu { - background-color: #282c35; + background-color: #1e2030; color: #abb2bf; } #memory { - background-color: #282c35; + background-color: #1e2030; } #disk { - background-color: #964B00; + background-color: #1e2030; } #backlight { @@ -178,7 +178,6 @@ label:focus { } #tray { - background-color: #1e2127; } #tray > .passive {