Update dotfiles
This commit is contained in:
parent
f102096743
commit
b2f8c1ce2a
|
@ -1,5 +1,7 @@
|
||||||
if status is-interactive
|
if status is-interactive
|
||||||
alias ls="lsd"
|
alias ls="lsd"
|
||||||
|
|
||||||
|
alias v="vim"
|
||||||
alias nv="nvim"
|
alias nv="nvim"
|
||||||
|
|
||||||
alias gc="git clone"
|
alias gc="git clone"
|
||||||
|
@ -8,11 +10,12 @@ if status is-interactive
|
||||||
|
|
||||||
alias la="lsd -la"
|
alias la="lsd -la"
|
||||||
|
|
||||||
alias dotfiles="git --git-dir=$HOME/repos/dotfiles --work-tree=$HOME/"
|
alias dotfiles="git --git-dir=/home/q/repos/dotfiles.git --work-tree=$HOME"
|
||||||
|
|
||||||
set -U fish_user_paths $HOME/bin $fish_user_paths
|
set -U fish_user_paths $HOME/bin $fish_user_paths
|
||||||
|
|
||||||
set -x PF_INFO "ascii title os kernel wm shell pkgs memory"
|
set -x PF_INFO "ascii title os kernel wm shell pkgs memory"
|
||||||
|
set -x TERM "xterm"
|
||||||
|
|
||||||
set srcdir "$HOME/.cache/"
|
set srcdir "$HOME/.cache/"
|
||||||
set pkgdir "$HOME/.npm/"
|
set pkgdir "$HOME/.npm/"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# title=foot
|
# title=foot
|
||||||
# locked-title=no
|
# locked-title=no
|
||||||
|
|
||||||
font=JetBrainsMono Nerd Font Mono:size=11
|
font=JetBrainsMono Nerd Font Mono:size=9
|
||||||
|
|
||||||
# font=monospace:size=8
|
# font=monospace:size=8
|
||||||
# font-bold=<bold variant of regular font>
|
# font-bold=<bold variant of regular font>
|
||||||
|
@ -70,27 +70,64 @@ alternate-scroll-mode=yes
|
||||||
|
|
||||||
[colors]
|
[colors]
|
||||||
|
|
||||||
#alpha = 0.99
|
alpha = 0.95
|
||||||
|
|
||||||
background=141b1e
|
foreground = d8dee9
|
||||||
foreground=dadada
|
background = 2e3440
|
||||||
regular0=232a2d
|
|
||||||
regular1=e57474
|
|
||||||
regular2=8ccf7e
|
|
||||||
regular3=e5c76b
|
|
||||||
regular4=67b0e8
|
|
||||||
regular5=c47fd5
|
|
||||||
regular6=6cbfbf
|
|
||||||
regular7=b3b9b8
|
|
||||||
|
|
||||||
bright0=2d3437
|
# selection-foreground = d8dee9
|
||||||
bright1=ef7e7e
|
# selection-background = 4c566a
|
||||||
bright2=96d988
|
|
||||||
bright3=f4d67a
|
regular0 = 3b4252
|
||||||
bright4=71baf2
|
regular1 = bf616a
|
||||||
bright5=ce89df
|
regular2 = a3be8c
|
||||||
bright6=67cbe7
|
regular3 = ebcb8b
|
||||||
bright7=bdc3c2
|
regular4 = 81a1c1
|
||||||
|
regular5 = b48ead
|
||||||
|
regular6 = 88c0d0
|
||||||
|
regular7 = e5e9f0
|
||||||
|
|
||||||
|
bright0 = 4c566a
|
||||||
|
bright1 = bf616a
|
||||||
|
bright2 = a3be8c
|
||||||
|
bright3 = ebcb8b
|
||||||
|
bright4 = 81a1c1
|
||||||
|
bright5 = b48ead
|
||||||
|
bright6 = 8fbcbb
|
||||||
|
bright7 = eceff4
|
||||||
|
|
||||||
|
dim0 = 373e4d
|
||||||
|
dim1 = 94545d
|
||||||
|
dim2 = 809575
|
||||||
|
dim3 = b29e75
|
||||||
|
dim4 = 68809a
|
||||||
|
dim5 = 8c738c
|
||||||
|
dim6 = 6d96a5
|
||||||
|
dim7 = aeb3bb
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#background=141b1e
|
||||||
|
#foreground=dadada
|
||||||
|
#regular0=232a2d
|
||||||
|
#regular1=e57474
|
||||||
|
#regular2=8ccf7e
|
||||||
|
#regular3=e5c76b
|
||||||
|
#regular4=67b0e8
|
||||||
|
#regular5=c47fd5
|
||||||
|
#regular6=6cbfbf
|
||||||
|
#regular7=b3b9b8
|
||||||
|
|
||||||
|
#bright0=2d3437
|
||||||
|
#bright1=ef7e7e
|
||||||
|
#bright2=96d988
|
||||||
|
#bright3=f4d67a
|
||||||
|
#bright4=71baf2
|
||||||
|
#bright5=ce89df
|
||||||
|
#bright6=67cbe7
|
||||||
|
#bright7=bdc3c2
|
||||||
|
|
||||||
## dimmed colors (see foot.ini(5) man page)
|
## dimmed colors (see foot.ini(5) man page)
|
||||||
# dim0=<not set>
|
# dim0=<not set>
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
LocationMode=path-bar
|
LocationMode=path-bar
|
||||||
ShowHidden=true
|
ShowHidden=true
|
||||||
ShowSizeColumn=true
|
ShowSizeColumn=true
|
||||||
GeometryX=380
|
GeometryX=62
|
||||||
GeometryY=135
|
GeometryY=0
|
||||||
GeometryWidth=840
|
GeometryWidth=840
|
||||||
GeometryHeight=630
|
GeometryHeight=630
|
||||||
SortColumn=name
|
SortColumn=name
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
|
|
||||||
|
|
||||||
[Settings]
|
[Settings]
|
||||||
gtk-theme-name=Tokyonight-Dark-B
|
gtk-theme-name=Nordic
|
||||||
gtk-icon-theme-name=Papirus
|
gtk-icon-theme-name=Nordzy-dark
|
||||||
gtk-font-name=Cantarell 11
|
gtk-font-name=Cantarell 11
|
||||||
gtk-cursor-theme-name=Adwaita
|
gtk-cursor-theme-name=Nordzy-cursors-white
|
||||||
gtk-cursor-theme-size=0
|
gtk-cursor-theme-size=0
|
||||||
gtk-toolbar-style=GTK_TOOLBAR_BOTH
|
gtk-toolbar-style=GTK_TOOLBAR_BOTH
|
||||||
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
|
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
|
||||||
|
|
|
@ -45,10 +45,10 @@ general {
|
||||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||||
gaps_in = 5
|
gaps_in = 5
|
||||||
gaps_out = 10
|
gaps_out = 10
|
||||||
border_size = 2
|
border_size = 3
|
||||||
|
|
||||||
col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
|
col.active_border = rgb(88c0d0) 45deg
|
||||||
col.inactive_border = rgba(595959aa)
|
col.inactive_border = rgb(2e3440)
|
||||||
|
|
||||||
layout = dwindle
|
layout = dwindle
|
||||||
}
|
}
|
||||||
|
@ -141,10 +141,10 @@ bind = $mainMod ALT, J, togglesplit, # dwindle
|
||||||
binde= ,F2, exec, pactl set-sink-volume @DEFAULT_SINK@ -1%
|
binde= ,F2, exec, pactl set-sink-volume @DEFAULT_SINK@ -1%
|
||||||
binde= ,F3, exec, pactl set-sink-volume @DEFAULT_SINK@ +1%
|
binde= ,F3, exec, pactl set-sink-volume @DEFAULT_SINK@ +1%
|
||||||
|
|
||||||
|
bind = $mainMod, b, exec, foot -e bluetuith
|
||||||
bind = $mainMod, RETURN, exec, foot
|
bind = $mainMod, RETURN, exec, foot
|
||||||
bind = $mainMod, N, exec, nemo
|
bind = $mainMod, N, exec, nemo
|
||||||
bind = $mainMod, d, exec, wofi --show drun
|
bind = $mainMod, d, exec, wofi --show drun -I
|
||||||
bind = ,Print,exec,makescreenshot
|
bind = ,Print,exec,makescreenshot
|
||||||
|
|
||||||
# not forget install xdg-desktop-portal 1.14.6
|
# not forget install xdg-desktop-portal 1.14.6
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
preload = /home/q/Pictures/wallpapers/mountain.png
|
preload = /home/q/Pictures/wallpapers/nord/wallhaven-4glwwl_1920x1080.png
|
||||||
|
|
||||||
wallpaper = ,/home/q/Pictures/wallpapers/mountain.png
|
wallpaper = ,/home/q/Pictures/wallpapers/nord/wallhaven-4glwwl_1920x1080.png
|
||||||
|
|
||||||
#preload = /home/q/Pictures/wallpapers/catppuccin/tetris.png
|
#preload = /home/q/Pictures/wallpapers/catppuccin/tetris.png
|
||||||
#wallpaper = ,/home/q/Pictures/wallpapers/catppuccin/tetris.png
|
#wallpaper = ,/home/q/Pictures/wallpapers/catppuccin/tetris.png
|
||||||
|
|
|
@ -11,21 +11,23 @@ local ok, err = pcall(function()
|
||||||
|
|
||||||
-- vim.cmd('colorscheme catppuccin-macchiato')
|
-- vim.cmd('colorscheme catppuccin-macchiato')
|
||||||
-- vim.cmd('colorscheme aquarium')
|
-- vim.cmd('colorscheme aquarium')
|
||||||
vim.cmd('colorscheme everblush')
|
opt.termguicolors = true
|
||||||
|
vim.cmd('colorscheme nord')
|
||||||
end)
|
end)
|
||||||
|
|
||||||
if not ok then
|
if not ok then
|
||||||
print(err)
|
print(err)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
opt.encoding = "utf-8"
|
opt.encoding = "utf-8"
|
||||||
opt.swapfile = false
|
opt.swapfile = false
|
||||||
|
|
||||||
opt.number = true
|
opt.number = true
|
||||||
opt.relativenumber = true
|
opt.relativenumber = true
|
||||||
|
|
||||||
vim.g.mapleader = " "
|
vim.g.lsp_path = os.getenv("HOME") .. "/.local/share/nvim/mason/bin/"
|
||||||
|
|
||||||
|
vim.g.mapleader = ","
|
||||||
|
|
||||||
opt.list = true
|
opt.list = true
|
||||||
opt.listchars = {tab = '| '}
|
opt.listchars = {tab = '| '}
|
||||||
|
@ -35,9 +37,7 @@ opt.splitright = true
|
||||||
|
|
||||||
opt.undofile = true
|
opt.undofile = true
|
||||||
|
|
||||||
opt.tabstop = 4
|
opt.tabstop = 2
|
||||||
opt.shiftwidth = 4
|
opt.shiftwidth = 2
|
||||||
opt.expandtab = true
|
opt.expandtab = true
|
||||||
opt.mouse = "a"
|
opt.mouse = "a"
|
||||||
|
|
||||||
vim.g.lsp_path = os.getenv("HOME") .. "/.local/share/nvim/mason/bin/"
|
|
||||||
|
|
|
@ -22,9 +22,10 @@ packer.startup{
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Colorchemes
|
-- Colorchemes
|
||||||
|
use 'gbprod/nord.nvim'
|
||||||
-- use {"catppuccin/nvim", as = "catppuccin"}
|
-- use {"catppuccin/nvim", as = "catppuccin"}
|
||||||
-- use {"tiagovla/tokyodark.nvim"}
|
-- use {"tiagovla/tokyodark.nvim"}
|
||||||
use {'Everblush/everblush.nvim',as = 'everblush'}
|
-- use {'Everblush/everblush.nvim',as = 'everblush'}
|
||||||
-- use {"frenzyexists/aquarium-vim"}
|
-- use {"frenzyexists/aquarium-vim"}
|
||||||
-- use {"rebelot/kanagawa.nvim"}
|
-- use {"rebelot/kanagawa.nvim"}
|
||||||
-- use {"projekt0n/github-nvim-theme"}
|
-- use {"projekt0n/github-nvim-theme"}
|
||||||
|
@ -168,7 +169,7 @@ packer.startup{
|
||||||
use {
|
use {
|
||||||
"L3MON4D3/LuaSnip",
|
"L3MON4D3/LuaSnip",
|
||||||
requires = {"rafamadriz/friendly-snippets"},
|
requires = {"rafamadriz/friendly-snippets"},
|
||||||
config = function() require("luasnip/loaders/from_vscode").lazy_load() end
|
config = function() require("plugins.luasnip") end
|
||||||
}
|
}
|
||||||
|
|
||||||
use {
|
use {
|
||||||
|
@ -176,8 +177,6 @@ packer.startup{
|
||||||
config = function() require("plugins.null-ls") end
|
config = function() require("plugins.null-ls") end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
use {
|
use {
|
||||||
"SmiteshP/nvim-navic",
|
"SmiteshP/nvim-navic",
|
||||||
requires = {"neovim/nvim-lspconfig"},
|
requires = {"neovim/nvim-lspconfig"},
|
||||||
|
|
|
@ -1,17 +1,15 @@
|
||||||
local lsp = require_mod("lspconfig")
|
local lsp = require_mod("lspconfig")
|
||||||
|
|
||||||
local mason_lsp = require_mod("mason-lspconfig")
|
local mason_lsp = require_mod("mason-lspconfig")
|
||||||
|
|
||||||
local navic = require_mod("nvim-navic")
|
|
||||||
|
|
||||||
local sign = vim.fn.sign_define
|
local sign = vim.fn.sign_define
|
||||||
local sign_name = {"Error","Warn","Info","Hint"}
|
local sign_name = {"Error","Warn","Info","Hint"}
|
||||||
|
|
||||||
|
-- Set lsp signs
|
||||||
for k, icon in pairs(vim.g.diagnostic_sings) do
|
for k, icon in pairs(vim.g.diagnostic_sings) do
|
||||||
sign("DiagnosticSign" .. sign_name[k],{text=icon,texthl="DiagnosticSign" .. sign_name[k]})
|
sign("DiagnosticSign" .. sign_name[k],{text=icon,texthl="DiagnosticSign" .. sign_name[k]})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Settings diagnostics
|
||||||
vim.diagnostic.config {
|
vim.diagnostic.config {
|
||||||
signs = true,
|
signs = true,
|
||||||
underline = true,
|
underline = true,
|
||||||
|
@ -35,6 +33,8 @@ capabilities.textDocument.foldingRange = {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
local navic = require("nvim-navic")
|
||||||
|
|
||||||
vim.g.lsp_capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
vim.g.lsp_capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,10 +4,13 @@ if not ok then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
cmp.setup {
|
cmp.setup {
|
||||||
mapping = {
|
mapping = {
|
||||||
["<Tab>"] = cmp.mapping.select_next_item(),
|
["<Tab>"] = cmp.mapping.select_next_item(),
|
||||||
|
["<C-N>"] = cmp.mapping.select_next_item(),
|
||||||
["<S-Tab>"] = cmp.mapping.select_prev_item(),
|
["<S-Tab>"] = cmp.mapping.select_prev_item(),
|
||||||
|
["<C-P>"] = cmp.mapping.select_prev_item(),
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
["<CR>"] = cmp.mapping.confirm({select = false}),
|
["<CR>"] = cmp.mapping.confirm({select = false}),
|
||||||
},
|
},
|
||||||
|
@ -48,5 +51,4 @@ cmp.setup {
|
||||||
{ name = "emoji" },
|
{ name = "emoji" },
|
||||||
{ name = "calc" },
|
{ name = "calc" },
|
||||||
},
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,9 +4,9 @@ After=network-online.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
EnvironmentFile=/home/q/.config/telegram-bot-api/config.env
|
EnvironmentFile=$HOME/.config/telegram-bot-api/config.env
|
||||||
WorkingDirectory=~
|
WorkingDirectory=~
|
||||||
ExecStart=/home/q/bin/telegram-bot-api --api-id=${api_id} --api-hash=${api_hash} --local --http-stat-ip-address=${ip} --http-port=${port} --dir=/home/q/.config/telegram-bot-api/
|
ExecStart=telegram-bot-api --api-id=${api_id} --api-hash=${api_hash} --local --http-stat-ip-address=${ip} --http-port=${port} --dir=$HOME/.config/telegram-bot-api/
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
Loading…
Reference in New Issue