diff options
28 files changed, 319 insertions, 77 deletions
diff --git a/bash/.bash_profile b/bash/.bash_profile index fe4ba32..ca83a8c 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -1,4 +1,4 @@ -# Startx +# start x if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then exec startx fi diff --git a/bash/.bashrc b/bash/.bashrc index f6ce5bf..2b9fc57 100755 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -34,6 +34,7 @@ alias stw="stow -v --target=$HOME" alias clip="xclip -selection clipboard" alias diff="diff --color=auto" +alias fsu="lsblk -f" alias grep="grep --color=auto" alias hss="hugo server --noHTTPCache" alias ip="ip --color=auto" @@ -47,6 +48,9 @@ alias yp="pwd | clip" alias ytdl="yt-dlp" alias zeit="tty-clock -C 1 -f %d.%m.%Y -sc" +# Remove these directories, if some pesky program created them again. I have better things to do. +rmdir $HOME/Desktop $HOME/Documents $HOME/Downloads $HOME/Images $HOME/Music $HOME/Templates $HOME/Video 2> /dev/null + export PS1='[\001\e[0;36m\002\j\001\e[0m\002] [ \001\e[0;34m\002\u\001\e[0m\002@\001\e[0;34m\002\h\001\e[0m\002 ] \001\e[0;35m\002\W\001\e[0m\002 \$ ' # Enable wal colors, if terminal emulator is 'st' diff --git a/fcitx5/.config/fcitx5/conf/clipboard.conf b/fcitx5/.config/fcitx5/conf/clipboard.conf new file mode 100644 index 0000000..0240c1c --- /dev/null +++ b/fcitx5/.config/fcitx5/conf/clipboard.conf @@ -0,0 +1,8 @@ +# Paste Primary +PastePrimaryKey= +# Number of entries +Number of entries=5 + +[TriggerKey] +0=Super+O + diff --git a/fcitx5/.config/fcitx5/config b/fcitx5/.config/fcitx5/config index 5584002..1cd8545 100644 --- a/fcitx5/.config/fcitx5/config +++ b/fcitx5/.config/fcitx5/config @@ -23,10 +23,10 @@ ActivateKeys= 0=Hangul_Romaja [Hotkey/PrevPage] -0=Up +0=K [Hotkey/NextPage] -0=Down +0=J [Hotkey/PrevCandidate] 0=Shift+Tab @@ -64,4 +64,10 @@ EnabledAddons= DisabledAddons= # Preload input method to be used by default PreloadInputMethod=True +# Allow input method in the password field +AllowInputMethodForPassword=False +# Show preedit text when typing password +ShowPreeditForPassword=False +# Interval of saving user data in minutes +AutoSavePeriod=30 diff --git a/fcitx5/.config/fcitx5/profile b/fcitx5/.config/fcitx5/profile index a25cdd5..9403a49 100644 --- a/fcitx5/.config/fcitx5/profile +++ b/fcitx5/.config/fcitx5/profile @@ -1,20 +1,35 @@ [Groups/0] +# Group Name Name="Group 1" +# Layout Default Layout=us -DefaultIM=keyboard-us +# Default Input Method +DefaultIM=m17n_el_kbd [Groups/0/Items/0] +# Name Name=keyboard-us -Layout=us +# Layout +Layout= [Groups/0/Items/1] +# Name Name=m17n_ru_phonetic +# Layout Layout=us [Groups/0/Items/2] +# Name Name=kkc +# Layout Layout=us +[Groups/0/Items/3] +# Name +Name=m17n_el_kbd +# Layout +Layout= + [GroupOrder] 0="Group 1" diff --git a/ncmpcpp/.config/ncmpcpp/config b/ncmpcpp/.config/ncmpcpp/config index 95cba8b..81b911e 100644 --- a/ncmpcpp/.config/ncmpcpp/config +++ b/ncmpcpp/.config/ncmpcpp/config @@ -105,6 +105,7 @@ visualizer_type = spectrum #visualizer_autoscale = no # visualizer_look = "◆▋" +# visualizer_look = "##" # #visualizer_color = blue, cyan, green, yellow, magenta, red # @@ -121,15 +122,15 @@ visualizer_look = "◆▋" ## and visualizer_in_stereo set, artifacts may be visible on the bottom half of ## the visualization. # -#visualizer_spectrum_smooth_look = yes +visualizer_spectrum_smooth_look = yes # ## A value between 1 and 5 inclusive. Specifying a larger value makes the ## visualizer look at a larger slice of time, which results in less jumpy ## visualizer output. # -#visualizer_spectrum_dft_size = 2 +visualizer_spectrum_dft_size = 1 # -#visualizer_spectrum_gain = 10 +visualizer_spectrum_gain = 10 # ## Left-most frequency of visualizer in Hz, must be less than HZ MAX # diff --git a/neovim/.config/nvim/lua/keybinds.lua b/neovim/.config/nvim/lua/keybinds.lua index d84e5e4..8eb7ead 100644 --- a/neovim/.config/nvim/lua/keybinds.lua +++ b/neovim/.config/nvim/lua/keybinds.lua @@ -38,11 +38,10 @@ map("n", "<leader>y", "<cmd>!echo $(pwd)/% | xclip -selection clipboard<CR>") map("n", "<C-c>", ":!compile %<cr><cr>") -- Move to the next/previous buffer --- map("n", "<leader>[", "<CMD>bp<CR>") --- map("n", "<leader>]", "<CMD>bn<CR>") - --- Move to last buffer --- map("n", """", "<CMD>b#<CR>") +map("n", "<leader>[", "<CMD>bp<CR>") +map("n", "<leader>]", "<CMD>bn<CR>") +-- Close current buffer +map("n", "<leader>\\", "<CMD>bd<CR>") -- Telescope binds local Telescope = setmetatable({}, { @@ -57,9 +56,9 @@ local Telescope = setmetatable({}, { -- Help map("n", "<leader>fh", Telescope.help_tags) -- Files with match -map("n", "<leader>ff", Telescope.live_grep) +map("n", "<leader>fp", Telescope.live_grep) -- Project files -map("n", "<leader>fp", Telescope.find_files) +map("n", "<leader>ff", Telescope.find_files) -- Changed git files map("n", "<leader>fc", Telescope.git_status) -- Git files diff --git a/neovim/.config/nvim/lua/plugins.lua b/neovim/.config/nvim/lua/plugins.lua index bcd87cc..4afe83b 100644 --- a/neovim/.config/nvim/lua/plugins.lua +++ b/neovim/.config/nvim/lua/plugins.lua @@ -5,6 +5,8 @@ vim.api.nvim_create_autocmd("BufWritePost", { command = "source <afile> | PackerCompile", }) +-- TODO: Add: https://github.com/ptzz/lf.vim + return require("packer").startup(function(use) use("wbthomason/packer.nvim") use("nvim-lua/plenary.nvim") @@ -19,6 +21,12 @@ return require("packer").startup(function(use) config = function() require("plugins.catppuccin") end, }) + use({ + "norcalli/nvim-colorizer.lua", + run = ":ColorizerAttachToBuffer", + config = function() require("plugins.colorizer") end, + }) + --[[ use({ "projekt0n/github-nvim-theme", config = function() require("plugins.github-theme") end, @@ -36,6 +44,12 @@ return require("packer").startup(function(use) after = "lualine.nvim", config = function() require("plugins.fidget") end, }, + { + 'akinsho/bufferline.nvim', + after = "catppuccin-theme", + requires = 'nvim-tree/nvim-web-devicons', + config = function() require("plugins.bufferline") end, + }, }) -- Better syntax highlighting diff --git a/neovim/.config/nvim/lua/plugins/bufferline.lua b/neovim/.config/nvim/lua/plugins/bufferline.lua new file mode 100644 index 0000000..c8df72f --- /dev/null +++ b/neovim/.config/nvim/lua/plugins/bufferline.lua @@ -0,0 +1,44 @@ +local macchiato = require("catppuccin.palettes").get_palette("macchiato") +local bufferline = require("bufferline") +bufferline.setup({ + highlights = require("catppuccin.groups.integrations.bufferline").get({ + styles = { "bold" }, + custom = { + all = { + fill = { bg = macchiato.crust }, + background = { bg = macchiato.crust }, + separator = { + fg = macchiato.crust, + bg = macchiato.crust + }, + separator_selected = { + fg = macchiato.crust + }, + } + }, + }), + options = { + style_preset = bufferline.style_preset.no_italic, + close_command = nil, + right_mouse_command = nil, + left_mouse_command = nil, + middle_mouse_command = nil, + modified_icon = '●', + diagnostics = false, + diagnostics_update_in_insert = false, + color_icons = false, + show_buffer_icons = false, + show_buffer_close_icons = false, + show_close_icon = false, + show_tab_indicators = true, + show_duplicate_prefix = true, + persist_buffer_sort = true, + move_wraps_at_ends = false, + separator_style = "thick", + -- enforce_regular_tabs = false | true, + -- always_show_bufferline = true | false, + hover = { + enabled = false, + }, + } +}) diff --git a/neovim/.config/nvim/lua/plugins/colorizer.lua b/neovim/.config/nvim/lua/plugins/colorizer.lua new file mode 100644 index 0000000..6f9379a --- /dev/null +++ b/neovim/.config/nvim/lua/plugins/colorizer.lua @@ -0,0 +1,4 @@ +require('colorizer').setup({ + '*'; + css = { rgb_fn = true; hsl_fn = true; }; +}, { names = false }) diff --git a/neovim/.config/nvim/lua/plugins/lualine.lua b/neovim/.config/nvim/lua/plugins/lualine.lua index 46ad4f0..1a82da6 100644 --- a/neovim/.config/nvim/lua/plugins/lualine.lua +++ b/neovim/.config/nvim/lua/plugins/lualine.lua @@ -15,7 +15,7 @@ require("lualine").setup({ { "diff", colored = false }, }, lualine_c = { - { "filename", file_status = true }, + -- { "filename", file_status = true }, { "diagnostics" }, }, lualine_x = { diff --git a/neovim/.config/nvim/lua/plugins/telescope.lua b/neovim/.config/nvim/lua/plugins/telescope.lua index 2b34bb2..8b8bc72 100644 --- a/neovim/.config/nvim/lua/plugins/telescope.lua +++ b/neovim/.config/nvim/lua/plugins/telescope.lua @@ -28,4 +28,9 @@ require("telescope").setup({ case_mode = "smart_case", }, }, + pickers = { + find_files = { + disable_devicons = true + }, + }, }) diff --git a/neovim/.config/nvim/lua/settings.lua b/neovim/.config/nvim/lua/settings.lua index eca7088..ac9ccc9 100644 --- a/neovim/.config/nvim/lua/settings.lua +++ b/neovim/.config/nvim/lua/settings.lua @@ -11,6 +11,8 @@ o.cursorline = true o.relativenumber = true o.numberwidth = 4 +o.termguicolors = true + o.signcolumn = "yes:1" -- o.colorcolumn = "80" o.shortmess = o.shortmess .. "c" diff --git a/neovim/.config/nvim/plugin/packer_compiled.lua b/neovim/.config/nvim/plugin/packer_compiled.lua index 64b453f..ffda93a 100644 --- a/neovim/.config/nvim/plugin/packer_compiled.lua +++ b/neovim/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +local package_path_str = "/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/share/lua/5.1/?.lua;/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/share/lua/5.1/?/init.lua;/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/lib/luarocks/rocks-5.1/?.lua;/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -82,9 +82,19 @@ _G.packer_plugins = { path = "/home/me/.local/share/nvim/site/pack/packer/opt/Comment.nvim", url = "https://github.com/numToStr/Comment.nvim" }, + ["bufferline.nvim"] = { + config = { "\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.bufferline\frequire\0" }, + load_after = {}, + loaded = true, + needs_bufread = false, + path = "/home/me/.local/share/nvim/site/pack/packer/opt/bufferline.nvim", + url = "https://github.com/akinsho/bufferline.nvim" + }, ["catppuccin-theme"] = { + after = { "bufferline.nvim" }, config = { "\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.catppuccin\frequire\0" }, loaded = true, + only_config = true, path = "/home/me/.local/share/nvim/site/pack/packer/start/catppuccin-theme", url = "https://github.com/catppuccin/nvim" }, @@ -184,13 +194,19 @@ _G.packer_plugins = { url = "https://github.com/windwp/nvim-autopairs" }, ["nvim-cmp"] = { - after = { "cmp-nvim-lsp", "nvim-autopairs", "cmp-vsnip", "vim-vsnip", "rust-tools.nvim", "cmp-buffer", "cmp-path" }, + after = { "cmp-vsnip", "cmp-nvim-lsp", "cmp-path", "nvim-autopairs", "rust-tools.nvim", "cmp-buffer", "vim-vsnip" }, config = { "\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.cmp\frequire\0" }, loaded = true, only_config = true, path = "/home/me/.local/share/nvim/site/pack/packer/start/nvim-cmp", url = "https://github.com/hrsh7th/nvim-cmp" }, + ["nvim-colorizer.lua"] = { + config = { "\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins.colorizer\frequire\0" }, + loaded = true, + path = "/home/me/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua", + url = "https://github.com/norcalli/nvim-colorizer.lua" + }, ["nvim-lspconfig"] = { after = { "mason-lspconfig.nvim" }, config = { "\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.lsp\frequire\0" }, @@ -200,7 +216,7 @@ _G.packer_plugins = { url = "https://github.com/neovim/nvim-lspconfig" }, ["nvim-treesitter"] = { - after = { "nvim-treesitter-textobjects", "playground", "nvim-treesitter-refactor" }, + after = { "nvim-treesitter-textobjects", "nvim-treesitter-refactor", "playground" }, config = { "\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.treesitter\frequire\0" }, loaded = false, needs_bufread = false, @@ -226,6 +242,11 @@ _G.packer_plugins = { path = "/home/me/.local/share/nvim/site/pack/packer/opt/nvim-treesitter-textobjects", url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects" }, + ["nvim-web-devicons"] = { + loaded = true, + path = "/home/me/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + url = "https://github.com/nvim-tree/nvim-web-devicons" + }, ["packer.nvim"] = { loaded = true, path = "/home/me/.local/share/nvim/site/pack/packer/start/packer.nvim", @@ -285,14 +306,10 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: todo-comments.nvim -time([[Config for todo-comments.nvim]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25plugins.todocomments\frequire\0", "config", "todo-comments.nvim") -time([[Config for todo-comments.nvim]], false) --- Config for: nvim-lspconfig -time([[Config for nvim-lspconfig]], true) -try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.lsp\frequire\0", "config", "nvim-lspconfig") -time([[Config for nvim-lspconfig]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) -- Config for: catppuccin-theme time([[Config for catppuccin-theme]], true) try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.catppuccin\frequire\0", "config", "catppuccin-theme") @@ -301,14 +318,22 @@ time([[Config for catppuccin-theme]], false) time([[Config for telescope.nvim]], true) try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins.telescope\frequire\0", "config", "telescope.nvim") time([[Config for telescope.nvim]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) -- Config for: flutter-tools.nvim time([[Config for flutter-tools.nvim]], true) try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18flutter-tools\frequire\0", "config", "flutter-tools.nvim") time([[Config for flutter-tools.nvim]], false) +-- Config for: nvim-lspconfig +time([[Config for nvim-lspconfig]], true) +try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.lsp\frequire\0", "config", "nvim-lspconfig") +time([[Config for nvim-lspconfig]], false) +-- Config for: todo-comments.nvim +time([[Config for todo-comments.nvim]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25plugins.todocomments\frequire\0", "config", "todo-comments.nvim") +time([[Config for todo-comments.nvim]], false) +-- Config for: nvim-colorizer.lua +time([[Config for nvim-colorizer.lua]], true) +try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins.colorizer\frequire\0", "config", "nvim-colorizer.lua") +time([[Config for nvim-colorizer.lua]], false) -- Load plugins in order defined by `after` time([[Sequenced loading]], true) vim.cmd [[ packadd telescope-fzf-native.nvim ]] @@ -316,28 +341,33 @@ vim.cmd [[ packadd telescope-fzf-native.nvim ]] -- Config for: telescope-fzf-native.nvim try_loadstring("\27LJ\2\nH\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0'\2\3\0B\0\2\1K\0\1\0\bfzf\19load_extension\14telescope\frequire\0", "config", "telescope-fzf-native.nvim") +vim.cmd [[ packadd bufferline.nvim ]] + +-- Config for: bufferline.nvim +try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.bufferline\frequire\0", "config", "bufferline.nvim") + vim.cmd [[ packadd mason-lspconfig.nvim ]] vim.cmd [[ packadd mason.nvim ]] -- Config for: mason.nvim try_loadstring("\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18plugins.mason\frequire\0", "config", "mason.nvim") +vim.cmd [[ packadd cmp-path ]] +vim.cmd [[ packadd cmp-vsnip ]] vim.cmd [[ packadd rust-tools.nvim ]] -- Config for: rust-tools.nvim try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.rust-tools\frequire\0", "config", "rust-tools.nvim") vim.cmd [[ packadd vim-vsnip ]] -vim.cmd [[ packadd cmp-vsnip ]] -vim.cmd [[ packadd cmp-buffer ]] -vim.cmd [[ packadd cmp-path ]] vim.cmd [[ packadd cmp-nvim-lsp ]] +vim.cmd [[ packadd cmp-buffer ]] time([[Sequenced loading]], false) vim.cmd [[augroup packer_load_aucmds]] vim.cmd [[au!]] -- Event lazy-loads time([[Defining lazy-load event autocommands]], true) -vim.cmd [[au BufEnter * ++once lua require("packer.load")({'Comment.nvim', 'nvim-treesitter', 'lualine.nvim', 'gitsigns.nvim'}, { event = "BufEnter *" }, _G.packer_plugins)]] +vim.cmd [[au BufEnter * ++once lua require("packer.load")({'gitsigns.nvim', 'nvim-treesitter', 'lualine.nvim', 'Comment.nvim'}, { event = "BufEnter *" }, _G.packer_plugins)]] vim.cmd [[au InsertCharPre * ++once lua require("packer.load")({'nvim-autopairs'}, { event = "InsertCharPre *" }, _G.packer_plugins)]] time([[Defining lazy-load event autocommands]], false) vim.cmd("augroup END") diff --git a/pywal/.config/wal/templates/colors-css.css b/pywal/.config/wal/templates/colors-css.css new file mode 100644 index 0000000..c8ca1df --- /dev/null +++ b/pywal/.config/wal/templates/colors-css.css @@ -0,0 +1,29 @@ +/* CSS variables Generated by 'wal' */ +:root { + --wallpaper: url({wallpaper}); + + /* Special */ + --background: {background}; + --foreground: {foreground}; + --primary: {primary}; + --accent: {accent}; + --cursor: {cursor}; + + /* Colors */ + --color0: {color0}; + --color1: {color1}; + --color2: {color2}; + --color3: {color3}; + --color4: {color4}; + --color5: {color5}; + --color6: {color6}; + --color7: {color7}; + --color8: {color8}; + --color9: {color9}; + --color10: {color10}; + --color11: {color11}; + --color12: {color12}; + --color13: {color13}; + --color14: {color14}; + --color15: {color15}; +} diff --git a/pywal/.config/wal/templates/dunstrc b/pywal/.config/wal/templates/dunstrc index 641af0c..0cca888 100644 --- a/pywal/.config/wal/templates/dunstrc +++ b/pywal/.config/wal/templates/dunstrc @@ -113,7 +113,7 @@ ### Text ### - font = JetBrains Mono 8 + font = JetBrainsMono Nerd Font 10 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/pywal/.config/wal/templates/zathurarc b/pywal/.config/wal/templates/zathurarc index 31f1c78..33a2675 100644 --- a/pywal/.config/wal/templates/zathurarc +++ b/pywal/.config/wal/templates/zathurarc @@ -10,7 +10,7 @@ set window-title-page false set recolor false set guioptions "v" -set font "JetBrains Mono normal 8" +set font "JetBrainsMono NF Regular 10" set default-bg "{background}" set highlight-color "{foreground}" diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py index c097087..82b8319 100644 --- a/qutebrowser/.config/qutebrowser/config.py +++ b/qutebrowser/.config/qutebrowser/config.py @@ -4,19 +4,34 @@ config.bind("<Ctrl-J>", "tab-next") config.bind("<Ctrl-K>", "tab-prev") from utils import * +import subprocess -command = ["xterm", "-fa", "JetBrainsMono", "-fs", "8", "-e", "ranger", "--choosefile={}"] +def read_xresources(prefix): + props = {} + x = subprocess.run(['xrdb', '-query'], capture_output=True, check=True, text=True) + lines = x.stdout.split('\n') + for line in filter(lambda l : l.startswith(prefix), lines): + prop, _, value = line.partition(':\t') + props[prop] = value + return props -c.fileselect.handler = "external" -c.fileselect.multiple_files.command = command -c.fileselect.single_file.command = command -c.fileselect.folder.command = command +xresources = read_xresources('Xft') + +c.aliases["r"] = "session-load"; + +# command = ["xterm", "-fa", "JetBrainsMono NF", "-fs", "8", "-e", "ranger", "--choosefile={}"] + +# c.fileselect.handler = "external" +# c.fileselect.multiple_files.command = command +# c.fileselect.single_file.command = command +# c.fileselect.folder.command = command c.content.autoplay = False c.zoom.default = "100%" -c.fonts.default_size = "8pt" -c.fonts.default_family = "JetBrains Mono" +c.fonts.default_size = "14px" +# c.fonts.default_family = "JetBrainsMono NF" +c.fonts.default_family = xresources['Xft.fontname'] c.downloads.location.prompt = False c.downloads.location.remember = False diff --git a/qutebrowser/.config/qutebrowser/home.html b/qutebrowser/.config/qutebrowser/home.html index f6b4306..9f8b49c 100644 --- a/qutebrowser/.config/qutebrowser/home.html +++ b/qutebrowser/.config/qutebrowser/home.html @@ -10,11 +10,11 @@ padding: 0; width: 100%; height: 100%; - font-size: 12px; + font-size: 14px; box-sizing: border-box; color: var(--foreground); background: var(--background); - font-family: "JetBrains Mono"; + font-family: "JetBrainsMono NF"; } a { diff --git a/scripts/.local/bin/personal/bar/brightness b/scripts/.local/bin/personal/bar/brightness index b54de59..da28db3 100755 --- a/scripts/.local/bin/personal/bar/brightness +++ b/scripts/.local/bin/personal/bar/brightness @@ -5,10 +5,10 @@ # By David Penkowoj, 2021/06/24 # MTR_DEVICE="$MTR_DEVICE" -MTR_DEVICE="acpi_video0" +MTR_DEVICE="intel_backlight" KBD_DEVICE="smc::kbd_backlight" -MTR_VALUE=99 -KBD_VALUE=0 +MTR_VALUE=49 +KBD_VALUE= SWITCH="$1" @@ -31,7 +31,7 @@ case $SWITCH in "save") M="$(brightnessctl --device="$MTR_DEVICE" | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)" K="$(brightnessctl --device="$KBD_DEVICE" | grep -Eo "[0-9]+" | head -n 2 | tail -n 1)" - sed -i "s/MTR_VALUE=$MTR_VALUE/MTR_VALUE=$M/g" "$0" + sed -i "s/MTR_VALUE=49$MTR_VALUE/MTR_VALUE=49$M/g" "$0" sed -i "s/KBD_VALUE=$KBD_VALUE/KBD_VALUE=$K/g" "$0" ;; "smalldown") diff --git a/scripts/.local/bin/personal/bar/ischarging b/scripts/.local/bin/personal/bar/ischarging new file mode 100755 index 0000000..29d736b --- /dev/null +++ b/scripts/.local/bin/personal/bar/ischarging @@ -0,0 +1,15 @@ +#!/bin/bash + +acpireport="$(acpi | grep -v unavailable | head -n 1)" + +state="$(echo $acpireport | awk '{print $3}')" +percent="$(echo $acpireport | sed -n 's/.* \([0-9]\+\)%.*/\1/p')" + +if [[ "${state::-1}" != "Charging" ]]; then + if ((${percent} <= 75)); then + echo "PLUG IN CHARGER" + exit 1 + fi +fi + +exit 0 diff --git a/scripts/.local/bin/personal/bar/smallstatus b/scripts/.local/bin/personal/bar/smallstatus new file mode 100755 index 0000000..09ddd9f --- /dev/null +++ b/scripts/.local/bin/personal/bar/smallstatus @@ -0,0 +1,21 @@ +#!/bin/dash + +flash() { + second="$(date +'%s')" + + if [ $((second % 2)) = 1 ]; then + echo $1 + else + echo $2 + fi +} + +sep="|" + +message="$(volume) $sep $(network) $sep $(temp) $sep $(datetime)" + +if [ ischarging ]; then + echo "$message" +else + flash "NOT CHARGING" "$message" +fi diff --git a/scripts/.local/bin/personal/bar/status b/scripts/.local/bin/personal/bar/status index da46bf0..661b60f 100755 --- a/scripts/.local/bin/personal/bar/status +++ b/scripts/.local/bin/personal/bar/status @@ -12,12 +12,26 @@ use() { printf "%s^c%s^^b%s^ %s ^b%s^ %s ^b%s^" "$SEPARATOR" "$background" "$primary" "$1" "$accent" "$2" "$background" } +flash() { + second="$(date +'%s')" + + if [ "$3" = "1" ]; then + if [ $((second % 2)) = 1 ]; then + printf "%s^c%s^^b%s^ %s ^c%s^^b%s^ %s ^b%s^" "$SEPARATOR" "$color1" "$background" "$1" "$color1" "$background" "$2" "$background" + else + printf "%s^c%s^^b%s^ %s ^c%s^^b%s^ %s ^b%s^" "$SEPARATOR" "$background" "$color1" "$1" "$background" "$color1" "$2" "$background" + fi + else + echo "" + fi +} + # show in specified color if specified condition is true usecolorif() { if [ "$3" = "1" ]; then printf "%s^c%s^^b%s^ %s ^c%s^^b%s^ %s ^b%s^" "$SEPARATOR" "$primary" "$background" "$1" "$accent" "$background" "$2" "$background" else - use "$1" "$2" + echo "" fi } @@ -35,6 +49,7 @@ $(useif "" "$(mute shortstatus)")\ $(useif "" "$(volume)")\ $(useif "" "$(network)")\ $(use "" "$(load) | $(temp)")\ -$(use "" "$(battery)")\ +$(flash "" "$(ischarging)" "$(ischarging > /dev/null; echo $?)")\ $(use "" "$(datetime)")\ " +# $(use "" "$(battery)")\ diff --git a/scripts/.local/bin/personal/themes b/scripts/.local/bin/personal/themes index 1bce482..37805a7 100755 --- a/scripts/.local/bin/personal/themes +++ b/scripts/.local/bin/personal/themes @@ -1,6 +1,8 @@ #!/bin/bash -dir="$HOME/.config/wal/colorschemes/dark" -theme=$(ls $dir | dmenu) +dir="$HOME/.config/wal/colorschemes/" +scheme="$(ls $dir | dmenu)" -wally "$dir/$theme" +theme=$(ls "$dir/$scheme" | dmenu) + +wally "$dir/$scheme/$theme" diff --git a/scripts/.local/bin/personal/volctl b/scripts/.local/bin/personal/volctl index 0a3625f..628449e 100755 --- a/scripts/.local/bin/personal/volctl +++ b/scripts/.local/bin/personal/volctl @@ -2,22 +2,26 @@ # A script to manage the volume on my system universally -sink="$(pactl list short sinks | grep "pci-0000_00_1b.0" | awk '{print $1}')" +sink="$(pactl list short sinks | grep "pci-0000_00_1f.3" | awk '{print $1}')" volume="$(pamixer --get-volume)" +last_volume=45 -if [ "$1" = "increase" ] -then +if [ "$1" = "increase" ]; then pactl set-sink-volume "$sink" +5% -elif [ "$1" = "decrease" ] -then + volctl save +elif [ "$1" = "decrease" ]; then pactl set-sink-volume "$sink" -5% -elif [ "$1" = "mute" ] -then - # TODO: Make this a toggle with memory - pactl set-sink-volume "$sink" 0% -elif [ "$1" = "check" ] -then + volctl save +elif [ "$1" = "mute" ]; then + if [ "$volume" = "0" ]; then + pactl set-sink-volume "$sink" "$last_volume%" + else + pactl set-sink-volume "$sink" 0% + fi +elif [ "$1" = "save" ]; then + sed -i "s/last_volume=45$last_volume/last_volume=45$volume/g" "$0" +elif [ "$1" = "check" ]; then printf "%s\n" "$volume" -else +else printf "[ Error ] Not enough arguments.\n" fi diff --git a/xorg/.Xresources b/xorg/.Xresources index 2ed927f..836a597 100644 --- a/xorg/.Xresources +++ b/xorg/.Xresources @@ -1,6 +1,7 @@ #include ".cache/wal/colors.Xresources" -#define font "JetBrainsMono Nerd Font:size=19:pixelsize=24:antialias=true:autohint=true" +#define cfontname JetBrainsMono NF +#define cfont "JetBrainsMono NF:size=9:pixelsize=14:antialias=true:autohint=true" ! Terminal colors *.color0: c00 @@ -49,7 +50,9 @@ *.accent: cas *accent: cas -Xft.dpi: 220 +Xft.dpi: 96 +Xft.font: cfont +Xft.fontname: cfontname Xcursor.theme: capitaine-cursors-light @@ -60,7 +63,7 @@ dwm.selbordercolor: cps dwm.selbgcolor: cps dwm.selfgcolor: cbg -Nsxiv.bar.font: font +Nsxiv.bar.font: cfont Nsxiv.bar.background: cps Nsxiv.bar.foreground: cbg Nsxiv.mark.foreground: cps diff --git a/xorg/.config/env b/xorg/.config/env index 9521ca2..a33c61b 100644 --- a/xorg/.config/env +++ b/xorg/.config/env @@ -5,8 +5,8 @@ export XDG_CACHE_HOME="$HOME/.cache/" export XDG_SESSION_TYPE="x11" ### SCRIPTS -export PATH="$(find -L "$HOME/.local/bin/" -name '.*' -prune -o -type d -printf ':%p'):/opt/:$PATH" -export PATH="$PATH:$HOME/.local/share/gem/ruby/3.0.0/bin" +export PATH="$(find -L "$HOME/.local/bin/" -name '.*' -prune -o -type d -printf ':%p'):/opt/:/opt/android-sdk/platform-tools/:$PATH" +export PATH="$PATH:$HOME/.local/share/gem/ruby/3.0.0/bin:$HOME/.cargo/bin/" ### DEFAULTS export TERM="xterm" @@ -33,7 +33,7 @@ export FLUTTER_ROOT="$HOME/software/flutter/bin/flutter" export CHROME_EXECUTABLE="$(which brave)" export CHROME_PATH="$CHROME_EXECUTABLE" -export JAVA_HOME="/usr/lib/jvm/java-20-openjdk/" +export JAVA_HOME="/usr/lib/jvm/default/" export ANDROID_HOME="sdkmanager" export ANDROID_HOME="/opt/android-sdk" export ANDROID_SDK_ROOT="/opt/android-sdk" diff --git a/xorg/.xinitrc b/xorg/.xinitrc index 09ca67a..d51a201 100755 --- a/xorg/.xinitrc +++ b/xorg/.xinitrc @@ -1,9 +1,10 @@ #!/bin/bash setxkbmap us -. "$HOME/.screenlayout/home.sh" +# . "$HOME/.screenlayout/newhome.sh" feh --bg-fill "$HOME/.config/wallpaper" +# should this be in .profile / .bash_profile ? env_file="$HOME/.config/env" modmap_file="$HOME/.Xmodmap" resources_file="$HOME/.Xresources" @@ -24,10 +25,14 @@ eval $(/usr/bin/gnome-keyring-daemon --start) && export SSH_AUTH_SOCK updates check & -unclutter -idle 1 & -brightness load & +# move this to .local/bin/autostart ? +# or .xsession +# unclutter -idle 1 & +# brightness load & +# otd-daemon & clipmenud & fcitx5 -d & +# syncthing --no-browser & slstatus & # plank & dunst & @@ -35,6 +40,7 @@ picom & [ ! -s "$HOME/.config/mpd/pid" ] && mpd & +# exec dwl # 2> "$HOME/dwm.log" exec dwm # 2> "$HOME/dwm.log" # exec leftwm # exec awesome |