Compare commits

...

4 Commits

Author SHA1 Message Date
34f0b74f6f hyprctl completions 2024-04-22 15:30:50 +02:00
8412e10239 Small changes to waybar, nvim conf update
TODO: rewrite nvim configs to lua
2024-04-22 15:29:14 +02:00
2e9e6dc76f Minor editorconfig changes + new gpg key 2024-04-22 15:27:31 +02:00
4818228ebd Hyprland dots update 2024-04-22 15:24:39 +02:00
9 changed files with 120 additions and 47 deletions

View File

@@ -6,3 +6,26 @@ indent_style = tab
end_of_line = lf end_of_line = lf
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,py}]
charset = utf-8
[*.{c,h}pp]
indent_style = space
indent_size = 2
# 4 space indentation
[*.py]
indent_style = space
indent_size = 4
# Tab indentation (no size specified)
[Makefile]
indent_style = tab
# Matches the exact files either package.json or .travis.yml
[{package.json,.travis.yml}]
indent_style = space
indent_size = 2

View File

@@ -250,7 +250,7 @@
[user] [user]
name = VectorKappa name = VectorKappa
email = piotrpatalong@gmail.com email = piotrpatalong@gmail.com
signingkey = 0917E6568B3A9A02 signingkey = 32DCE8467E7FBD4F
[mergetool] [mergetool]
keepBackup = true keepBackup = true
[init] [init]

View File

@@ -1,7 +1,7 @@
#!/bin/dash #!/bin/dash
xhost + local: ; xhost + local: ;
swww init; swww init;
flameshot & disown; flameshot &
wayvnc & wayvnc &
dex -a & dex -a &
dunst & dunst &

View File

