pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' of gitlab.com:elitherl/dotfiles into main

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-03-15 17:51:53 +00:00
parent 834b0b3983 ac8e25eff5
commit 659fa3e1f9
10 changed files with 63 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.bashrc
View file

@ -53,5 +53,5 @@ command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
command -v direnv > /dev/null 2>&1 && eval "$(direnv hook bash)"
command -v starship > /dev/null 2>&1 && eval "$(starship init bash)"
source <(glab completion -s bash)
source <(gh completion -s bash)
command -v glab > /dev/null && source <(glab completion -s bash)
command -v gh > /dev/null && source <(gh completion -s bash)

1
.gitignore vendored
View file

@ -14,3 +14,4 @@ config/i3/config.d
config/nvim/.venv
config/pypoetry/poetry.lock
config/pypoetry/pyproject.toml
squashfs-root

9
.profile Normal file
View file

@ -0,0 +1,9 @@
# ~/.profile: executed by Bourne-compatible login shells.
if [ "$BASH" ]; then
if [ -f ~/.bashrc ]; then
. ~/.bashrc
fi
fi
mesg n 2> /dev/null || true

37
Makefile
View file

@ -12,9 +12,9 @@ THEMES_TARGETS := $(THEMES_ITEMS:themes/%=$(THEMES_DIR)/%)
LAZY_REPO := https://github.com/folke/lazy.nvim.git
PYENV_DIR := $(if $(PYENV_ROOT), $(PYENV_ROOT), $(HOME)/.pyenv)
.PHONY: default all clean check install
.PHONY: default all clean check directories link configure install
default: $(CONFIG_TARGETS) $(SSH_TARGETS) $(THEMES_TARGETS) $(LAZY_DIR) $(HOME)/.bashrc $(HOME)/.zshrc $(HOME)/.ssh/sockets config/nvim/.venv config/git/user_email
default: directories link configure
all: default install
@ -23,6 +23,7 @@ clean:
for link in $(SSH_TARGETS); do rm "$$link"; done
for link in $(THEMES_TARGETS); do rm "$$link"; done
rm -rf $(LAZY_DIR)
rm $(HOME)/.profile
rm $(HOME)/.bashrc
rm $(HOME)/.zshrc
rmdir $(HOME)/.ssh/sockets
@ -31,32 +32,38 @@ clean:
check:
echo "Placeholder"
install:
command -v direnv > /dev/null || bin_path=$(HOME)/.local/bin bash packages/direnv.sh
command -v pipx > /dev/null || bash packages/pipx.sh
command -v poetry > /dev/null || python3 packages/poetry.py
command -v pyenv > /dev/null || bash packages/pyenv.sh
command -v starship > /dev/null || bash packages/starship.sh
directories: $(CONFIG_DIR) $(SSH_DIR) $(THEMES_DIR) $(HOME)/.ssh/sockets $(HOME)/.local/bin
config/git/user_email:
echo "Missing user_email; Add your email to $$(readlink -f config/git)/user_email"
$(CONFIG_DIR) $(SSH_DIR) $(THEMES_DIR) $(HOME)/.ssh/sockets $(HOME)/.local/bin:
mkdir -p $@
link: $(CONFIG_TARGETS) $(SSH_TARGETS) $(THEMES_TARGETS) $(HOME)/.profile $(HOME)/.bashrc $(HOME)/.zshrc
$(CONFIG_TARGETS): $(CONFIG_DIR)/%: config/%
$(SSH_TARGETS): $(SSH_DIR)/%: ssh/%
$(THEMES_TARGETS): $(THEMES_DIR)/%: themes/%
$(HOME)/.profile: $(HOME)/%: %
$(HOME)/.bashrc: $(HOME)/%: %
$(HOME)/.zshrc: $(HOME)/%: %
$(CONFIG_TARGETS) $(SSH_TARGETS) $(THEMES_TARGETS) $(HOME)/.bashrc $(HOME)/.zshrc:
$(CONFIG_TARGETS) $(SSH_TARGETS) $(THEMES_TARGETS) $(HOME)/.profile $(HOME)/.bashrc $(HOME)/.zshrc:
ln -s $(PWD)/$? $@
$(LAZY_DIR):
git clone --depth 1 $(LAZY_REPO) $@
configure: config/git/user_email config/nvim/.venv
config/git/user_email:
echo "Missing user_email; Add your email to $$(readlink -f config/git)/user_email"
config/nvim/.venv:
python3 -m venv $@
$@/bin/python3 -m pip install -U pip wheel
$@/bin/python3 -m pip install --use-pep517 pynvim
install: $(LAZY_DIR)
command -v direnv > /dev/null || bin_path=$(HOME)/.local/bin bash packages/direnv.sh
command -v pipx > /dev/null || bash packages/pipx.sh
command -v poetry > /dev/null || python3 packages/poetry.py
command -v pyenv > /dev/null || bash packages/pyenv.sh
command -v starship > /dev/null || sh packages/starship.sh -b $(HOME)/.local/bin
$(CONFIG_DIR) $(SSH_DIR) $(THEMES_DIR) $(HOME)/.ssh/sockets $(HOME)/.local/bin:
mkdir -p $@
$(LAZY_DIR):
git clone --depth 1 $(LAZY_REPO) $@

BIN
bin/starship
View file

Binary file not shown.

10
config/dunst/dunstrc
View file

