diff --git a/dot-config/alacritty/alacritty.toml b/dot-config/alacritty/alacritty.toml index b8134c7..7c124eb 100644 --- a/dot-config/alacritty/alacritty.toml +++ b/dot-config/alacritty/alacritty.toml @@ -1,10 +1,3 @@ -import = [ - "~/.config/alacritty/catppuccin-mocha.toml" -] - -shell = { program = "tmux", args = ["new"] } - -live_config_reload = true [env] TERM = "xterm-256color" @@ -18,3 +11,12 @@ opacity = 0.85 [font] normal = { family = "JetBrainsMono Nerd Font Mono", style = "Regular" } size = 16 + +[general] +live_config_reload = true +import = [ + "~/.config/alacritty/catppuccin-mocha.toml" +] + +[terminal] +shell = { program = "tmux", args = ["new"] } diff --git a/dot-config/alacritty/catppuccin-mocha.toml b/dot-config/alacritty/catppuccin-mocha.toml index 08a7e3a..67bf1d8 100644 --- a/dot-config/alacritty/catppuccin-mocha.toml +++ b/dot-config/alacritty/catppuccin-mocha.toml @@ -72,4 +72,4 @@ color = "#fab387" [[colors.indexed_colors]] index = 17 -color = "#f5e0dc" \ No newline at end of file +color = "#f5e0dc" diff --git a/dot-config/fish/config.fish b/dot-config/fish/config.fish index e1407e2..0eb4005 100644 --- a/dot-config/fish/config.fish +++ b/dot-config/fish/config.fish @@ -47,6 +47,10 @@ if status is-interactive alias cat="batcat" end + if which python > /dev/null 2>&1 + alias py="python" + end + if which distrobox-enter > /dev/null 2>&1 alias denter=distrobox-enter end diff --git a/dot-config/fish/fish_variables b/dot-config/fish/fish_variables index ab9e0af..0188546 100644 --- a/dot-config/fish/fish_variables +++ b/dot-config/fish/fish_variables @@ -1,7 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_initialized:3400 -SETUVAR _fisher_upgraded_to_4_4:\x1d SETUVAR fish_color_autosuggestion:brblack SETUVAR fish_color_cancel:\x2dr SETUVAR fish_color_command:blue @@ -30,49 +29,4 @@ SETUVAR fish_pager_color_description:yellow\x1e\x2di SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR fish_user_paths:/home/timoxa0/\x2espicetify\x1e/home/timoxa0/\x2econfig/hypr/bin\x1e/home/timoxa0/\x2elocal/bin -SETUVAR pure_begin_prompt_with_current_directory:true -SETUVAR pure_check_for_new_release:false -SETUVAR pure_color_at_sign:pure_color_mute -SETUVAR pure_color_command_duration:pure_color_warning -SETUVAR pure_color_current_directory:pure_color_primary -SETUVAR pure_color_danger:red -SETUVAR pure_color_dark:black -SETUVAR pure_color_git_branch:pure_color_mute -SETUVAR pure_color_git_dirty:pure_color_mute -SETUVAR pure_color_git_stash:pure_color_info -SETUVAR pure_color_git_unpulled_commits:pure_color_info -SETUVAR pure_color_git_unpushed_commits:pure_color_info -SETUVAR pure_color_hostname:pure_color_mute -SETUVAR pure_color_info:cyan -SETUVAR pure_color_jobs:pure_color_normal -SETUVAR pure_color_light:white -SETUVAR pure_color_mute:brblack -SETUVAR pure_color_normal:normal -SETUVAR pure_color_prefix_root_prompt:pure_color_danger -SETUVAR pure_color_primary:blue -SETUVAR pure_color_prompt_on_error:pure_color_danger -SETUVAR pure_color_prompt_on_success:pure_color_success -SETUVAR pure_color_success:magenta -SETUVAR pure_color_system_time:pure_color_mute -SETUVAR pure_color_username_normal:pure_color_mute -SETUVAR pure_color_username_root:pure_color_light -SETUVAR pure_color_virtualenv:pure_color_mute -SETUVAR pure_color_warning:yellow -SETUVAR pure_enable_git:true -SETUVAR pure_enable_single_line_prompt:false -SETUVAR pure_reverse_prompt_symbol_in_vimode:true -SETUVAR pure_separate_prompt_on_error:false -SETUVAR pure_show_jobs:false -SETUVAR pure_show_prefix_root_prompt:false -SETUVAR pure_show_subsecond_command_duration:false -SETUVAR pure_show_system_time:false -SETUVAR pure_symbol_git_dirty:\x2a -SETUVAR pure_symbol_git_stash:\u2261 -SETUVAR pure_symbol_git_unpulled_commits:\u21e3 -SETUVAR pure_symbol_git_unpushed_commits:\u21e1 -SETUVAR pure_symbol_prefix_root_prompt:\x23 -SETUVAR pure_symbol_prompt:\u276f -SETUVAR pure_symbol_reverse_prompt:\u276e -SETUVAR pure_symbol_title_bar_separator:\x2d -SETUVAR pure_threshold_command_duration:5 +SETUVAR fish_user_paths:\x1d diff --git a/dot-config/hypr/decorations.conf b/dot-config/hypr/decorations.conf index 1e2edaf..069e327 100644 --- a/dot-config/hypr/decorations.conf +++ b/dot-config/hypr/decorations.conf @@ -7,8 +7,8 @@ exec-once = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Moder general { col.active_border = $primary col.inactive_border = $secondary - gaps_in = 5 - gaps_out = 10 + gaps_in = 15 + gaps_out = 30 border_size = 3 resize_on_border = false allow_tearing = false diff --git a/dot-config/hypr/hyprland.conf b/dot-config/hypr/hyprland.conf index a94c8c9..0464ea5 100644 --- a/dot-config/hypr/hyprland.conf +++ b/dot-config/hypr/hyprland.conf @@ -1,7 +1,7 @@ source = colors.conf $terminal = alacritty -$fileManager = thunar +$fileManager = nemo $menu = ~/.config/hypr/bin/runner $browser = zen-browser $discord = vesktop diff --git a/dot-config/hypr/install.log b/dot-config/hypr/install.log deleted file mode 100644 index d502675..0000000 --- a/dot-config/hypr/install.log +++ /dev/null @@ -1,9 +0,0 @@ -[21:25:32 2024-10-07] FETCHING Version 2.38.4 -[21:25:32 2024-10-07] CREATING /home/timoxa0/.spicetify -[21:25:32 2024-10-07] DOWNLOADING https://github.com/spicetify/cli/releases/download/v2.38.4/spicetify-2.38.4-linux-amd64.tar.gz -[21:25:33 2024-10-07] EXTRACTING /home/timoxa0/.spicetify/spicetify.tar.gz -[21:25:33 2024-10-07] SETTING EXECUTABLE PERMISSIONS TO /home/timoxa0/.spicetify/spicetify -[21:25:33 2024-10-07] REMOVING /home/timoxa0/.spicetify/spicetify.tar.gz -[21:25:33 2024-10-07] APPENDING /home/timoxa0/.spicetify to PATH in /home/timoxa0/.config/fish/config.fish -[21:25:33 2024-10-07] spicetify v2.38.4 was installed successfully to /home/timoxa0/.spicetify -[21:25:33 2024-10-07] Run 'spicetify --help' to get started diff --git a/dot-config/hypr/rules.conf b/dot-config/hypr/rules.conf index 006b121..431d877 100644 --- a/dot-config/hypr/rules.conf +++ b/dot-config/hypr/rules.conf @@ -1,41 +1,53 @@ -#===========================================================================# -# Windows and workspaces # -#===========================================================================# +# +# Window rules +# +# Waybar layerrule = blur, waybar layerrule = ignorezero, waybar + +# Mako layerrule = blur, notifications layerrule = ignorezero, notifications +# Rofi layerrule = blur, rofi layerrule = ignorezero, rofi -windowrulev2 = suppressevent maximize, class:.* +# Disable maximize +windowrulev2 = suppressevent maximize, class:.* -windowrule = float, ^(imv)$ -windowrule = float, ^(fetch)$ -windowrule = float, ^(AmneziaVPN)$ +# Pavucontrol +windowrulev2 = float, class:^(org.pulseaudio.pavucontrol)$ +windowrulev2 = size 696 570, class:^(org.pulseaudio.pavucontrol)$ +windowrulev2 = move 1630 820, class:^(org.pulseaudio.pavucontrol)$ +windowrulev2 = monitor DP-1, class:^(org.pulseaudio.pavucontrol)$ +windowrulev2 = opacity 0.9, class:^(org.pulseaudio.pavucontrol)$ -windowrule = float, ^(org.pulseaudio.pavucontrol)$ -windowrule = size 696 570, ^(org.pulseaudio.pavucontrol)$ -windowrule = move 1630 820, ^(org.pulseaudio.pavucontrol)$ -windowrule = monitor DP-1, ^(org.pulseaudio.pavucontrol)$ - -windowrule = monitor HDMI-A-2, ^(xfreerdp)$ -windowrule = fullscreen, ^(xfreerdp)$ - -windowrulev2 = opacity 0.0 override,class:^(xwaylandvideobridge)$ -windowrulev2 = noanim,class:^(xwaylandvideobridge)$ -windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ -windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ -windowrulev2 = noblur,class:^(xwaylandvideobridge)$ +# XWayland Video Bridge - Unused +# windowrulev2 = opacity 0.0 override,class:^(xwaylandvideobridge)$ +# windowrulev2 = noanim,class:^(xwaylandvideobridge)$ +# windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ +# windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ +# windowrulev2 = noblur,class:^(xwaylandvideobridge)$ +# Vesktop windowrulev2 = opacity 0.9, class:^(vesktop)$ -windowrulev2 = opacity 0.9, class:^(org.telegram.desktop)$ -windowrulev2 = fullscreen,class:^(org.telegram.desktop)$,title:^(Media viewer)$ -windowrulev2 = float,class:^(org.telegram.desktop)$,title:^(Media viewer)$ -windowrulev2 = opaque,class:^(org.telegram.desktop)$,title:^(Media viewer)$ -windowrulev2 = opacity 0.9, class:^(Spotify)$ -windowrulev2 = opacity 0.9, class:^(org.gnome.Nautilus)$ -windowrulev2 = opacity 0.9, class:^(org.pulseaudio.pavucontrol)$ -windowrulev2=noblur,class:^()$,title:^()$ + +# Telegram +windowrulev2 = opacity 0.9, class:^(org.telegram.desktop)$ +windowrulev2 = maximize, class:^(org.telegram.desktop)$,title:^(Media viewer)$ +windowrulev2 = float, class:^(org.telegram.desktop)$,title:^(Media viewer)$ +windowrulev2 = opaque, class:^(org.telegram.desktop)$,title:^(Media viewer)$ + +# Nemo +windowrulev2 = float, class:^(nemo)$,title:^.*(Properties)$ +windowrulev2 = opacity 0.9, class:^(nemo)$ + +# Firefox library (Downloads, History, etc.) +windowrulev2 = float, class:^(zen-alpha)$,title:^(Library)$ +windowrulev2 = opacity 0.9, class:^(zen-alpha)$,title:^(Library)$ + +# Spotify +windowrulev2 = opacity 0.9, class:^(Spotify)$ +windowrulev2 = noblur, class:^()$,title:^()$ diff --git a/dot-config/hypr/wallpaper.png b/dot-config/hypr/wallpaper.png index 003cd00..e68d4ef 100644 Binary files a/dot-config/hypr/wallpaper.png and b/dot-config/hypr/wallpaper.png differ diff --git a/dot-config/nvim/lazy-lock.json b/dot-config/nvim/lazy-lock.json index 751ea5a..6838ac1 100644 --- a/dot-config/nvim/lazy-lock.json +++ b/dot-config/nvim/lazy-lock.json @@ -23,6 +23,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, + "tree-sitter-hyprlang": { "branch": "master", "commit": "6858695eba0e63b9e0fceef081d291eb352abce8" }, "ui": { "branch": "v3.0", "commit": "87578bb7e2bc106127f013f9a1edd7a716f4f6c6" }, "vim-tmux-navigator": { "branch": "master", "commit": "a9b52e7d36114d40350099f254b5f299a35df978" }, "volt": { "branch": "main", "commit": "43f72b49037c191eb3cfe26ba7a5574b4bfce226" }, diff --git a/dot-config/nvim/lua/options.lua b/dot-config/nvim/lua/options.lua index 73c3a7b..6e008c0 100644 --- a/dot-config/nvim/lua/options.lua +++ b/dot-config/nvim/lua/options.lua @@ -1,9 +1,14 @@ require "nvchad.options" -vim.o.tabstop = 4 -- A TAB character looks like 4 spaces -vim.o.expandtab = true -- Pressing the TAB key will insert spaces instead of a TAB character -vim.o.softtabstop = 4 -- Number of spaces inserted instead of a TAB character -vim.o.shiftwidth = 4 -- Number of spaces inserted when indenting --- add yours here! --- local o = vim.o --- o.cursorlineopt ='both' -- to enable cursorline! +local o = vim.o +o.tabstop = 4 -- A TAB character looks like 4 spaces +o.expandtab = true -- Pressing the TAB key will insert spaces instead of a TAB character +o.softtabstop = 4 -- Number of spaces inserted instead of a TAB character +o.shiftwidth = 4 -- Number of spaces inserted when indenting +o.cursorlineopt ='both' -- to enable cursorline! + +vim.filetype.add({ + extension = { + lnibuild = "bash" + } +}) diff --git a/dot-config/nvim/lua/plugins/init.lua b/dot-config/nvim/lua/plugins/init.lua index e72b215..d217f1d 100644 --- a/dot-config/nvim/lua/plugins/init.lua +++ b/dot-config/nvim/lua/plugins/init.lua @@ -1,7 +1,7 @@ return { { "stevearc/conform.nvim", - -- event = 'BufWritePre', -- uncomment for format on save + event = 'BufWritePre', -- uncomment for format on save config = function() require "configs.conform" end, @@ -47,9 +47,13 @@ return { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = { - "vim", "lua", "vimdoc", + "vim", "lua", "vimdoc", "html", "css" }, }, }, + { + "luckasRanarison/tree-sitter-hyprlang", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + }, } diff --git a/dot-config/vesktop/settings/settings.json b/dot-config/vesktop/settings/settings.json index df2e40c..24c1ca2 100644 --- a/dot-config/vesktop/settings/settings.json +++ b/dot-config/vesktop/settings/settings.json @@ -223,7 +223,12 @@ "enabled": true }, "ImageZoom": { - "enabled": true + "enabled": true, + "size": 100, + "zoom": 2, + "nearestNeighbour": false, + "square": false, + "saveZoomValues": true }, "ImplicitRelationships": { "enabled": false @@ -605,6 +610,6 @@ "authenticated": true, "url": "https://api.vencord.dev/", "settingsSync": true, - "settingsSyncVersion": 1729847132463 + "settingsSyncVersion": 1730556132483 } } \ No newline at end of file diff --git a/dot-config/waybar/waybar.css b/dot-config/waybar/waybar.css index f8dd1bf..f96293c 100644 --- a/dot-config/waybar/waybar.css +++ b/dot-config/waybar/waybar.css @@ -9,14 +9,14 @@ window#waybar { background-color: transparent; -/* background: @mantle; */ +/* background: @base; */ transition-property: background-color; transition-duration: .5s; border-radius: 15px; } #workspaces { - background-color: @base; + background-color: @mantle; margin: 3px 5px 3px 5px; padding: 3px; border-radius: 12px; @@ -29,26 +29,26 @@ window#waybar { border-radius: 10px; } #workspaces button { - background-color: @base; + background-color: @mantle; color: @text; } #workspaces button:hover { background-color: @lavender; - color: @mantle; + color: @base; } #workspaces button.active { background-color: @blue; - color: @mantle + color: @base } #workspaces button.active:hover { background-color: @blue; - color: @mantle; + color: @base; } #custom-power, #custom-runner, #wireplumber, #wireplumber.muted, #tray, #language, #clock { - background: @base; + background: @mantle; border-radius: 12px; color: @text; margin: 3px 2.5px 3px 2.5px;