@@ -6,6 +6,7 @@
monitor=DP-1,1920x1080@60,0x0,1 monitor=DP-1,1920x1080@60,0x0,1
monitor=DP-3,1920x1080@60,1920x0,1 monitor=DP-3,1920x1080@60,1920x0,1
monitor=eDP-1,1920x1080@60,0x0,1 monitor=eDP-1,1920x1080@60,0x0,1
monitor=HDMI-A-1,1920x1080@60,1920x0,1
#workspace=DP-1,1 #workspace=DP-1,1
workspace=1, m:DP-1 workspace=1, m:DP-1
workspace=2, m:DP-1 workspace=2, m:DP-1
@@ -33,7 +34,7 @@ input {
} }
general { general {
max_fps=60 # deprecated, unused #max_fps=60 # deprecated, unused
sensitivity=1 sensitivity=1
#main_mod=SUPER #main_mod=SUPER
no_cursor_warps=true no_cursor_warps=true
@@ -75,11 +76,11 @@ misc {
#windowrule=pseudo,abc #windowrule=pseudo,abc
#windowrule=monitor 0,xyz #windowrule=monitor 0,xyz
exec-once=$HOME/.local/share/hyprload/hyprload.sh
# example binds # example binds
bind=SUPERSHIFT,Z,exec,alacritty bind=SUPERSHIFT,Z,exec,alacritty
bind=SUPER,Z,exec,kitty bind=SUPER,Z,exec,kitty
bind=SUPER,X,killactive, bind=SUPER,X,killactive,
bind=SUPER_SHIFT,X,exec,hyprctl activewindow |grep pid |tr -d 'pid:'|xargs kill
bind=SUPER_SHIFT,Q,exit, bind=SUPER_SHIFT,Q,exit,
bind=SUPER,E,exec,nemo bind=SUPER,E,exec,nemo
@@ -96,10 +97,6 @@ bind=SUPER,P,pseudo,
bind=SUPER,SPACE,exec,rofi -modi drun,run,window,calc -show drun bind=SUPER,SPACE,exec,rofi -modi drun,run,window,calc -show drun
bind=SUPER,C,pin bind=SUPER,C,pin
bind=SUPERSHIFT,R,hyprload,reload
bind=SUPERSHIFT,U,hyprload,update
bind=SUPERSHIFT,I,hyprload,install
bind=SUPER,left,movefocus,l bind=SUPER,left,movefocus,l
bind=SUPER,right,movefocus,r bind=SUPER,right,movefocus,r
bind=SUPER,up,movefocus,u bind=SUPER,up,movefocus,u
@@ -119,16 +116,16 @@ bind=SUPER,8,workspace,8
bind=SUPER,9,workspace,9 bind=SUPER,9,workspace,9
bind=SUPER,0,workspace,10 bind=SUPER,0,workspace,10
bind=SUPER_SHIFT,1,movetoworkspace,1 bind=SUPER_SHIFT,1,movetoworkspacesilent,1
bind=SUPER_SHIFT,2,movetoworkspace,2 bind=SUPER_SHIFT,2,movetoworkspacesilent,2
bind=SUPER_SHIFT,3,movetoworkspace,3 bind=SUPER_SHIFT,3,movetoworkspacesilent,3
bind=SUPER_SHIFT,4,movetoworkspace,4 bind=SUPER_SHIFT,4,movetoworkspacesilent,4
bind=SUPER_SHIFT,5,movetoworkspace,5 bind=SUPER_SHIFT,5,movetoworkspacesilent,5
bind=SUPER_SHIFT,6,movetoworkspace,6 bind=SUPER_SHIFT,6,movetoworkspacesilent,6
bind=SUPER_SHIFT,7,movetoworkspace,7 bind=SUPER_SHIFT,7,movetoworkspacesilent,7
bind=SUPER_SHIFT,8,movetoworkspace,8 bind=SUPER_SHIFT,8,movetoworkspacesilent,8
bind=SUPER_SHIFT,9,movetoworkspace,9 bind=SUPER_SHIFT,9,movetoworkspacesilent,9
bind=SUPER_SHIFT,0,movetoworkspace,10 bind=SUPER_SHIFT,0,movetoworkspacesilent,10
bind=SUPERSHIFT,S,exec,flameshot gui bind=SUPERSHIFT,S,exec,flameshot gui
@@ -157,6 +154,8 @@ windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
windowrulev2 = pin,class:^(scrcpy)$ windowrulev2 = pin,class:^(scrcpy)$
windowrulev2 = move onscreen 100%-30,class:^(scrcpy)$ windowrulev2 = move onscreen 100%-30,class:^(scrcpy)$
windowrulev2 = stayfocused,title:^rofi
windowrulev2 = float,class:^(flameshot)$ windowrulev2 = float,class:^(flameshot)$
windowrulev2 = pin,class:^(flameshot)$ windowrulev2 = pin,class:^(flameshot)$
@@ -173,20 +172,32 @@ env = GDK_BACKEND,wayland,x11
env = QT_AUTO_SCREEN_SCALE_FACTOR,1 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
env = QT_QPA_PLATFORMTHEME,qt5ct env = QT_QPA_PLATFORMTHEME,qt5ct
plugin:hyprfocus {
enabled = yes
keyboard_focus_animation = shrink plugin {
mouse_focus_animation = shrink hyprbars {
# example config
bar_height = 20
bezier = bezIn, 0.5,0.0,1.0,0.5 # example buttons (R -> L)
bezier = bezOut, 0.0,0.5,0.5,1.0 # hyprbars-button = color, size, on-click
bar_color = rgb(000000)
hyprbars-button = rgb(ff4040), 10, 󰖭, hyprctl dispatch killactive
hyprbars-button = rgb(eeee11), 10, , hyprctl dispatch fullscreen 1
hyprbars-button = rgb(11ee11), 10, ¥, hyprctl dispatch togglefloating
}
hyprfocus {
enabled = yes
flash { focus_animation = shrink
flash_opacity = 0.7
in_bezier = bezIn bezier = bezIn, 0.5,0.0,1.0,0.5
in_speed = 0.5 bezier = bezOut, 0.0,0.5,0.5,1.0
flash {
flash_opacity = 0.7
in_bezier = bezIn
in_speed = 0.5
out_bezier = bezOut out_bezier = bezOut
out_speed = 3 out_speed = 3
@@ -198,8 +209,23 @@ plugin:hyprfocus {
in_bezier = bezIn in_bezier = bezIn
in_speed = 0.5 in_speed = 0.5
out_bezier = bezOut out_bezier = bezOut
out_speed = 3 out_speed = 3
}
}
hyprtrails {
color = rgba(ff0000ff)
}
hyprexpo {
columns = 3
gap_size = 5
bg_col = rgb(111111)
workspace_method = center current # [center/first] [workspace] e.g. first 1 or center m+1
enable_gesture = true # laptop touchpad, 4 fingers
gesture_distance = 300 # how far is the "max"
gesture_positive = true # positive = swipe down. Negative = swipe up.
} }
} }
exec-once = hyprpm reload -n

View File

@@ -1,6 +0,0 @@
plugins = [
# Installs the plugin from https://github.com/Duckonaut/split-monitor-workspaces
"Duckonaut/split-monitor-workspaces",
"VortexCoyote/hyprfocus",
]

View File

@@ -82,14 +82,16 @@ Plug 'ms-jpq/coq.thirdparty', {'branch': '3p'}
Plug 'nvim-tree/nvim-web-devicons' Plug 'nvim-tree/nvim-web-devicons'
Plug 'projekt0n/circles.nvim' Plug 'projekt0n/circles.nvim'
Plug 'uga-rosa/translate.nvim' Plug 'nvim-neotest/nvim-nio'
Plug 'uga-rosa/translate.nvim'
Plug 'mechatroner/rainbow_csv'
Plug 'christoomey/vim-system-copy' Plug 'christoomey/vim-system-copy'
Plug 'eandrju/cellular-automaton.nvim' Plug 'eandrju/cellular-automaton.nvim'
Plug 'williamboman/mason.nvim' Plug 'williamboman/mason.nvim'
Plug 'williamboman/mason-lspconfig.nvim' Plug 'williamboman/mason-lspconfig.nvim'
Plug 'neovim/nvim-lspconfig' Plug 'neovim/nvim-lspconfig'
Plug 'ranjithshegde/ccls.nvim' "Plug 'ranjithshegde/ccls.nvim'
Plug 'mfussenegger/nvim-dap' Plug 'mfussenegger/nvim-dap'
Plug 'rcarriga/nvim-dap-ui' Plug 'rcarriga/nvim-dap-ui'
" Initialize plugin system " Initialize plugin system
@@ -134,7 +136,7 @@ let g:syntastic_python_checkers = ['bandit', 'python']
" Keybinds " Keybinds
nnoremap <F2> :CHADopen<CR> nnoremap <F2> :CHADopen<CR>
set pastetoggle=<F3> nnoremap <F3> :lua vim.lsp.buf.code_action()<CR>
nnoremap <F4> :Goyo<CR> nnoremap <F4> :Goyo<CR>
nnoremap <F5> :MundoToggle<CR> nnoremap <F5> :MundoToggle<CR>
nnoremap <F6> :lua require("dapui").toggle()<CR> nnoremap <F6> :lua require("dapui").toggle()<CR>
@@ -147,11 +149,31 @@ nnoremap <F6> :lua require("dapui").toggle()<CR>
lua << EOF lua << EOF
require("mason").setup() require("mason").setup()
require("mason-lspconfig").setup() require("mason-lspconfig").setup()
require("mason-lspconfig").setup_handlers({
function (server_name) -- default handler (optional)
require("lspconfig")[server_name].setup(require('coq').lsp_ensure_capabilities({}))
end})
local lsp = require "lspconfig" local lsp = require "lspconfig"
local coq = require "coq" -- add this local coq = require "coq" -- add this
local dap = require("dap")
dap.adapters.gdb = {
type = "executable",
command = "gdb",
args = { "-i", "dap" }
}
dap.configurations.cpp = {
{
name = "Launch",
type = "gdb",
request = "launch",
program = function()
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
end,
cwd = "${workspaceFolder}",
stopAtBeginningOfMainSubprogram = false,
},
}
-- Mappings. -- Mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions -- See `:help vim.diagnostic.*` for documentation on any of the below functions
local opts = { noremap=true, silent=true } local opts = { noremap=true, silent=true }
@@ -194,8 +216,9 @@ local lsp_flags = {
--lsp.<server>.setup(<stuff...>) -- before --lsp.<server>.setup(<stuff...>) -- before
--lsp.<server>.setup(coq.lsp_ensure_capabilities(<stuff...>)) -- after --lsp.<server>.setup(coq.lsp_ensure_capabilities(<stuff...>)) -- after
lsp.pyright.setup(coq.lsp_ensure_capabilities({})) --lsp.pyright.setup(coq.lsp_ensure_capabilities({}))
lsp.ccls.setup(coq.lsp_ensure_capabilities({})) --lsp.ccls.setup(coq.lsp_ensure_capabilities({}))
--lsp.ltex.setup(coq.lsp_ensure_capabilities({settings = {ltex = {language = "pl-PL"}}}))
lsp.rust_analyzer.setup(coq.lsp_ensure_capabilities({ lsp.rust_analyzer.setup(coq.lsp_ensure_capabilities({
settings = { settings = {
["rust-analyzer"] = { ["rust-analyzer"] = {

View File

@@ -28,6 +28,8 @@
"hyprland/workspaces":{ "hyprland/workspaces":{
"active-only":false, "active-only":false,
"format":"{name}", "format":"{name}",
"on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1",
"persistent-workspaces": { "persistent-workspaces": {
"*":10, "*":10,
}, },

View File

@@ -50,10 +50,14 @@ button:hover {
#workspaces button { #workspaces button {
padding: 0 5px; padding: 0 5px;
background-color: transparent; background-color: shade(@blue, 0.5);
color: #ffffff; color: #ffffff;
} }
#workspaces button.empty {
background-color: transparent;/* rgba(43, 48, 59, 0.5);*/
}
#workspaces button:hover { #workspaces button:hover {
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
} }

View File

@@ -179,6 +179,7 @@ zinit snippet OMZP::colored-man-pages
zinit snippet OMZP::rust zinit snippet OMZP::rust
zinit snippet OMZP::zoxide zinit snippet OMZP::zoxide
zinit snippet OMZL::completion.zsh zinit snippet OMZL::completion.zsh
zinit snippet https://github.com/hyprwm/Hyprland/blob/main/hyprctl/hyprctl.zsh
zinit wait lucid for \ zinit wait lucid for \
atinit"ZINIT[COMPINIT_OPTS]=-C; zicompinit; zicdreplay" \ atinit"ZINIT[COMPINIT_OPTS]=-C; zicompinit; zicdreplay" \