7 files changed, 69 insertions, 36 deletions
diff --git a/.editorconfig b/editorconfig/.editorconfig
index 6a637a0..6a637a0 100644
--- a/.editorconfig
+++ b/editorconfig/.editorconfig
diff --git a/gnupg/.gnupg/gpg-agent.conf b/gnupg/.gnupg/gpg-agent.conf
new file mode 100644
index 0000000..682af4e
--- /dev/null
+++ b/gnupg/.gnupg/gpg-agent.conf
@@ -0,0 +1,3 @@
+default-cache-ttl 28800
+max-cache-ttl 28800
+pinentry-timeout 1200
diff --git a/gnupg/.gnupg/gpg.conf b/gnupg/.gnupg/gpg.conf
new file mode 100644
index 0000000..ffa0f43
--- /dev/null
+++ b/gnupg/.gnupg/gpg.conf
@@ -0,0 +1,30 @@
+# UTF-8 support for compatibility
+charset utf-8
+
+# No comments in messages
+no-comments
+
+# No version in output
+no-emit-version
+
+# Disable banner
+no-greeting
+
+# Long key id format
+keyid-format 0xlong
+
+# Display UID validity
+list-options show-uid-validity
+verify-options show-uid-validity
+
+# Display all keys and their fingerprints
+with-fingerprint
+
+# Cross-certify subkeys are present and valid
+require-cross-certification
+
+# Disable caching of passphrase for symmetrical ops
+no-symkey-cache
+
+# Enable smartcard
+use-agent
diff --git a/nvim/.config/nvim/lua/custom/plugins/neorg.lua b/nvim/.config/nvim/lua/custom/plugins/neorg.lua
new file mode 100644
index 0000000..455b80d
--- /dev/null
+++ b/nvim/.config/nvim/lua/custom/plugins/neorg.lua
@@ -0,0 +1,22 @@
+return {}
+-- return {
+--   "nvim-neorg/neorg",
+--   lazy = false,
+--   version = "*",
+--   config = function()
+--     require("neorg").setup {
+--       load = {
+--         ["core.defaults"] = {},
+--         ["core.concealer"] = {},
+--         ["core.dirman"] = {
+--           config = {
+--             workspaces = {
+--               notes = "~/notes"
+--             },
+--             default_workspace = "notes"
+--           }
+--         },
+--       }
+--     }
+--   end,
+-- }
diff --git a/nvim/.config/nvim/plugin/keymaps.lua b/nvim/.config/nvim/plugin/keymaps.lua
index 8e24efb..48fff51 100644
--- a/nvim/.config/nvim/plugin/keymaps.lua
+++ b/nvim/.config/nvim/plugin/keymaps.lua
@@ -4,6 +4,9 @@ set("n", "<leader>w", "<cmd>w<cr>", { desc = "Write buffer" })
 
 set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Show diagnostic [E]rror messages" })
 
+-- execute current file. TODO: think this can be smarter
+set("n", "<leader>r", '<cmd>!"%:p"<cr>')
+
 -- ui navigation
 set("n", "<m-j>", "<c-w><c-j>")
 set("n", "<m-k>", "<c-w><c-k>")
diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile
index 3b82e4d..08f137f 100644
--- a/zsh/.config/zsh/.zprofile
+++ b/zsh/.config/zsh/.zprofile
@@ -1,37 +1,3 @@
-# Guix
-_GUIX_PROFILE="$HOME/.config/guix/current"
-export GUIX_PROFILE="$HOME/.guix-profile"
-
-# XDG variables
-export XCURSOR_PATH="${XCURSOR_PATH:-/usr/local/share/icons:/usr/share/icons}"
-export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
-export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
-export XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}"
-export XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS:-/etc/xdg}"
-export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
-export XDG_DATA_DIRS="$GUIX_PROFILE/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS"
-
 # User defaults
 export EDITOR="nvim"
 export PAGER="less"
-
-
-# It can be assumed that this file will be sourced once but for some obscure
-# reason tmux starts login shell so this file will be sourced again and again.
-# Since I don't want to override default tmux behaviour and is's possible that
-# other programs will start login shell its better to put some guard over
-# recursive definitions and any other things that should be evaluated once.
-
-if [ -z ${SHELL_RECURSION_GUARD+x} ]; then
-
-  export SHELL_RECURSION_GUARD=1
-
-# GUIX
-  [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
-  export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
-  
-# PATH
-  export PATH=$HOME/.cargo/bin/:$PATH
-
-fi
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index fd47a93..499f753 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -90,7 +90,7 @@ precmd()
 }
 setopt prompt_subst
 
-PROMPT='%B%F{40}%~%f%b${vcs_info_msg_0_} %F{40}%f '
+PROMPT='%B%F{40}%~%f%b${vcs_info_msg_0_} ${GUIX_ENVIRONMENT:+[env] }%F{40}%f '
 
 # Bindings
 
@@ -113,7 +113,7 @@ alias v=nvim
 alias vf='nvim $(fzf --preview="bat --color=always {}")'
 alias ls="ls --color"
 alias la="ls -la"
-alias c='clear'
+alias c='clear; tmux clear-history'
 alias x='source $ZDOTDIR/.zshrc'
 function fkill () {
   (date; ps -ef) |
@@ -122,6 +122,15 @@ function fkill () {
       --preview='echo {}' --preview-window=down,3,wrap \
       | awk '{print $2}' | sudo xargs kill -9
 }
+## Unnecessary after pass -c will work
+function cpass () {
+  pass $1 | tr -d "[:space:]" | wl-copy --type text/plain
+}
+alias guile='rlwrap guile'
+alias md='mkdir'
+alias rmd='rmdir'
+alias gs='git status'
+
 
 # Shell integrations
 source <(fzf --zsh)