Compare commits

...

6 Commits
master ... trb

  1. 41
      .config/i3/config
  2. 2
      .config/i3/py3status.conf
  3. 2
      .config/i3/scripts/autoapp
  4. 13
      .config/nvim/lazy-lock.json
  5. 3
      .config/nvim/lua/config/options.lua
  6. 7
      .config/nvim/lua/plugins/image.lua
  7. 8
      .config/nvim/lua/plugins/notify-config.lua
  8. 29
      .config/nvim/lua/plugins/snacks.lua
  9. 2
      .dotfiles.d/init/init-shell.sh
  10. 3
      .zshrc

41
.config/i3/config

@ -17,6 +17,8 @@ set $mod Mod4
# helper scripts location # helper scripts location
set $scriptsDir ~/.config/i3/scripts/ set $scriptsDir ~/.config/i3/scripts/
set $scriptsDir /home/chodylal/.config/i3/scripts/
################################################################# #################################################################
# /profiles/current/config.d/10-workspaces: # /profiles/current/config.d/10-workspaces:
@ -86,9 +88,8 @@ bindsym $mod+Control+Right move workspace to output right
#------------------------------------------------ #------------------------------------------------
# monitors - use "xrandr --listmonitors" to obtain your output names # monitors - use "xrandr --listmonitors" to obtain your output names
set $leftOutput eDP set $leftOutput HDMI-1
set $rightOutput HDMI-A-0 set $rightOutput eDP-1
# setup monitors # setup monitors
exec --no-startup-id xrandr --output $rightOutput --primary exec --no-startup-id xrandr --output $rightOutput --primary
exec --no-startup-id xrandr --output $leftOutput --left-of $rightOutput exec --no-startup-id xrandr --output $leftOutput --left-of $rightOutput
@ -139,7 +140,7 @@ exec_always --no-startup-id sleep 2 && xrandr --output $leftOutput --left-of $ri
# start a terminal # start a terminal
#bindsym $mod+Return exec i3-sensible-terminal #bindsym $mod+Return exec i3-sensible-terminal
#bindsym $mod+Return exec terminator -p ratflow-terminator #bindsym $mod+Return exec terminator -p ratflow-terminator
bindsym $mod+Return exec kitty bindsym $mod+Return exec /home/chodylal/.local/kitty.app/bin/kitty
# start dmenu (a program launcher) # start dmenu (a program launcher)
#bindsym $mod+d exec dmenu_run #bindsym $mod+d exec dmenu_run
@ -174,10 +175,10 @@ floating_modifier $mod
bindsym $mod+Shift+q kill bindsym $mod+Shift+q kill
# change focus # change focus
bindsym $mod+j focus left # bindsym $mod+j focus left
bindsym $mod+k focus down # bindsym $mod+k focus down
bindsym $mod+l focus up # bindsym $mod+l focus up
bindsym $mod+semicolon focus right # bindsym $mod+semicolon focus right
# alternatively, you can use the cursor keys: # alternatively, you can use the cursor keys:
bindsym $mod+Left focus left bindsym $mod+Left focus left
@ -186,10 +187,10 @@ bindsym $mod+Up focus up
bindsym $mod+Right focus right bindsym $mod+Right focus right
# move focused window # move focused window
bindsym $mod+Shift+j move left # bindsym $mod+Shift+j move left
bindsym $mod+Shift+k move down # bindsym $mod+Shift+k move down
bindsym $mod+Shift+l move up # bindsym $mod+Shift+l move up
bindsym $mod+Shift+semicolon move right # bindsym $mod+Shift+semicolon move right
# alternatively, you can use the cursor keys: # alternatively, you can use the cursor keys:
bindsym $mod+Shift+Left move left bindsym $mod+Shift+Left move left
@ -339,14 +340,17 @@ bindsym Shift+$mod+p exec /home/chodak/.screenlayout/edp.sh
#------------------------------------------------ #------------------------------------------------
# regenerate and reload i3 configuration file # regenerate and reload i3 configuration file
bindsym $mod+Shift+c exec rfreload # bindsym $mod+Shift+c exec rfreload
# suspend # suspend
bindsym $mod+Escape exec systemctl suspend bindsym $mod+Escape exec i3lock -c 000000 && systemctl suspend
# lock
bindsym $mod+Shift+l exec i3lock -c 000000
# regenerate i3 configuration file and restart i3 (preserves your layout/session, can be used to upgrade i3) # regenerate i3 configuration file and restart i3 (preserves your layout/session, can be used to upgrade i3)
bindsym $mod+Shift+r exec rfreload --restart # bindsym $mod+Shift+r exec rfreload --restart
bindsym $mod+Shift+r exec i3-msg reload
# exit i3 (logs you out of your X session) # exit i3 (logs you out of your X session)
bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
@ -448,7 +452,7 @@ bar {
#Use tray_output primary/none/<output name> to define where the tray should be (multiple tray_output can be used) #Use tray_output primary/none/<output name> to define where the tray should be (multiple tray_output can be used)
#Remember to set any of your displays to primary (i.e. using xrandr) #Remember to set any of your displays to primary (i.e. using xrandr)
#tray_output primary #tray_output primary
tray_output $rightOutput
colors { colors {
separator $clFocusedActiveText separator $clFocusedActiveText
#background $clUnfocusedBackground #background $clUnfocusedBackground
@ -526,6 +530,11 @@ for_window [class="gsimplecal"] floating enable
for_window [class="Osmo"] floating enable for_window [class="Osmo"] floating enable
for_window [class="Skype"] floating enable for_window [class="Skype"] floating enable
for_window [class="Yad"] floating enable for_window [class="Yad"] floating enable
for_window [class="SMiKO" instance="^SMiKO$"] floating enable
for_window [class="SMiKO" instance="SMiKO"] floating enable
################################################################# #################################################################
# /profiles/current/config.d/90-exec: # /profiles/current/config.d/90-exec:

2
.config/i3/py3status.conf

@ -37,7 +37,7 @@ networkmanager {
external_script top { external_script top {
cache_timeout = 10 cache_timeout = 10
script_path = "/usr/share/ratflow/scripts/top" script_path = "/home/chodylal/.config/i3/scripts/top"
} }
netdata { netdata {

2
.config/i3/scripts/autoapp

@ -2,7 +2,7 @@
import subprocess, json, os import subprocess, json, os
mapFile = open(os.environ['HOME'] + '/.config/ratflow/profiles/current/autoapp.conf', 'r'); mapFile = open(os.environ['HOME'] + '/.config/i3/autoapp.conf', 'r');
map = json.loads(mapFile.read()); map = json.loads(mapFile.read());

13
.config/nvim/lazy-lock.json

@ -1,10 +1,11 @@
{ {
"LazyVim": { "branch": "main", "commit": "83d90f339defdb109a6ede333865a66ffc7ef6aa" }, "LazyVim": { "branch": "main", "commit": "83d90f339defdb109a6ede333865a66ffc7ef6aa" },
"avante.nvim": { "branch": "main", "commit": "f57f541959797bbca76e6e77efeb8b572e0bea2f" }, "avante.nvim": { "branch": "main", "commit": "0e40cb0c0f13b87be8a2276a844428d60c466d78" },
"blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"catppuccin": { "branch": "main", "commit": "8edd468af4d63212b84d69b2ddb5ffc9023ef5eb" }, "catppuccin": { "branch": "main", "commit": "8edd468af4d63212b84d69b2ddb5ffc9023ef5eb" },
"conform.nvim": { "branch": "master", "commit": "18aeab3d63d350dcf44d64c462cc489a3412af40" }, "clangd_extensions.nvim": { "branch": "main", "commit": "78c2ecd659d54972be17aa6ba2deac3c53223b80" },
"conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dotenv.nvim": { "branch": "main", "commit": "7d516e9293c6e3ac21830fb10a4e8674c02747c6" }, "dotenv.nvim": { "branch": "main", "commit": "7d516e9293c6e3ac21830fb10a4e8674c02747c6" },
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
@ -13,6 +14,7 @@
"gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" }, "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
"grug-far.nvim": { "branch": "main", "commit": "5506c2f59dc9ab2ed6c233585412b24d31d51521" }, "grug-far.nvim": { "branch": "main", "commit": "5506c2f59dc9ab2ed6c233585412b24d31d51521" },
"hybrid-theme": { "branch": "main", "commit": "b131110fbe63481d7d263c71982206a70a04d236" }, "hybrid-theme": { "branch": "main", "commit": "b131110fbe63481d7d263c71982206a70a04d236" },
"image.nvim": { "branch": "master", "commit": "44e07129cd0ea0c60afa7a1991d35b5765b51a6b" },
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
"just-runner.nvim": { "branch": "main", "commit": "f29d405aa828900df242600720a2b0e57261489f" }, "just-runner.nvim": { "branch": "main", "commit": "f29d405aa828900df242600720a2b0e57261489f" },
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
@ -26,16 +28,15 @@
"mini.pairs": { "branch": "main", "commit": "30cf2f01c4aaa2033db67376b9924fa2442c05d6" }, "mini.pairs": { "branch": "main", "commit": "30cf2f01c4aaa2033db67376b9924fa2442c05d6" },
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-dev-container": { "branch": "main", "commit": "365b4c815339d42133829006dce3e5f8b182b771" },
"nvim-lint": { "branch": "master", "commit": "d48f3a76189d03b2239f6df1b2f7e3fa8353743b" }, "nvim-lint": { "branch": "master", "commit": "d48f3a76189d03b2239f6df1b2f7e3fa8353743b" },
"nvim-lspconfig": { "branch": "master", "commit": "a4ed4e761c400849e8c9f8bda33e5083f890268c" }, "nvim-lspconfig": { "branch": "master", "commit": "9573948c38bfabeec353ae7dd7d3ffec4c506a6b" },
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
"nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" }, "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" },
"nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },
"persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
"render-markdown.nvim": { "branch": "main", "commit": "0fd43fb4b1f073931c4b481f5f3b7cea3749e190" }, "render-markdown.nvim": { "branch": "main", "commit": "5adf0895310c1904e5abfaad40a2baad7fe44a07" },
"snacks.nvim": { "branch": "main", "commit": "0770753c88228f7f15449c6a5b242e3f7cd0d71c" }, "snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" },
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
"tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" }, "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },

3
.config/nvim/lua/config/options.lua

@ -35,4 +35,5 @@ vim.opt.listchars = {
-- eol = "↲", -- Symbol for end of line (optional) -- eol = "↲", -- Symbol for end of line (optional)
} }
-- Do not hide syntax makers (**, ``` etc)
-- vim.opt.conceallevel = 0

7
.config/nvim/lua/plugins/image.lua

@ -0,0 +1,7 @@
return {
"3rd/image.nvim",
build = false, -- so that it doesn't build the rock https://github.com/3rd/image.nvim/issues/91#issuecomment-2453430239
opts = {
processor = "magick_cli",
},
}

8
.config/nvim/lua/plugins/notify-config.lua

@ -0,0 +1,8 @@
return {
"folke/snacks.nvim",
opts = {
notifier = {
timeout = 10000,
},
},
}

29
.config/nvim/lua/plugins/snacks.lua

@ -18,6 +18,35 @@ return {
"**/.git", "**/.git",
"**/.DS_Store", "**/.DS_Store",
}, },
-- Yang paths from explorer - Y for relative, gy for absolute
win = {
list = {
keys = {
["Y"] = "copy_relative",
["gy"] = "copy_absolute",
},
},
},
actions = {
copy_absolute = function(_, item)
local path = item.file
vim.fn.setreg('"', path)
vim.fn.setreg("+", path)
Snacks.notify.info("Copied absolute path: " .. path)
end,
copy_relative = function(_, item)
local path = vim.fn.fnamemodify(item.file, ":.")
vim.fn.setreg('"', path)
vim.fn.setreg("+", path)
Snacks.notify.info("Copied relative path: " .. path)
end,
copy_filename = function(_, item)
local filename = vim.fn.fnamemodify(item.file, ":t")
vim.fn.setreg("+", filename)
vim.fn.setreg('"', filename)
vim.notify("Copied filename: " .. filename)
end,
},
}, },
files = { files = {
hidden = true, hidden = true,

2
.dotfiles.d/init/init-shell.sh

@ -3,7 +3,7 @@
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
# ubuntu # ubuntu
sudo apt update -y #sudo apt update -y
sudo apt install -y zsh eza unzip locales sudo apt install -y zsh eza unzip locales
sudo chsh -s $(which zsh) $USER sudo chsh -s $(which zsh) $USER

3
.zshrc

@ -182,11 +182,12 @@ alias xcontrast-reset='xcalib -c'
alias ll='eza --icons=auto -T --level 2 -lah --group-directories-first --color=always | less' alias ll='eza --icons=auto -T --level 2 -lah --group-directories-first --color=always | less'
alias l='eza --icons=auto -lah --group-directories-first --color=always | less' alias l='eza --icons=auto -lah --group-directories-first --color=always | less'
alias gl="git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all" alias gl="git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all"
alias git-config-pb='git config user.name "Łukasz Chodyła" && git config user.email "lukasz.chodyla@platformabiznesu.net"' alias git-config-tb='git config user.name "Łukasz Chodyła" && git config user.email "lukasz.chodyla@transbit.com.pl"'
alias git-config-ch='git config user.name "chodak166" && git config user.email "chodak166@op.pl"' alias git-config-ch='git config user.name "chodak166" && git config user.email "chodak166@op.pl"'
alias config='/usr/bin/git --git-dir=$HOME/.dotfiles.git/ --work-tree=$HOME' alias config='/usr/bin/git --git-dir=$HOME/.dotfiles.git/ --work-tree=$HOME'
alias v='nvim' alias v='nvim'
alias se=sudoedit alias se=sudoedit
alias trb-smb-mount='sudo mount -t cifs -o uid=`id -u chodylal` -o gid=`id -g chodylal` -o user=chodylal //trb-fs-p01/repozytorium/ /home/chodylal/smb'
config config status.showUntrackedFiles no config config status.showUntrackedFiles no

Loading…
Cancel
Save