@ -17,7 +17,7 @@
#
# If this option is set to mouse or keyboard, the monitor option
# will be ignored.
follow = none
follow = mouse
### Geometry ###
@ -30,7 +30,7 @@
height = 300
# Position the notification in the top right corner
origin = bottom-right
origin = top-right
# Offset from the origin
offset = 30x40
@ -297,14 +297,14 @@
foreground = "#CAD3F5"
timeout = 5
# Icon for notifications with low urgency, uncomment to enable
icon = /usr/share/icons/Arc-X-D/status/16/dialog-information.png
# icon = /usr/share/icons/Arc-X-D/status/16/dialog-information.png
[urgency_normal]
background = "#24273A"
foreground = "#CAD3F5"
timeout = 5
# Icon for notifications with normal urgency, uncomment to enable
icon = /usr/share/icons/Arc-X-D/status/16/dialog-question.png
# icon = /usr/share/icons/Arc-X-D/status/16/dialog-question.png
[urgency_critical]
background = "#24273A"
@ -312,7 +312,7 @@
frame_color = "#F5A97F"
timeout = 120
# Icon for notifications with critical urgency, uncomment to enable
icon = /usr/share/icons/Arc-X-D/status/16/dialog-warning.png
# icon = /usr/share/icons/Arc-X-D/status/16/dialog-warning.png
# Every section that isn't one of the above is interpreted as a rules to
# override settings for certain messages.

1
config/git/config
View file

@ -1,3 +1,4 @@
# vim: ft=gitconfig
[include]
path = user_email

9
config/i3/config
View file

@ -67,6 +67,7 @@ bindsym $mod+2 workspace $ws2
bindsym $mod+3 workspace $ws3
bindsym $mod+4 workspace $ws4
bindsym $mod+5 workspace $ws5
bindsym $mod+6 workspace $ws6
# switch to workspace with numpad keys
bindcode $mod+87 workspace 1
@ -74,6 +75,7 @@ bindcode $mod+88 workspace 2
bindcode $mod+89 workspace 3
bindcode $mod+83 workspace 4
bindcode $mod+84 workspace 5
bindcode $mod+85 workspace 6
# switch to workspace with numlock numpad keys
bindcode $mod+Mod2+87 workspace $ws1
@ -81,6 +83,7 @@ bindcode $mod+Mod2+88 workspace $ws2
bindcode $mod+Mod2+89 workspace $ws3
bindcode $mod+Mod2+83 workspace $ws4
bindcode $mod+Mod2+84 workspace $ws5
bindcode $mod+Mod2+85 workspace $ws6
# move focused container to workspace
bindsym $mod+Shift+1 move container to workspace $ws1
@ -88,6 +91,7 @@ bindsym $mod+Shift+2 move container to workspace $ws2
bindsym $mod+Shift+3 move container to workspace $ws3
bindsym $mod+Shift+4 move container to workspace $ws4
bindsym $mod+Shift+5 move container to workspace $ws5
bindsym $mod+Shift+6 move container to workspace $ws6
# move focused container to workspace with numpad keys
bindcode $mod+Shift+Mod2+87 move container to workspace $ws1
@ -95,6 +99,7 @@ bindcode $mod+Shift+Mod2+88 move container to workspace $ws2
bindcode $mod+Shift+Mod2+89 move container to workspace $ws3
bindcode $mod+Shift+Mod2+83 move container to workspace $ws4
bindcode $mod+Shift+Mod2+84 move container to workspace $ws5
bindcode $mod+Shift+Mod2+85 move container to workspace $ws6
# move focused container to workspace with numpad keys
bindcode $mod+Shift+87 move container to workspace $ws1
@ -102,6 +107,7 @@ bindcode $mod+Shift+88 move container to workspace $ws2
bindcode $mod+Shift+89 move container to workspace $ws3
bindcode $mod+Shift+83 move container to workspace $ws4
bindcode $mod+Shift+84 move container to workspace $ws5
bindcode $mod+Shift+85 move container to workspace $ws6
# resize window (you can also use the mouse for that):
mode "resize" {
@ -259,6 +265,7 @@ set $ws2 "2:"
set $ws3 "3:"
set $ws4 "4:"
set $ws5 "5:"
set $ws6 "6:🔑"
# use workspaces on different displays:
# where you have to replace VGA-0/HDMI-0 with the names for your displays
@ -268,6 +275,7 @@ set $ws5 "5:"
#workspace $ws3 output HDMI-1
#workspace $ws4 output HDMI-1
#workspace $ws5 output HDMI-1
#workspace $ws6 output HDMI-1
# bind program to workspace and focus to them on startup:
assign [class="wezterm"] $ws1
@ -278,6 +286,7 @@ assign [class="Mailspring"] $ws4
assign [class="Element"] $ws5
assign [class="Signal"] $ws5
assign [class="TelegramDesktop"] $ws5
assign [class="Bitwarden"] $ws6
# automatic set focus new window if it opens on another workspace than the current:
for_window [class=wezterm] focus

6
config/nvim/lua/config/zen_mode.lua
View file

@ -18,4 +18,10 @@ return {
gitsigns = { enabled = true },
tmux = { enabled = true },
},
on_open = function (win)
vim.wo.scrolloff = 999
end,
on_close = function (win)
vim.wo.scrolloff = 0
end
}

8
ssh/config.d/xenia.conf Normal file
View file

@ -0,0 +1,8 @@
# vim: ft=sshconfig
Host xenia
User xenia
HostName 192.168.1.230
Port 30
ForwardX11 no
ForwardAgent yes