feat: fedora version

.zsh_history

@@ -10081,3 +10081,11 @@ brew list
 : 1679578406:0;tmux --help
 : 1679578421:0;tmux -V
 : 1679578428:0;exit
+: 1721110304:0;vi
+: 1721110308:0;nvim
+: 1721110326:0;tmux
+: 1721110388:0;nvim
+: 1721110442:0;tmux
+: 1721110606:0;nvim
+: 1721110750:0;source ~/.tmux.conf
+: 1721110754:0;exit

README.md

@@ -1,2 +1,8 @@
 # dotfiles
 my config files :)
+
+TODO:
+add fonts
+add language servers by default via asdf ?
+teamocil
+theme for kitty

fzf_tmux_sessions/sh/functions.sh

@@ -1,3 +1,7 @@
+#!/bin/bash
+
+PATH=$PATH:$HOME/bin
+
 function list_tmux_sessions {
   # tmux list-sessions | sed -E 's/:.*$//' | awk \"/^[a-zA-Z]/\" | grep -v "$(tmux display-message -p '#S')"
   tmux list-sessions | sed -E 's/:.*$//' | awk \"/^[a-zA-Z]/\"
@@ -24,7 +28,7 @@ function list_tmux_session_processes {
 export -f list_tmux_session_processes
 
 function list_available_teamocil_sessions {
-  files=$(ls $HOME/.config/teamocil/)
+  files=$(ls $HOME/.teamocil/)
   tmux_sessions_array=$(list_tmux_sessions)
 
   for file in $files; do
@@ -91,7 +95,7 @@ function list_tmux_windows {
 export -f list_tmux_windows
 
 export ENV_FILE=$HOME/log.sh
-export TEAMOCIL_FOLDER=$HOME/.config/teamocil/
+export TEAMOCIL_FOLDER=$HOME/.teamocil/
 
 export SESSIONS_HEADER="Press Ctrl-T for switch to processes / Ctrl-D for kill session"
 export SESSIONS_PROMPT="sessions> "

install.conf.yaml

@@ -29,7 +29,7 @@
       force: true
       path: bin/*
     # tmux windows management
-    ~/teamocil/:
+    ~/.teamocil/:
       glob: true
       force: true
       path: teamocil/*

kitty.conf

@@ -1,14 +1,16 @@
 # vim:fileencoding=utf-8:foldmethod=marker
 
-font_family JetBrainsMono Nerd Font Medium
+font_family JetBrainsMono Nerd Font Bold
 bold_font JetBrainsMono Nerd Font Bold
 italic_font JetBrainsMono Nerd Font Italic
 bold_italic_font JetBrainsMono Nerd Font Bold Italic
 
-font_size 11
-modify_font cell_height 11px
+font_size 14
+modify_font cell_height 12px
 
 cursor_text_color background
 cursor_blink_interval 0
 
+hide_window_decorations yes 
+
 include ./theme.conf

nvim/lua/init.lua

@@ -63,4 +63,4 @@ require("close_buffers").setup {
 }
 require("trouble").setup {}
 
-vim.api.nvim_command "Dotenv ~/Desktop/projects/own/dotfiles"
+-- vim.api.nvim_command "Dotenv ~/Desktop/projects/own/dotfiles"

nvim/lua/setup/git.lua

@@ -15,39 +15,44 @@ vim.g.conflict_marker_end = "^>>>>>>> .*$"
 
 gitsigns.setup {
   signs = {
-    add = {
-      hl = "GitSignsAdd",
-      text = "▎",
-      numhl = "GitSignsAddNr",
-      linehl = "GitSignsAddLn",
-    },
-    change = {
-      hl = "GitSignsChange",
-      text = "▎",
-      numhl = "GitSignsChangeNr",
-      linehl = "GitSignsChangeLn",
-    },
-    delete = {
-      hl = "GitSignsDelete",
-      text = "契",
-      numhl = "GitSignsDeleteNr",
-      linehl = "GitSignsDeleteLn",
-    },
-    topdelete = {
-      hl = "GitSignsDelete",
-      text = "契",
-      numhl = "GitSignsDeleteNr",
-      linehl = "GitSignsDeleteLn",
-    },
-    changedelete = {
-      hl = "GitSignsChange",
-      text = "▎",
-      numhl = "GitSignsChangeNr",
-      linehl = "GitSignsChangeLn",
-    },
+    add          = { text = '┃' },
+    change       = { text = '┃' },
+    delete       = { text = '_' },
+    topdelete    = { text = '‾' },
+    changedelete = { text = '~' },
+    untracked    = { text = '┆' },
   },
-  current_line_blame = true,
+  signs_staged = {
+    add          = { text = '┃' },
+    change       = { text = '┃' },
+    delete       = { text = '_' },
+    topdelete    = { text = '‾' },
+    changedelete = { text = '~' },
+    untracked    = { text = '┆' },
+  },
+  signs_staged_enable = true,
+  signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
+  numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
+  linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
+  word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
+  watch_gitdir = {
+    follow_files = true
+  },
+  auto_attach = true,
+  attach_to_untracked = false,
+  current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+  current_line_blame_opts = {
+    virt_text = true,
+    virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
+    delay = 1000,
+    ignore_whitespace = false,
+    virt_text_priority = 100,
+  },
+  current_line_blame_formatter = '<author>, <author_time:%R> - <summary>',
   sign_priority = 6,
+  update_debounce = 100,
+  status_formatter = nil, -- Use default
+  max_file_length = 40000, -- Disable if file is longer than this (in lines)
   on_attach = function(bufnr)
     local function map(mode, lhs, rhs, opts)
       opts = vim.tbl_extend("force", { noremap = true, silent = true }, opts or {})

nvim/lua/setup/plugins.lua

@@ -58,7 +58,7 @@ require("lazy").setup {
   -- "williamboman/mason.nvim",
   -- "williamboman/mason-lspconfig.nvim",
   -- Icons
-  "kyazdani42/nvim-web-devicons",
+  "nvim-tree/nvim-web-devicons",
   -- Another
   "tpope/vim-surround",
   { "mg979/vim-visual-multi", branch = "master" },
@@ -73,7 +73,7 @@ require("lazy").setup {
   "beauwilliams/focus.nvim",
   "nvim-lualine/lualine.nvim",
   "Raimondi/delimitMate",
-  "max397574/better-escape.nvim",
+  "max397576/better-escape.nvim",
   "NvChad/nvim-colorizer.lua",
   "L3MON4D3/LuaSnip",
   "kazhala/close-buffers.nvim",
@@ -87,4 +87,7 @@ require("lazy").setup {
   -- {dir = "../custom-plugins/diff-conflict-parts/lua/init.lua"}
 }
 
+require'nvim-tree'.setup {}
+require'nvim-web-devicons'.setup{}
+
 -- vim.opt.rtp:prepend "~/.config/nvim/lua/plugins/diff_conflict_parts"

teamocil/dotfiles.yml

@@ -1,7 +1,7 @@
 name: dotfiles
 windows:
   - name: dotfiles
-    root: ~/Desktop/projects/own/dotfiles
+    root: ~/projects/dotfiles
     layout: tiled
     panes:
       - commands:

teamocil/expert-portal.yml

@@ -1,14 +1,14 @@
 name: expert-portal
 windows:
   - name: backend
-    root: ~/Desktop/projects/prosapient/expert-portal
+    root: ~/projects/expert-portal
     layout: tiled
     panes:
-      - source bin/activate && cd backend/src && python manage.py runserver
-      - docker-compose --file expert-portal.docker-compose.yml up database
+      - docker compose up db redis
+      - docker compose run --service-ports backend python src/manage.py runserver 0.0.0.0:8000
       - cd frontend && pnpm start
   - name: frontend
-    root: ~/Desktop/projects/prosapient/expert-portal/frontend
+    root: ~/projects/expert-portal/frontend
     layout: tiled
     panes:
       - commands:

teamocil/surveys.yml

@@ -1,40 +1,40 @@
 name: surveys 
 windows:
   - name: panels-ps-wow
-    root: ~/Desktop/projects/prosapient/survey-panels/
+    root: ~/projects/survey-panels/
     layout: tiled
     panes:
       # - docker-compose up
       # - psql -d survey_panels -U postgres -h 0.0.0.0
   - name: datatool-ps
-    root: ~/Desktop/projects/prosapient/survey-datatool/
+    root: ~/projects/survey-datatool/
     layout: tiled
     panes:
-      - cd backend && docker-compose up
+      - cd backend && docker compose up
       - cd backend && pipenv --python 3.14.0 && pipenv run gunicorn main:app --workers 4 --worker-class uvicorn.workers.UvicornWorker --bind 0.0.0.0:4000
   - name: facade-ps
-    root: ~/Desktop/projects/prosapient/survey-facade/
+    root: ~/projects/survey-facade/
     layout: tiled
     panes:
       - docker-compose up
       - cd backend && pipenv --python 3.14.0 && pipenv run python src/manage.py runserver 0.0.0.0:8000 
       - cd frontend && npm run dev
   - name: builder-ps
-    root: ~/Desktop/projects/prosapient/survey-builder/
+    root: ~/projects/survey-builder/
     layout: tiled
     panes:
       - docker-compose up
       - pipenv --python 3.14.0 && pipenv run gunicorn main:app --workers 4 --worker-class uvicorn.workers.UvicornWorker --bind 0.0.0.0:8001
       - psql -d survey_builder -U postgres -h 0.0.0.0 -p 5433
   - name: datatool
-    root: ~/Desktop/projects/prosapient/survey-datatool/frontend/
+    root: ~/projects/survey-datatool/frontend/
     layout: tiled
     panes:
       - commands:
          - vi
         focus: true
   - name: facade
-    root: ~/Desktop/projects/prosapient/survey-facade/frontend/
+    root: ~/projects/survey-facade/frontend/
     layout: tiled
     panes:
       - commands:

tmux.conf

@@ -31,8 +31,8 @@ bind '"' split-window -c "#{pane_current_path}"
 bind % split-window -h -c "#{pane_current_path}"
 
 # Split window and fix path for tmux
-bind v split-window -h -c "#{pane_current_path}" -p 35
-bind s split-window -v -c "#{pane_current_path}" -p 30
+bind v split-window -h -c "#{pane_current_path}" -l 68
+bind s split-window -v -c "#{pane_current_path}" -l 11
 bind f display-popup -w 75% -h 50% -E "~/.config/fzf_tmux_sessions/bin/fzf_tmux_sessions.sh"
 bind 0 switch-client -l
 

zsh/fzf.sh

@@ -4,10 +4,6 @@ if [[ ! "$PATH" == */opt/homebrew/opt/fzf/bin* ]]; then
   export PATH="${PATH:+${PATH}:}/opt/homebrew/opt/fzf/bin"
 fi
 
-# Auto-completion
-# ---------------
-[[ $- == *i* ]] && source "/opt/homebrew/opt/fzf/shell/completion.zsh" 2> /dev/null
-
 # Settings
 export FZF_DEFAULT_COMMAND='ag --hidden --ignore node_modules -g ""'
 export FZF_CTRL_T_COMMAND=$FZF_DEFAULT_COMMAND
@@ -16,6 +12,4 @@ export FZF_DEFAULT_OPTS="--height 80% --color=bg+:#eee8d5,fg+:-1,gutter:-1"
 export FZF_CTRL_T_OPTS="--delimiter '/' --nth=-1 $FZF_HIGHLIGHT_PREVIEW_OPTS"
 export BAT_THEME="Solarized (light)"
 
-# Key bindings
-# ------------
-source "/opt/homebrew/opt/fzf/shell/key-bindings.zsh"
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

zshrc

@@ -25,28 +25,32 @@ alias code="nvim"
 ZSH_THEME="geoffgarside"
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=12'
 
-plugins=(git zsh-autosuggestions web-search dirhistory)
+plugins=(git web-search dirhistory asdf)
 
 export ASDF_DIR=$HOME/.asdf/
-export CARGO_DIR=$HOME/.cargo/
+# export CARGO_DIR=$HOME/.cargo/
 export ZSH_DIR=$HOME/.oh-my-zsh/
 
 # export DIRENV_LOG_FORMAT=
 export EDITOR=nvim
 export VISUAL="$EDITOR"
 
 export LUA_PATH=~/nvim/lua/?.lua
-export PATH=/opt/homebrew/opt/postgresql@15/bin:$HOME/.config/bin:/opt/homebrew/bin:$HOME/.iex-history:$HOME/elixir_ls:$PATH
+export PATH=/opt/homebrew/opt/postgresql@15/bin:$HOME/.config/bin:/opt/homebrew/bin:$HOME/.iex-history:$HOME/elixir_ls:$HOME/bin:$PATH
 
 eval "$(direnv hook zsh)"
 
 source $ZSH_DIR/oh-my-zsh.sh
 source $ASDF_DIR/asdf.sh
-source $CARGO_DIR/env
-source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+# source $CARGO_DIR/env
 
 for file in $HOME/.config/zsh/*; do
   [ -f $file ] && source "$file"
 done
 
 setopt share_history
+
+alias kitty=~/.local/kitty.app/bin/kitty
+source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+export DD_REMOTE_CONFIGURATION_ENABLED=true