diff --git a/.bashrc b/.bashrc index 4d3f1fb..32b0a6a 100755 --- a/.bashrc +++ b/.bashrc @@ -2,7 +2,7 @@ eval "$(starship init bash)" clear && nerdfetch [[ $- != *i* ]] && return -alias ls='ls --color=auto' +alias lsd='eza --icons' alias pacup='sudo pacman -Rns $(pacman -Qdtq)' alias grep='grep --color=auto' alias pool='clear && asciiquarium' diff --git a/.config/cava/config b/.config/cava/config index 4c5604f..9966950 100755 --- a/.config/cava/config +++ b/.config/cava/config @@ -1,6 +1,6 @@ [color] gradient = 1 gradient_count = 2 -gradient_color_1 = '#77777b' -gradient_color_2 = '#75797c' +gradient_color_1 = '#724e0b' +gradient_color_2 = '#925a0f' diff --git a/.config/cava/shaders/bar_spectrum.frag b/.config/cava/shaders/bar_spectrum.frag deleted file mode 100644 index b078913..0000000 --- a/.config/cava/shaders/bar_spectrum.frag +++ /dev/null @@ -1,79 +0,0 @@ -#version 330 - -in vec2 fragCoord; -out vec4 fragColor; - -// bar values. defaults to left channels first (low to high), then right (high to low). -uniform float bars[512]; - -uniform int bars_count; // number of bars (left + right) (configurable) -uniform int bar_width; // bar width (configurable), not used here -uniform int bar_spacing; // space bewteen bars (configurable) - -uniform vec3 u_resolution; // window resolution - -//colors, configurable in cava config file (r,g,b) (0.0 - 1.0) -uniform vec3 bg_color; // background color -uniform vec3 fg_color; // foreground color - -uniform int gradient_count; -uniform vec3 gradient_colors[8]; // gradient colors - -vec3 normalize_C(float y,vec3 col_1, vec3 col_2, float y_min, float y_max) -{ - //create color based on fraction of this color and next color - float yr = (y - y_min) / (y_max - y_min); - return col_1 * (1.0 - yr) + col_2 * yr; -} - -void main() -{ - // find which bar to use based on where we are on the x axis - float x = u_resolution.x * fragCoord.x; - int bar = int(bars_count * fragCoord.x); - - //calculate a bar size - float bar_size = u_resolution.x / bars_count; - - //the y coordinate and bar values are the same - float y = bars[bar]; - - // make sure there is a thin line at bottom - if (y * u_resolution.y < 1.0) - { - y = 1.0 / u_resolution.y; - } - - //draw the bar up to current height - if (y > fragCoord.y) - { - //make some space between bars basen on settings - if (x > (bar + 1) * (bar_size) - bar_spacing) - { - fragColor = vec4(bg_color,1.0); - } - else - { - if (gradient_count == 0) - { - fragColor = vec4(fg_color,1.0); - } - else - { - //find which color in the configured gradient we are at - int color = int((gradient_count - 1) * fragCoord.y); - - //find where on y this and next color is supposed to be - float y_min = color / (gradient_count - 1.0); - float y_max = (color + 1.0) / (gradient_count - 1.0); - - //make color - fragColor = vec4(normalize_C(fragCoord.y, gradient_colors[color], gradient_colors[color + 1], y_min, y_max), 1.0); - } - } - } - else - { - fragColor = vec4(bg_color,1.0); - } -} \ No newline at end of file diff --git a/.config/cava/shaders/northern_lights.frag b/.config/cava/shaders/northern_lights.frag deleted file mode 100644 index ecd859a..0000000 --- a/.config/cava/shaders/northern_lights.frag +++ /dev/null @@ -1,34 +0,0 @@ -#version 330 - -in vec2 fragCoord; -out vec4 fragColor; - -// bar values. defaults to left channels first (low to high), then right (high to low). -uniform float bars[512]; - -uniform int bars_count; // number of bars (left + right) (configurable) - -uniform vec3 u_resolution; // window resolution, not used here - -//colors, configurable in cava config file -uniform vec3 bg_color; // background color(r,g,b) (0.0 - 1.0), not used here -uniform vec3 fg_color; // foreground color, not used here - -void main() -{ - // find which bar to use based on where we are on the x axis - int bar = int(bars_count * fragCoord.x); - - float bar_y = 1.0 - abs((fragCoord.y - 0.5)) * 2.0; - float y = (bars[bar]) * bar_y; - - float bar_x = (fragCoord.x - float(bar) / float(bars_count)) * bars_count; - float bar_r = 1.0 - abs((bar_x - 0.5)) * 2; - - bar_r = bar_r * bar_r * 2; - - // set color - fragColor.r = fg_color.x * y * bar_r; - fragColor.g = fg_color.y * y * bar_r; - fragColor.b = fg_color.z * y * bar_r; -} diff --git a/.config/cava/shaders/pass_through.vert b/.config/cava/shaders/pass_through.vert deleted file mode 100644 index a4f20e5..0000000 --- a/.config/cava/shaders/pass_through.vert +++ /dev/null @@ -1,14 +0,0 @@ -#version 330 - - -// Input vertex data, different for all executions of this shader. -layout(location = 0) in vec3 vertexPosition_modelspace; - -// Output data ; will be interpolated for each fragment. -out vec2 fragCoord; - -void main() -{ - gl_Position = vec4(vertexPosition_modelspace,1); - fragCoord = (vertexPosition_modelspace.xy+vec2(1,1))/2.0; -} diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index feaad31..f499c4e 100755 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,5 +1,5 @@ source = /home/$USER/.cache/wal/colors-hyprland -monitor = DP-1, 2560x1440@165, 0x0, 1 +monitor = auto, 2560x1440@165, 0x0, 1 $terminal = kitty $fileManager = thunar $menu = wofi --show drun -n @@ -7,6 +7,7 @@ exec-once = hypridle exec-once = waybar exec-once = swww-daemon exec-once = swaync +exec-once = pypr exec-once = swaync-client -df exec-once = pactl set-sink-mute @DEFAULT_SINK@ 0 env = ELECTRON_OZONE_PLATFORM_HINT,wayland @@ -14,21 +15,21 @@ env = XCURSOR_THEME,Bibata-Modern-Classic env = XCURSOR_SIZE,12 general { gaps_in = 2 - gaps_out = 15 - border_size = 1 - col.active_border = $color9 - col.inactive_border = $color5 - resize_on_border = true - allow_tearing = false - layout = dwindle + gaps_out = 15 + border_size = 0 + col.active_border = $color9 + col.inactive_border = $color5 + resize_on_border = true + allow_tearing = false + layout = dwindle } decoration { - rounding = 10 - active_opacity = 0.8 + rounding = 10 + active_opacity = 0.78 inactive_opacity = 0.7 fullscreen_opacity = 1 blur { - enabled = true + enabled = true size = 3 passes = 5 new_optimizations = true @@ -37,32 +38,37 @@ decoration { popups = true } shadow { - enabled = true - range = 5 - render_power = 2 - color = $color0 + enabled = true + range = 15 + render_power = 5 + color = rgba(0,0,0,.5) } } animations { - enabled = true - bezier = linear, 0,0,1,1 - bezier = swirl, 0.04, 1, 0.2, 1.2 - animation = windows, 1, 4, swirl, popin 0% - animation = windowsOut, 1, 3, linear, popin 0% - animation = fade, 1, 2, linear - animation = workspaces, 1, 2, linear - animation = specialWorkspace, 1, 5, swirl, slidefadevert -50% + enabled = true + + # Unique bezier curves for a balanced, smooth feel + bezier = fluid, 0.15, 0.85, 0.25, 1.1 # Smooth acceleration with a slight overshoot + bezier = snappy, 0.3, 1, 0.4, 1 # Snappy, yet natural for fast transitions + + # Custom animations for a clean and distinct Hyprland experience + animation = windows, 1, 3.5, fluid, popin 5% + animation = windowsOut, 1, 2.5, snappy + animation = fade, 1, 2, fluid + animation = workspaces, 1, 1.7, snappy, slide + animation = specialWorkspace, 1, 4, fluid, slidefadevert -35% # Slight vertical slide fade for uniqueness } + dwindle { - preserve_split = true + preserve_split = true } misc { - force_default_wallpaper = 1 + force_default_wallpaper = 1 disable_hyprland_logo = true } input { - kb_layout = us + kb_layout = us follow_mouse = 1 sensitivity = 0 touchpad { @@ -70,21 +76,23 @@ input { } } gestures { - workspace_swipe = true + workspace_swipe = true workspace_swipe_distance = 300 workspace_swipe_cancel_ratio = .05 workspace_swipe_min_speed_to_force = 0 } device { - name = epic-mouse-v1 + name = epic-mouse-v1 sensitivity = 0 } + + $mainMod = SUPER bind = $mainMod, Q, exec, $terminal bind = $mainMod, B, killactive bind = $mainMod, E, exec, $fileManager bind = $mainMod, V, togglefloating -bind = $mainMod, R, exec, $menu +bind = $mainMod, A, exec, $menu bind = $mainMod, P, pseudo bind = $mainMod, J, togglesplit bind = $mainMod, F, fullscreen @@ -113,8 +121,8 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 bind = $mainMod, F8, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle -bind = $mainMod, F9, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% -bind = $mainMod, F10, exec,pactl set-sink-volume @DEFAULT_SINK@ +5% +binde = $mainMod, F9, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% +binde = $mainMod, F10, exec,pactl set-sink-volume @DEFAULT_SINK@ +5% bind = ALT, left, movewindow, l bind = ALT, right, movewindow, r bind = ALT, up, movewindow, u @@ -134,6 +142,10 @@ bind = ALT, a, exec, ~/.config/waybar/refresh.sh bind = ALT, r, exec, ~/.config/swaync/refresh.sh bind = $mainMod, M, exit +bind = $mainMod, SPACE, exec, pypr toggle term +bind = $mainMod, G, exec, pypr toggle music +bind = $mainMod, T, exec, pypr toggle taskbar + layerrule = blur, waybar layerrule = ignorezero, waybar layerrule = ignorealpha 0.5, waybar diff --git a/.config/hypr/pyprland.toml b/.config/hypr/pyprland.toml new file mode 100644 index 0000000..8be0f48 --- /dev/null +++ b/.config/hypr/pyprland.toml @@ -0,0 +1,28 @@ +[pyprland] +plugins = [ + "scratchpads" +] + +[scratchpads.term] +animation = "fromTop" +command = "kitty --class kitty-dropterm" +class = "kitty-dropterm" +position = "17% 5%" +size = "65% 60%" +offset = "200%" + +[scratchpads.music] +animation = "fromBottom" +command = "kitty --class kitty-pulsemixer -e pulsemixer" +class = "kitty-pulsemixer" +size = "50% 20%" +offset = "200%" + + + +[scratchpads.taskbar] +animation = "fromLeft" +command = "kitty --class kitty-taskbar -e htop" +class = "kitty-taskbar" +size = "30% 80%" +offset = "200%" diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf index e84b890..646c465 100755 --- a/.config/kitty/current-theme.conf +++ b/.config/kitty/current-theme.conf @@ -1,30 +1,30 @@ -foreground #c3c5c6 -background #12181b +foreground #c2c2c1 +background #0C0C08 background_opacity 1.0 -cursor #c3c5c6 +cursor #c2c2c1 -active_tab_foreground #12181b -active_tab_background #c3c5c6 -inactive_tab_foreground #c3c5c6 -inactive_tab_background #12181b +active_tab_foreground #0C0C08 +active_tab_background #c2c2c1 +inactive_tab_foreground #c2c2c1 +inactive_tab_background #0C0C08 -active_border_color #c3c5c6 -inactive_border_color #12181b -bell_border_color #737679 +active_border_color #c2c2c1 +inactive_border_color #0C0C08 +bell_border_color #484c51 -color0 #12181b -color8 #5c6a71 -color1 #737679 -color9 #9A9EA2 -color2 #77777b -color10 #9F9FA4 -color3 #75797c -color11 #9DA2A6 -color4 #7b7e81 -color12 #A5A8AC -color5 #8a8d91 -color13 #B9BCC2 -color6 #8d9194 -color14 #BDC2C6 -color7 #90989b -color15 #c3c5c6 +color0 #0C0C08 +color8 #696955 +color1 #484c51 +color9 #60666C +color2 #724e0b +color10 #98690F +color3 #925a0f +color11 #C37814 +color4 #a0720a +color12 #D6980E +color5 #545b63 +color13 #717A85 +color6 #5b646b +color14 #7A868F +color7 #95958a +color15 #c2c2c1 diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index e00000d..2185238 100755 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,6 +1,11 @@ { + "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" }, + "gruvbox": { "branch": "main", "commit": "68c3460a5d1d1a362318960035c9f3466d5011f5" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "markview.nvim": { "branch": "main", "commit": "81b40bd8c8c9e239bd14f7dace29f64fe20cbb98" }, @@ -9,12 +14,12 @@ "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, "nvim-treesitter": { "branch": "master", "commit": "2206739829518c9ea59dbdb9003e0147fdaf2d1c" }, "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "pywal.nvim": { "branch": "main", "commit": "d11b673c0e3d6eb8cbee7ea8cf4a8911f6ee24b9" }, "snacks.nvim": { "branch": "main", "commit": "b96bd540f785c725289f9f15f0147b1b2dac5a35" }, "tabline.nvim": { "branch": "main", "commit": "ff33d12a20d52daafa5393162cae4108faf8128b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/.config/nvim/lua/plugins/colors.lua b/.config/nvim/lua/plugins/colors.lua index cd76f87..d08ed02 100755 --- a/.config/nvim/lua/plugins/colors.lua +++ b/.config/nvim/lua/plugins/colors.lua @@ -1,7 +1,19 @@ +-- return { +-- "ellisonleao/gruvbox.nvim", +-- lazy = false, +-- name = "gruvbox", +-- priority = 997, +-- config = function() +-- vim.cmd.colorscheme("gruvbox") +-- end, +-- } + + + return { "AlphaTechnolog/pywal.nvim", - lazy = false, -- Load immediately on startup - priority = 1000, -- Ensure it loads before other colorscheme plugins + lazy = false, + priority = 1000, config = function() -- Set up pywal and load the colors require("pywal").setup() diff --git a/.config/nvim/lua/plugins/completions.txt b/.config/nvim/lua/plugins/completions.lua similarity index 100% rename from .config/nvim/lua/plugins/completions.txt rename to .config/nvim/lua/plugins/completions.lua diff --git a/.config/nvim/lua/plugins/tab.lua b/.config/nvim/lua/plugins/tab.lua index 9ec70c1..c08ff00 100755 --- a/.config/nvim/lua/plugins/tab.lua +++ b/.config/nvim/lua/plugins/tab.lua @@ -5,7 +5,7 @@ return { enable = true, options = { section_separators = { '', ''}, - component_separators = {'|', '|'}, + component_separators = {'|', "|"}, max_bufferline_percent = 80, show_tabs_always = true, show_devicons = true, diff --git a/InstallScripts/fullinstall.sh b/InstallScripts/fullinstall.sh index d264a0b..f384d03 100755 --- a/InstallScripts/fullinstall.sh +++ b/InstallScripts/fullinstall.sh @@ -4,7 +4,7 @@ yay -S reflector rsync sudo reflector --country 'US' --latest 10 --sort rate --save /etc/pacman.d/mirrorlist yay -S pywal swww wal -i ~/Dotfiles/wallpapers/walls/r82.jpg -n -yay -S waybar swaync starship nerdfetch neovim python-pywalfox hypridle hyprpicker hyprshot hyprlock wlogout fd cava +yay -S waybar swaync starship nerdfetch neovim python-pywalfox hypridle hyprpicker hyprshot hyprlock pyprland wlogout fd cava yay -S nerd-fonts yay -S nwg-look qogir-icon-theme materia-gtk-theme illogical-impulse-bibata-modern-classic-bin yay -S thunar gvfs tumbler eza diff --git a/wallpapers/pywallpaper.jpg b/wallpapers/pywallpaper.jpg index 5f5ec7d..c288d7d 100755 Binary files a/wallpapers/pywallpaper.jpg and b/wallpapers/pywallpaper.jpg differ