[MAJOR] Added a theme change in rofi script. Need to add rofi itself and other stuff still
This commit is contained in:
parent
b41b0b00d6
commit
95fddf371b
14 changed files with 157 additions and 37 deletions
|
@ -15,7 +15,6 @@ fish_add_path $HOME/.cargo/bin
|
|||
fish_add_path $HOME/.ghcup/bin
|
||||
fish_add_path /usr/bin/vendor_perl
|
||||
|
||||
source ~/.config/fish/myfunctions/code.fish
|
||||
source ~/.config/fish/myfunctions/dotfiles.fish
|
||||
source ~/.config/fish/myfunctions/pacman.fish
|
||||
source ~/.config/fish/myfunctions/qol.fish
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
function vim
|
||||
nvim $argv
|
||||
end
|
||||
|
||||
function ta
|
||||
tmux attach
|
||||
end
|
||||
|
|
@ -1,9 +1,14 @@
|
|||
function ls
|
||||
eza --icons -l --sort type $argv
|
||||
end
|
||||
function nvim
|
||||
/usr/bin/nvim --listen /tmp/nvim.pipe $argv
|
||||
end
|
||||
function vim
|
||||
/usr/bin/nvim --listen /tmp/nvim.pipe $argv
|
||||
end
|
||||
abbr -a find fd
|
||||
abbr -a df duf
|
||||
abbr -a v nvim
|
||||
abbr -a lg lazygit
|
||||
function rm
|
||||
echo "rm is disabled, use trash instead"
|
||||
|
|
30
.config/fish/themes/Catppuccin Latte.theme
Normal file
30
.config/fish/themes/Catppuccin Latte.theme
Normal file
|
@ -0,0 +1,30 @@
|
|||
# name: 'Catppuccin latte'
|
||||
# url: 'https://github.com/catppuccin/fish'
|
||||
# preferred_background: eff1f5
|
||||
|
||||
fish_color_normal 4c4f69
|
||||
fish_color_command 1e66f5
|
||||
fish_color_param dd7878
|
||||
fish_color_keyword d20f39
|
||||
fish_color_quote 40a02b
|
||||
fish_color_redirection ea76cb
|
||||
fish_color_end fe640b
|
||||
fish_color_comment 8c8fa1
|
||||
fish_color_error d20f39
|
||||
fish_color_gray 9ca0b0
|
||||
fish_color_selection --background=ccd0da
|
||||
fish_color_search_match --background=ccd0da
|
||||
fish_color_option 40a02b
|
||||
fish_color_operator ea76cb
|
||||
fish_color_escape e64553
|
||||
fish_color_autosuggestion 9ca0b0
|
||||
fish_color_cancel d20f39
|
||||
fish_color_cwd df8e1d
|
||||
fish_color_user 179299
|
||||
fish_color_host_remote 40a02b
|
||||
fish_color_host 1e66f5
|
||||
fish_color_status d20f39
|
||||
fish_pager_color_progress 9ca0b0
|
||||
fish_pager_color_prefix ea76cb
|
||||
fish_pager_color_completion 4c4f69
|
||||
fish_pager_color_description 9ca0b0
|
|
@ -34,3 +34,9 @@ env TERM=xterm-256color
|
|||
|
||||
|
||||
include current-theme.conf
|
||||
|
||||
|
||||
# BEGIN_KITTY_THEME
|
||||
# Catppuccin-Frappe
|
||||
include current-theme.conf
|
||||
# END_KITTY_THEME
|
42
.config/kitty/kitty.conf.bak
Normal file
42
.config/kitty/kitty.conf.bak
Normal file
|
@ -0,0 +1,42 @@
|
|||
font_family FiraCode Nerd Font Mono Normal
|
||||
font_size 14.0
|
||||
|
||||
enable_audio_bell no
|
||||
window_padding_width 6
|
||||
confirm_os_window_close 0
|
||||
env TERM=xterm-256color
|
||||
|
||||
|
||||
|
||||
# Multiplexer mappings
|
||||
#map ctrl+u kitten pass_keys.py neighboring_window bottom ctrl+u
|
||||
#map ctrl+i kitten pass_keys.py neighboring_window top ctrl+i
|
||||
#map ctrl+y kitten pass_keys.py neighboring_window left ctrl+y
|
||||
#map ctrl+o kitten pass_keys.py neighboring_window right ctrl+o
|
||||
#
|
||||
#map ctrl+shift+w no_op
|
||||
#map ctrl+x close_window
|
||||
#map ctrl+shift+x close_tab
|
||||
#
|
||||
#map ctrl+shift+enter no_op
|
||||
#map ctrl+n new_window
|
||||
#map ctrl+shift+n new_tab
|
||||
#
|
||||
#map ctrl+f toggle_layout stack
|
||||
#
|
||||
# Remote control
|
||||
#allow_remote_control yes
|
||||
#listen-on unix:@"$(date +%s%N)"
|
||||
|
||||
#Project management
|
||||
|
||||
#map ctrl+space launch --type=overlay fish -ic "kitty @ ls | jq -r '.[0].tabs | map(.title) | .[]' | fzf | xargs -I _ kitty @ focus-tab --match title:_"
|
||||
|
||||
|
||||
include current-theme.conf
|
||||
|
||||
|
||||
# BEGIN_KITTY_THEME
|
||||
# Catppuccin-Latte
|
||||
include current-theme.conf
|
||||
# END_KITTY_THEME
|
|
@ -1,3 +1,4 @@
|
|||
require("core.variables")
|
||||
require('core.package_manager')
|
||||
require('plugins.remote-theme')
|
||||
require('impatient')
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "0df29db3543837f8b41597f2640397c5ec792b7b" },
|
||||
"LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" },
|
||||
"catppuccin": { "branch": "main", "commit": "40dc9f0621c55bd40da4ad0731fac44d15bb393a" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
|
||||
|
@ -14,38 +15,37 @@
|
|||
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
|
||||
"impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "33c447b96e1cb1a5a2be87982d5d32bb5054079d" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" },
|
||||
"leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "397273083f988c1a17acf3816947cd198338e700" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "7533b0ead663d80452210c0c089e5105089697e5" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "e7b64c11035aa924f87385b72145e0ccf68a7e0a" },
|
||||
"mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" },
|
||||
"mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
|
||||
"neorg": { "branch": "main", "commit": "969b3f106683c66ab685ecba2a67bf11cb806785" },
|
||||
"nerdy.nvim": { "branch": "main", "commit": "061b0c8b5d56dcc9d3aba90be94593070f299878" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "ae339f45590cc421a68de885fc5a3261cc247362" },
|
||||
"nvim": { "branch": "main", "commit": "fc537040147f0374a22b88142a20eb6781141f0b" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "748e72c05495a3d30e88a6ef04b21697019a9aa9" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "dc9b7e28f5573a1a2225ffb33893d23d3e052ed6" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "f6c71641f6f183427a651c0ce4ba3fb89404fa9e" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" },
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
|
||||
"nvim-dap": { "branch": "master", "commit": "92dc531eea2c9a3ef504a5c8ac0decd1fa59a6a3" },
|
||||
"nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
|
||||
"nvim-ghost.nvim": { "branch": "main", "commit": "a1ca0b2dac59881066d7ac9373cf64d59ba29d6a" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "bb8e3dfbe10d80c294bb609c4bb4bba3ecdfbfe2" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "e49b1e90c1781ce372013de3fa93a91ea29fc34a" },
|
||||
"nvim-tmux-navigation": { "branch": "main", "commit": "543f090a45cef28156162883d2412fffecb6b750" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "783e5fc3079680b307e8ac518935317907e71a59" },
|
||||
"nvim-treesitter-context": { "branch": "master", "commit": "4cf64264c049c55f256550ad247b606f3e53bc77" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "a1e6268779411048a87f767a27380089362a0ce2" },
|
||||
"oil.nvim": { "branch": "master", "commit": "6cbc8d725d3964cb08d679774db67d41fa002647" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "eb3faef3a44641e5875581e901b0a8df8da2bde4" },
|
||||
"nvim-treesitter-context": { "branch": "master", "commit": "7227dca17316384e9b62bd6fc6b4d892572d6d4e" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" },
|
||||
"oil.nvim": { "branch": "master", "commit": "4088efb8ff664b6f1624aab5dac6c3fe11d3962c" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
||||
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
||||
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
|
||||
"tailwind-sorter.nvim": { "branch": "main", "commit": "efc34952eb0a20520f12c8a273ea44298c11a4fa" },
|
||||
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
|
||||
"undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "cbe9dfa162c178946afa689dd3f42d4ea8bf89c1" },
|
||||
"vim-jukit": { "branch": "master", "commit": "4d1f4e4c3923464e12f86fce49eb198b6e61a2a9" },
|
||||
"vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" },
|
||||
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
||||
"vimtex": { "branch": "master", "commit": "cbb20643b7bfe721902dac5760bf0d4889fb5f7e" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "6962dae3565369363b59dd51fb206051555fcb4d" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" },
|
||||
"zen-mode.nvim": { "branch": "main", "commit": "cb73b8bd0ef9d765b942db09dc762c603a89ae44" }
|
||||
}
|
|
@ -7,6 +7,7 @@ lazy.setup({
|
|||
-------------------------------------------THEMES------------------------------------------
|
||||
{
|
||||
'catppuccin/nvim',
|
||||
name = "catppuccin",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
config = function()
|
||||
|
|
|
@ -48,19 +48,20 @@ local capabilities = vim.tbl_deep_extend(
|
|||
require('cmp_nvim_lsp').default_capabilities()
|
||||
)
|
||||
|
||||
local setup = {
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
capabilities = capabilities,
|
||||
}
|
||||
mason_lspconfig.setup_handlers {
|
||||
|
||||
-- This is a default handler that will be called for each installed server (also for new servers that are installed during a session)
|
||||
function(server_name)
|
||||
lspconfig[server_name].setup { setup }
|
||||
lspconfig[server_name].setup {
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
capabilities = capabilities,
|
||||
}
|
||||
end,
|
||||
}
|
||||
|
||||
lspconfig["ocamllsp"].setup {
|
||||
setup
|
||||
lspconfig["ocamllsp"].setup{
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
capabilities = capabilities,
|
||||
}
|
||||
|
|
|
@ -7,6 +7,7 @@ null_ls.setup({
|
|||
null_ls.builtins.formatting.blue,
|
||||
null_ls.builtins.formatting.gofmt,
|
||||
null_ls.builtins.code_actions.shellcheck,
|
||||
null_ls.builtins.formatting.beautysh,
|
||||
null_ls.builtins.formatting.prettierd.with({
|
||||
filetypes = { "html", "json", "css", "js", "yaml", "markdown" },
|
||||
}),
|
||||
|
|
8
.config/nvim/lua/plugins/remote-theme.lua
Normal file
8
.config/nvim/lua/plugins/remote-theme.lua
Normal file
|
@ -0,0 +1,8 @@
|
|||
local M = {}
|
||||
|
||||
M.change_theme = function(scheme)
|
||||
vim.cmd('colorscheme ' .. scheme)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
@ -46,7 +46,7 @@ set -g @catppuccin_flavour 'frappe'
|
|||
set -g @catppuccin_window_tabs_enabled on
|
||||
set -g @resurrect-strategy-nvim 'session'
|
||||
set -g @resurrect-capture-pane-contents 'on'
|
||||
set -g @continuum-restore 'on'
|
||||
#set -g @continuum-restore 'on'
|
||||
set -g @continuum-save-interval '10'
|
||||
set -g @continuum-boot 'on'
|
||||
|
||||
|
|
34
.local/bin/rofi-change-theme
Executable file
34
.local/bin/rofi-change-theme
Executable file
|
@ -0,0 +1,34 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Define a list of themes
|
||||
themes="latte\nfrappe"
|
||||
|
||||
# Display theme options in Rofi
|
||||
selected_theme=$(echo -e "${themes[@]}" | rofi -dmenu -p "Select a theme:")
|
||||
|
||||
case $selected_theme in
|
||||
"latte")
|
||||
# Change to Latte theme
|
||||
#kitty
|
||||
kitty +kitten themes --reload-in=all catppuccin-latte
|
||||
sed -i 's/flavour = ".*"/flavour = "latte"/' "$HOME"/.config/nvim/lua/plugins/catppuccin.lua
|
||||
nvim --server /tmp/nvim.pipe --remote-send ':colorscheme catppuccin-latte<CR>'
|
||||
sed -i 's/set -g @catppuccin_flavour .*/set -g @catppuccin_flavour '\''latte'\''/' "$HOME"/.config/tmux/tmux.conf
|
||||
fish -c "echo \"Y\" | fish_config theme save \"Catppuccin Latte\""
|
||||
;;
|
||||
"frappe")
|
||||
# Change to Frappe theme
|
||||
#kitty
|
||||
kitty +kitten themes --reload-in=all catppuccin-frappe
|
||||
sed -i 's/flavour = ".*"/flavour = "frappe"/' "$HOME"/.config/nvim/lua/plugins/catppuccin.lua
|
||||
nvim --server /tmp/nvim.pipe --remote-send ':colorscheme catppuccin-frappe<CR>'
|
||||
sed -i 's/set -g @catppuccin_flavour .*/set -g @catppuccin_flavour '\''frappe'\''/' "$HOME"/.config/tmux/tmux.conf
|
||||
fish -c "echo \"Y\" | fish_config theme save \"Catppuccin Frappe\""
|
||||
;;
|
||||
*)
|
||||
# Handle an invalid selection or cancel
|
||||
echo "Invalid selection or canceled."
|
||||
;;
|
||||
esac
|
||||
|
||||
tmux source-file "$HOME/.config/tmux/tmux.conf"
|
Loading…
Reference in a new issue