From d9aa82f607b955fde7b8f83744097d8dfec90760 Mon Sep 17 00:00:00 2001 From: Xander Swan Date: Wed, 3 Dec 2025 10:00:41 -0500 Subject: removed cringe --- .config/alacritty/alacritty.yml | 2 +- .config/i3/config | 35 +++++++++++++++++++++++++--------- .config/i3/i3blocks.conf | 24 +++++++++++------------ .config/i3/music.lua | 8 ++++---- .config/i3/music.sh | 20 ------------------- .config/nvim/lua/map.lua | 6 +++--- .config/nvim/lua/plugin/autopairs.lua | 2 +- .config/nvim/lua/plugin/packer.lua | 17 +++++++++-------- .config/nvim/lua/plugin/presence.lua | 4 ++-- .config/nvim/lua/plugin/setup.lua | 1 - .config/nvim/lua/plugin/treesitter.lua | 6 +++++- .config/nvim/lua/set.lua | 2 ++ 12 files changed, 65 insertions(+), 62 deletions(-) delete mode 100644 .config/i3/music.sh diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 1c3f557..7a5cf95 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -3,7 +3,7 @@ window: padding: x: 10 y: 10 - opacity: 1.0 + opacity: 1 colors: primary: diff --git a/.config/i3/config b/.config/i3/config index fddda7f..c6a5693 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -11,7 +11,7 @@ # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:Maple Mono NF 8 +font pango:Mononoki Nerd Font Mono 10 # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). @@ -86,10 +86,10 @@ bindsym $mod+$up focus up bindsym $mod+$right focus right # alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right +# bindsym $mod+Left focus left +# bindsym $mod+Down focus down +# bindsym $mod+Up focus up +# bindsym $mod+Right focus right # move focused window bindsym $mod+Shift+$left move left @@ -98,10 +98,10 @@ bindsym $mod+Shift+$up move up bindsym $mod+Shift+$right move right # alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right +# bindsym $mod+Shift+Left move left +# bindsym $mod+Shift+Down move down +# bindsym $mod+Shift+Up move up +# bindsym $mod+Shift+Right move right # split in horizontal orientation bindsym $mod+g split h @@ -207,10 +207,27 @@ mode "resize" { bindsym $mod+r mode "resize" +set $yellow #ffd866 +set $dyellow #f48f3d +set $gray #333333 +set $lgray #888888 +set $black #000000 +set $white #ffffff + +# class border backgr. text indicator child_border +client.focused $yellow $yellow $black #2e9ef4 $dyellow +client.focused_inactive $dyellow $dyellow $black #484e50 $gray +client.unfocused $gray $gray $lgray #292d2e $gray +client.urgent #2f343a #900000 #ffffff #900000 #900000 +client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c + +client.background #ffffff + # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { status_command i3blocks -c ~/.config/i3/i3blocks.conf + # mode hide colors { diff --git a/.config/i3/i3blocks.conf b/.config/i3/i3blocks.conf index 981c368..c83d8c3 100644 --- a/.config/i3/i3blocks.conf +++ b/.config/i3/i3blocks.conf @@ -2,12 +2,12 @@ full_text= align=center separator=false -separator_block_width=1 +separator_block_width=0 [time] instance=ny TZ=America/New_York -command=date +" %H:%M " +command=date +"  %H:%M " interval=1 background=#99FFFF color=#000000 @@ -15,31 +15,31 @@ color=#000000 [date] instance=ny TZ=America/New_York -command=date +" %y/%m/%d %b " +command=date +"  %y/%m/%d %b " interval=3600 background=#999999 color=#000000 [packages] -command=echo " PKGS: $(pacman -Q | wc -l) " +command=echo "  $(pacman -Q | wc -l) " interval=3600 background=#FF9999 color=#000000 [volume] -command=echo " VOLUME: $(pactl get-sink-volume @DEFAULT_SINK@ | awk -F"/" '{print $2}' | xargs) " +command=echo " 󰕾 $(pactl get-sink-volume @DEFAULT_SINK@ | awk -F"/" '{print $2}' | xargs) " interval=repeat background=#55CC77 color=#000000 -[music] -command=lua ~/.config/i3/music.lua -interval=2 -background=#99FF99 -color=#000000 - [weather] -command=echo " $(curl -Ss 'https://wttr.in?0&T&Q&M' | cut -c 16- | head -2 | xargs) " +command=echo " 󰖐 $(curl -Ss 'https://wttr.in?0&T&Q&M' | cut -c 16- | head -2 | xargs) " interval=3600 background=#009999 color=#000000 + +[media] +command=lua ~/.config/i3/music.lua +interval=2 +background=#99FF99 +color=#000000 diff --git a/.config/i3/music.lua b/.config/i3/music.lua index 1960f9b..5f60a4b 100644 --- a/.config/i3/music.lua +++ b/.config/i3/music.lua @@ -10,9 +10,9 @@ if #album ~= 0 then end if status == "Playing" then - print((" Playing | %s by %s %s"):format(song, artist, album)) + print((" 󰐊 Playing | %s by %s %s"):format(song, artist, album)) elseif status == "Paused" then - print((" Paused | %s by %s %s"):format(song, artist, album)) + print(("  Paused | %s by %s %s"):format(song, artist, album)) else - print((" Stopped "):format(status)) -end \ No newline at end of file + print(("  Stopped "):format(status)) +end diff --git a/.config/i3/music.sh b/.config/i3/music.sh deleted file mode 100644 index d678ed1..0000000 --- a/.config/i3/music.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -status=$(playerctl status) -song=$(playerctl metadata title) -album=" (`playerctl metadata album`)" - -if [ "$album" == " ()" ] -then - album="" -fi - -if [ $status = "Playing" ] -then - echo " Playing | $song$album by $(playerctl metadata artist) " -elif [ $status = "Paused" ] -then - echo " Paused | $song$album by $(playerctl metadata artist) " -else - echo " Stopped " -fi \ No newline at end of file diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua index 9784d79..5779888 100644 --- a/.config/nvim/lua/map.lua +++ b/.config/nvim/lua/map.lua @@ -4,15 +4,15 @@ vim.keymap.set("n", "n", [[:Ex]], {}) vim.keymap.set("n", "g", [[:Git]], {}) vim.keymap.set("n", "to", [[:TermOpen]], {}) vim.keymap.set("n", "c", [[:noh]], {}) -vim.keymap.set("n", "zm", [[:ZenMode]], {}) +vim.keymap.set("n", "e", [[:TroubleToggle]]) vim.keymap.set("n", "", "h", {}) vim.keymap.set("n", "", "j", {}) vim.keymap.set("n", "", "k", {}) vim.keymap.set("n", "", "l", {}) -vim.keymap.set("n", "", "zz", {}) -vim.keymap.set("n", "", "zz", {}) +vim.keymap.set({ "v", "n" }, ".", "zz", {}) +vim.keymap.set({ "v", "n" }, ",", "zz", {}) vim.keymap.set("o", "as", "a\"", {}) vim.keymap.set("o", "is", "i\"", {}) diff --git a/.config/nvim/lua/plugin/autopairs.lua b/.config/nvim/lua/plugin/autopairs.lua index c30a37d..ab924aa 100644 --- a/.config/nvim/lua/plugin/autopairs.lua +++ b/.config/nvim/lua/plugin/autopairs.lua @@ -2,7 +2,7 @@ require("nvim-autopairs").setup { fast_wrap = { map = "", - chars = { "{", "[", "(", "\"", "'" }, + chars = { "<", "{", "[", "(", "\"", "'" }, pattern = [=[[%"%"%>%]%)%}%,]]=], end_key = "$", keys = "qwertyuiopzxcvbnmasdfghjkl", diff --git a/.config/nvim/lua/plugin/packer.lua b/.config/nvim/lua/plugin/packer.lua index ced5ac6..3f2bfa3 100644 --- a/.config/nvim/lua/plugin/packer.lua +++ b/.config/nvim/lua/plugin/packer.lua @@ -1,7 +1,6 @@ return require("packer").startup(function(use) use 'wbthomason/packer.nvim' - - use { "ThePrimeagen/vim-be-good" } + use 'christoomey/vim-tmux-navigator' use { "kyazdani42/nvim-tree.lua", @@ -17,6 +16,12 @@ return require("packer").startup(function(use) use { "Yggdroot/indentLine" } use { "windwp/nvim-autopairs" } use { "airblade/vim-gitgutter" } + use { + "folke/trouble.nvim", + requires = { + { "nvim-tree/nvim-web-devicons" }, + } + } use { "weedatom/presence.nvim" } use { "mhinz/vim-startify" } @@ -26,7 +31,7 @@ return require("packer").startup(function(use) requires = { "kyazdani42/nvim-web-devicons", opt = true } } use { "numToStr/Comment.nvim" } - use { "folke/zen-mode.nvim" } + use { "HiPhish/nvim-ts-rainbow2" } use { 'VonHeikemen/lsp-zero.nvim', @@ -53,13 +58,9 @@ return require("packer").startup(function(use) use { "loctvl842/monokai-pro.nvim", config = function() - vim.cmd("colorscheme monokai-pro") + vim.cmd("colorscheme monokai-pro-spectrum") end } - use { - "catppuccin/nvim", - as = "catppuccin", - } use { "nvim-treesitter/nvim-treesitter", diff --git a/.config/nvim/lua/plugin/presence.lua b/.config/nvim/lua/plugin/presence.lua index 46369be..cd36909 100644 --- a/.config/nvim/lua/plugin/presence.lua +++ b/.config/nvim/lua/plugin/presence.lua @@ -1,6 +1,6 @@ -require("presence").setup{ +require("presence").setup { auto_update = true, - neovim_image_text = "The One True Text Editor", + neovim_image_text = "Neovim", main_image = "neovim", log_level = nil, debounce_timeout = 10, diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua index 6df7774..018ed01 100644 --- a/.config/nvim/lua/plugin/setup.lua +++ b/.config/nvim/lua/plugin/setup.lua @@ -1,6 +1,5 @@ -- require("nvim-tree").setup {} require("Comment").setup {} -require("zen-mode").setup {} require("plugin.treesitter") require("plugin.presence") diff --git a/.config/nvim/lua/plugin/treesitter.lua b/.config/nvim/lua/plugin/treesitter.lua index a6a4bf8..e14a975 100644 --- a/.config/nvim/lua/plugin/treesitter.lua +++ b/.config/nvim/lua/plugin/treesitter.lua @@ -5,5 +5,9 @@ require("nvim-treesitter.configs").setup { enable = true, additional_vim_regex_highlighting = true, }, - indent = { enable = true }, + indent = { enable = false }, + rainbow = { + enable = true, + } } + diff --git a/.config/nvim/lua/set.lua b/.config/nvim/lua/set.lua index 88816af..8ffacd6 100644 --- a/.config/nvim/lua/set.lua +++ b/.config/nvim/lua/set.lua @@ -24,3 +24,5 @@ vim.opt.splitbelow = true vim.opt.cc = "80" vim.opt.mouse = "" + +vim.cmd("highlight Normal guibg=none") -- cgit v1.3-2-g0d8e