global/.config/alacritty/alacritty.toml

@@ -48,7 +48,7 @@ decorations = "full"
 dynamic_padding = false
 dynamic_title = true
 startup_mode = "Maximized"
-opacity = 1.0
+opacity = 0.9
 
 [window.padding]
 x = 2

global/.config/jrnl/jrnl.yaml

@@ -1,21 +0,0 @@
-colors:
-  body: none
-  date: black
-  tags: yellow
-  title: cyan
-default_hour: 9
-default_minute: 0
-editor: nvim
-encrypt: true
-highlight: true
-indent_character: '|'
-journals:
-  default:
-    display_format: markdown
-    encrypt: true
-    journal: /Users/fz0x1/PKM/diary/diary.md
-linewrap: 79
-tagsymbols: '@'
-template: false
-timeformat: '%F %r'
-version: v4.1

global/.config/nvim/ftplugin/jrnl.lua

@@ -1,2 +0,0 @@
-vim.opt_local.textwidth = 80
-vim.opt_local.colorcolumn = "80"

global/.config/nvim/lua/plugins/conform.lua

@@ -5,14 +5,7 @@ return {
 		formatters = {
 			prettier_markdown = {
 				command = "prettier",
-				args = {
+				args = { "--stdin-filepath", "$FILENAME", "--config", os.getenv("HOME") .. "/.prettierrc.yaml" },
-					"--stdin-filepath",
-					"$FILENAME",
-					"--config",
-					os.getenv("HOME") .. "/.prettierrc.yaml",
-					"--parser",
-					"markdown",
-				},
 				-- stdin = true,
 				-- options = {
 				-- 	ext_parsers = {

global/.config/nvim/lua/plugins/everforest.lua

@@ -1,6 +1,6 @@
 return {
 	"sainnhe/everforest",
-	-- lazy = false,
+	lazy = false,
 	priority = 1000,
 	config = function()
 		-- Optionally configure and load the colorscheme

global/.config/nvim/lua/plugins/gruvbox.lua

@@ -1,7 +1,7 @@
 return {
 	"ellisonleao/gruvbox.nvim",
-	lazy = false,
+	lazy = true,
-	priority = 1000,
+	priority = 0,
 	opts = {},
 	config = function()
 		vim.cmd("colorscheme gruvbox")

global/.config/nvim/lua/plugins/lsp.lua

@@ -93,15 +93,7 @@ local config = function()
 		},
 		automatic_installation = true,
 		handlers = {
-			-- lsp_zero.default_setup,
+			lsp_zero.default_setup,
-			-- https://github.com/neovim/nvim-lspconfig/pull/3232
-			function(server_name)
-				if server_name == "tsserver" then
-					server_name = "ts_ls"
-				else
-					lsp_zero.default_setup(server_name)
-				end
-			end,
 			lua_ls = function()
 				local lua_opts = lsp_zero.nvim_lua_ls()
 				require("lspconfig").lua_ls.setup(lua_opts)

global/.gitconfig

@@ -1,7 +1,6 @@
 [user]
-	name = fz0x1
+	name = foozzi
-	email = umka@posteo.net
+	email = foozzione@gmail.com
-	signingkey = 979143DA930C3525556DBF7E7FB357158731DF87
 [core]
 	excludesfile = "$HOME/.gitignore"
 	pager = delta
@@ -16,13 +15,3 @@
     colorMoved = default
 [init]
 	defaultBranch = master
-[commit]
-	gpgSign = true
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
-[credential]
-	helper = osxkeychain
-	useHttpPath = true

global/.newsboat/config

@@ -1,33 +0,0 @@
-# general settings
-auto-reload yes
-max-items 50
-
-# external browser
-include config-macos
-
-# unbind keys
-unbind-key ENTER
-unbind-key j
-unbind-key k
-unbind-key J
-unbind-key K
-
-# bind keys - vim style
-bind-key j down
-bind-key k up
-bind-key l open
-bind-key h quit
-
-# solarized
-color background         default   default
-color listnormal         default   default
-color listnormal_unread  default   default
-color listfocus          black     cyan
-color listfocus_unread   black     cyan
-color info               default   black
-color article            default   default
-
-# highlights
-highlight article "^(Title):.*$" blue default
-highlight article "https?://[^ ]+" red default
-highlight article "\\[image\\ [0-9]+\\]" green default

global/.newsboat/urls

@@ -1,4 +0,0 @@
-https://www.opennet.ru/opennews/opennews_all_utf.rss
-https://www.linux.org.ru/section-rss.jsp?section=1
-https://xakep.ru/feed/
-https://www.securitylab.ru/_services/export/rss/

global/.tmux.conf

@@ -1,5 +1,4 @@
 # mouse
-source-file ~/.tmux/themes/tmux-colorscheme.conf
 setw -g mouse on
 
 unbind C-b
@@ -10,8 +9,7 @@ set -g mode-keys vi
 bind-key -T copy-mode-vi v send-keys -X begin-selection
 bind-key -T copy-mode-vi y send-keys -X copy-pipe "pbcopy"
 
-# set -g default-terminal tmux-256color
+set -g default-terminal tmux-256color
-set -g default-terminal xterm-256color
 set -sa terminal-features ',alacritty:RGB'
 set -ga terminal-overrides ",*256col*:Tc"
 
@@ -34,31 +32,27 @@ bind -n M-d split-window -h -c '#{pane_current_path}'
 bind -n M-W kill-pane
 
 # Automatic restore
-# set -g @continuum-restore 'on'
+set -g @continuum-restore 'on'
-# set -g @resurrect-capture-pane-contents 'on'
+set -g @resurrect-capture-pane-contents 'on'
 #set -g @resurrect-processes ''
 
-# very unique Mac bug
+set -g @catppuccin_window_status_icon_enable "yes"
-if-shell "type 'reattach-to-user-namespace' >/dev/null" "set -g default-command 'reattach-to-user-namespace -l $SHELL'"
+set -g @catppuccin_window_default_fill "number"
-
+set -g @catppuccin_status_left_separator "█"
-# set -g status-style "fg=#665c54"
+set -g @catppuccin_status_fill "all"
-# set -g status-bg default
+set -g @catppuccin_status_modules_right "application session battery"
-set -g status-position top
+set -g @catppuccin_application_icon ""
-# set -g status-interval 1
-# set -g status-left ""
-
-# disable status
-#set -g status off
-set -g status on
 
 # plugins
 set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'catppuccin/tmux'
 set -g @plugin 'tmux-plugins/tmux-battery'
 set -g @plugin 'tmux-plugins/tmux-sensible'
-# set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
-# set -g @plugin 'tmux-plugins/tmux-continuum'
+set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @plugin 'MunifTanjim/tmux-mode-indicator'
 set -g @plugin 'christoomey/vim-tmux-navigator'
 
+
 run '~/.tmux/plugins/tpm/tpm'
 

global/.tmux/themes/tmux-colorscheme.conf

@@ -1,63 +0,0 @@
-### theme settings ###
-
-# window separators
-set-option -wg window-status-separator ""
-
-# monitor window changes
-set-option -wg monitor-activity on
-set-option -wg monitor-bell on
-
-# set statusbar update interval
-set-option -g status-interval 1
-
-### colorscheme ###
-
-# change window screen colors
-set-option -wg mode-style bg="#fe8019",fg="#3c3836"
-
-# default statusbar colors (terminal bg should be #282828)
-set-option -g status-style bg=terminal,fg="#a89984"
-
-# default window title colors
-set-option -wg window-status-style bg=terminal,fg="#7c6f64"
-
-# colors for windows with activity
-set-option -wg window-status-activity-style bg="#3c3836",fg="#a89984"
-
-# colors for windows with bells
-set-option -wg window-status-bell-style bg="#3c3836",fg="#fe8019"
-
-# active window title colors
-set-option -wg window-status-current-style bg=terminal,fg="#c3c3c3"
-
-# pane border
-set-option -g pane-active-border-style fg="#fe8019"
-set-option -g pane-border-style fg="#3c3836"
-
-# message info
-set-option -g message-style bg="#fe8019",fg="#3c3836"
-
-# writing commands inactive
-set-option -g message-command-style bg="#a89984",fg="#3c3836"
-
-# pane number display
-set-option -g display-panes-active-colour "#fe8019"
-set-option -g display-panes-colour "#3c3836"
-
-# clock
-set-option -wg clock-mode-colour "#fe8019"
-
-# copy mode highlighting
-%if #{>=:#{version},3.2}
-    set-option -wg copy-mode-match-style "bg=#a89984,fg=#3c3836"
-    set-option -wg copy-mode-current-match-style "bg=#fe8019,fg=#3c3836"
-%endif
-
-# statusbar formatting
-# "#fe8019" MUST be in lowercase here (conflicts with statusline alias otherwise)
-#set-option -g status-left "#{session_name} "
-# set-option -g status-right "#[bg=#3c3836, fg=#7c6f64] %Y-%m-%d %H:%M:%S #[bg=#a89984, fg=#3c3836]#{?client_prefix,#[bg=#fe8019],#[bg=#a89984]} #{host_short} "
-set-option -g status-right "%Y-%m-%d %H:%M:%S"
-
-set-option -wg window-status-current-format "#{?window_zoomed_flag,#[fg=default bold],#[fg=default]} [#{window_index}]:#{window_name}"
-set-option -wg window-status-format "#{?window_zoomed_flag,#[fg=default bold],#[fg=default]} [#{window_index}]:#{window_name}"

global/.zshrc

@@ -18,6 +18,8 @@ plugins=(git python tmux genpass web-search zsh-syntax-highlighting zsh-autosugg
 
 fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
 
+commit_date=$(date +%Y%m%d)
+
 source $ZSH/oh-my-zsh.sh
 # functions
 ### ARCHIVE EXTRACTION
@@ -87,9 +89,9 @@ alias evim='nvim ~/.dotfiles/global/.config/nvim/'
 alias kvim='nvim ~/PKM/'
 alias cvim='nvim ~/.zshrc'
 alias tvim='nvim ~/Dropbox/TODO/'
-alias kvimr='nvim ~/PKM/05\ -\ resources/'
+alias kvimr='nvim ~/PKM/05 - resources/'
-alias kvimj='nvim ~/PKM/02\ -\ journal/'
+alias kvimj='nvim ~/PKM/02 - journal/'
-alias jvim='nvim ~/PKM/02\ -\ journal/$(date "+%Y-%m-%d").md'
+alias jvim='nvim ~/PKM/02 - journal/$(date "+%Y-%m-%d").md'
 # alias vim='nvim'
 alias vi='nvim'
 alias v='nvim'
@@ -107,7 +109,7 @@ alias et="eton"
 alias zk="eton zk"
 alias di=" eton diary"
 ## toipe (https://github.com/Samyak2/toipe)
-alias to="toipe -f ~/Productivity/TextSync/typing_wordlists/most_problems"
+alias to="toipe"
 ## jrnl.sh
 alias jrnl=" jrnl"
 alias lj="jrnl -n 3 --format json | jq '.entries[].date'"
@@ -117,10 +119,10 @@ alias jup="jupyter lab"
 alias hledger='hledger -f ~/PKM/ledger/2024.journal'
 alias ehledger='nvim ~/PKM/ledger/2024.journal'
 ## other
-alias cclear="reset && tmux clear-history && cd"
+alias cclear="reset && tmux clear-history"
 ## git
-alias s_diary="cd ~/PKM/diary/ && git commit -am \"\$(date +%Y%m%d)\" && git push origin master"
+alias s_diary="cd ~/PKM/diary/ && git commit -am '$commit_date' && git push origin master"
-alias s_ledger="cd ~/PKM/ledger/ && git commit -am \"\$(date +%Y%m%d)\" && git push origin master"
+alias s_ledger="cd ~/PKM/ledger/ && git commit -am '$commit_date' && git push origin master"
 
 # Preferred editor for local and remote sessions
 export EDITOR='nvim'

macos/.newsboat/config-macos

@@ -1,2 +0,0 @@
-browser "/opt/homebrew/bin/lynx %u"
-macro l set browser "/opt/homebrew/bin/librewolf %u"; open-in-browser ; set browser "/opt/homebrew/bin/lynx %u"