all: more housekeeping
Anirudh Oppiliappan x@icyphox.sh
Sun, 11 Sep 2022 12:14:04 +0530
25 files changed,
76 insertions(+),
837 deletions(-)
D
bash/.bashrc.d/90-aliases.bash
@@ -1,29 +0,0 @@
-ggp() { - [[ "$1" == "-f" ]] && { - git push "$(git remote show)" -f "$(git branch --show-current)" - } - git push "$(git remote show)" "$(git branch --show-current)" -} - -gpl() { - git pull -r "$(git remote show)" "$(git branch --show-current)" -} - -gpm() { - git pull -r origin master -} - -gco() { - [[ "$1" == "" ]] && return 1 - - git rev-parse --verify "$1" &> /dev/null - if [ $? -eq 0 ]; then - git checkout "$1" - else - git checkout -b "$1" - fi -} - -gaf() { - git status --short | grep "^ M\|^ D\|^\?\?" | fzy | awk '{ print $2 }' | xargs git add -}
D
bash/.bashrc.d/99-prompt.bash
@@ -1,6 +0,0 @@
-refresh_tmux() { - tmux refresh-client -S -} -PROMPT_COMMAND=refresh_tmux -PS1="\n\001\e[0;36m\002▲\001\e[0m\002 "; -PS2="> "
D
home/.Xresources
@@ -1,47 +0,0 @@
- -! _ __ -! | |/ /________ _________ __ _______________ _____ -! | // ___/ _ \/ ___/ __ \/ / / / ___/ ___/ _ \/ ___/ -! _ / |/ / / __(__ ) /_/ / /_/ / / / /__/ __(__ ) -!(_)_/|_/_/ \___/____/\____/\__,_/_/ \___/\___/____/ -! - -#include ".colors/light" - - -*.font: Input:style=Regular:size=12:antialias=true -*.italicFont: Input:style=Italic:size=12:antialias=true -*.boldFont: Input:style=Bold:size=12:antialias=true -*.borderpx: 30 - -! xnotify -xnotify.gap: 5 -xnotify.gravity: NE -xnotify.title.font: Input:style=Bold:size=12:antialias=true -xnotify.wrap: true - -! xprompt -xprompt.font: Input:style=Regular:size=12:antialias=true -xprompt.gravity: C -xprompt.borderWidth: 1 -xprompt.geometry: 400x50 - -! xterm -xterm*faceName: Input -xterm*faceSize: 12 -xterm*scrollBar: false -xterm*internalBorder: 32 -xterm.vt100.locale: false -xterm.vt100.utf8: true -xterm.vt100.metaSendsEscape: true -xterm.vt100.allowMouseOps: true -xterm.termName: xterm-256color -xterm.vt100.translations: #override \n\ - Ctrl Shift <Key>C: copy-selection(CLIPBOARD) \n\ - Ctrl Shift <Key>V: insert-selection(CLIPBOARD) - -! ssh-askpass -*Dialog.font: Input:style=Regular:size=12:antialias=true -*shadowThickness: 0 -*borderWidth: 0 -*?.background: rgb:f4/f4/f4
D
home/.colors/dark
@@ -1,21 +0,0 @@
-*foreground: #f9f9f9 -*background: #222222 -*cursor: #f9f9f9 - -*color0: #f9f9f9 -*color1: #f43f3f -*color2: #aae557 -*color3: #f7b740 -*color4: #84aff4 -*color5: #e398f9 -*color6: #84e7f4 -*color7: #676767 - -*color8: #aaaaaa -*color9: #db7070 -*color10: #fafafa -*color11: #7a7a7a -*color12: #8a8a8a -*color13: #454545 -*color14: #509c93 -*color15: #6d6d6d
D
home/.colors/light
@@ -1,22 +0,0 @@
-*foreground: #676767 -*background: #f4f4f4 -*cursor: #676767 - -*color0: #f4f4f4 -*color1: #db7070 -*color2: #7c9f4b -*color3: #d69822 -*color4: #6587bf -*color5: #b870ce -*color6: #509c93 -*color7: #676767 - -*color8: #aaaaaa -*color9: #c66666 -*color10: #6d8b42 -*color11: #e7e7e7 -*color12: #8a8a8a -*color13: #a262b5 -*color14: #43827b -*color15: #525252 -
D
home/.cwmrc
@@ -1,66 +0,0 @@
-# .cwmrc - -sticky yes -snapdist 4 -unbind-key all - -fontname "Input:style=Regular:size=12" - -# groups -bind-key 4-1 group-only-1 -bind-key 4-2 group-only-2 -bind-key 4-3 group-only-3 -bind-key 4-4 group-only-4 -bind-key 4-5 group-only-5 -bind-key 4S-1 window-movetogroup-1 -bind-key 4S-2 window-movetogroup-2 -bind-key 4S-3 window-movetogroup-3 -bind-key 4S-4 window-movetogroup-4 -bind-key 4S-5 window-movetogroup-5 - -# execs -bind-key 4-Return '/usr/local/bin/st' -bind-key 4-p '/home/icy/bin/pwmenu.sh' -bind-key CS-backslash "/home/icy/bin/scr -s" -bind-key C-backslash "/home/icy/bin/scr -f" -bind-key 4C-q "slock zzz" -bind-key C-space "setxkbmap ru" -bind-key CS-space "xmodmap /home/icy/.xmodmap" - -# keybinds -bind-key 4-d menu-exec -bind-key M-Tab window-cycle -bind-key MS-Tab window-rcycle -bind-key 4-Tab group-cycle -bind-key 4S-Tab group-rcycle -bind-key 4S-space window-maximize -bind-key 4-c window-vtile -bind-key 4-y window-htile -bind-key 4S-q window-close -bind-key 4S-y window-snap-left -bind-key 4S-o window-snap-right -bind-key 4S-r restart -bind-key 4S-e quit -bind-key 4S-b window-vmaximize - -# mousebinds -unbind-mouse all - -bind-mouse 4S-1 window-resize -bind-mouse 4-1 window-move -bind-mouse 4-2 window-lower - -# other -borderwidth 1 -snapdist 10 -ignore bar -gap 50 0 0 0 -autogroup 0 barito - -# colors -color menufg "#f4f4f4" -color menubg "#676767" -color font "#f4f4f4" -color selfont "#676767" -color activeborder "#232323" -color inactiveborder "#aaaaaa"
D
home/.gitconfig
@@ -1,35 +0,0 @@
-[user] - name = Anirudh Oppiliappan - email = x@icyphox.sh - signingkey = 8A93F96F78C5D4C4 -[commit] - gpgsign = true - verbose = true -[gpg] - program = gpg -[credential] - helper = store - -[sendemail] - smtpserver = smtp.migadu.com - smtpuser = x@icyphox.sh - smtpencryption = ssl - smtpserverport = 465 - -[init] - defaultBranch = master -[diff] - tool = vimdiff3 -[difftool "vimdiff3"] - path = nvim - prompt = false -[merge] - tool = vimdiff3 -[mergetool "vimdiff3"] - path = nvim - prompt = false -[bash] - showDirtyState = true - showUntrackedFiles = false -[pull] - rebase = true
D
home/.inputrc
@@ -1,42 +0,0 @@
-# do not bell on tab-completion -#set bell-style none - -set meta-flag on -set input-meta on -set convert-meta off -set output-meta on - -$if mode=emacs - -# for linux console and RH/Debian xterm -"\e[1~": beginning-of-line -"\e[4~": end-of-line -"\e[5~": beginning-of-history -"\e[6~": end-of-history -"\e[7~": beginning-of-line -"\e[3~": delete-char -"\e[2~": quoted-insert -"\e[5C": forward-word -"\e[5D": backward-word -"\e\e[C": forward-word -"\e\e[D": backward-word -"\e[1;5C": forward-word -"\e[1;5D": backward-word - -# for rxvt #added -"\e[1~": beginning-of-line -"\e[4~": end-of-line - -# for non RH/Debian xterm, can't hurt for RH/DEbian xterm -"\eOH": beginning-of-line -"\eOF": end-of-line - -# for freebsd console -"\e[H": beginning-of-line -"\e[F": end-of-line -$endif - -"\e[A": history-search-backward -"\e[B": history-search-forward - -"\e[P": delete-char
D
home/.mailrc
@@ -1,72 +0,0 @@
-set v15-compat -set netrc-lookup -set netrc-pipe='gpg2 -qd ~/.netrc.gpg' -set sendcharsets=utf-8,iso-8859-1 -set reply-in-same-charset -set fullnames -set followup-to followup-to-honour=ask-yes - -account "personal" { - localopts yes - set from="Anirudh Oppiliappan <anirudh@oppiliappan.com>" - set folder=~/mail/personal - set record=+Sent - set inbox=+Inbox - set mta=smtps://smtp.migadu.com:465 - shortcut \ - sent +Sent \ - inbox +Inbox \ - drafts +Drafts \ - trash +Trash \ - archive +Archive \ - spam +Junk \ - rl "+Read Later" -} - -set prompt='> ' -set colour-pager crt - -colour 256 sum-dotmark ft=bold,fg=13 dot -colour 256 sum-header fg=007 older -colour 256 sum-header bg=253,fg=white dot -colour 256 sum-header fg=white -colour 256 sum-thread bg=008 dot -colour 256 sum-thread fg=cyan - -account personal -set askattach -set markanswered -set autocollapse -set reply-to-honour -set editalong -set history-gabby=all -set history-file=~/.s-nailhist -set autosort=date - -set pipe-text/html='w3m -T text/html' -set pipe-image/png='feh -' -set pipe-image/jpg='feh -' -set pipe-image/jpeg='feh -' -set pipe-application/pdf='zathura -' - -define trash { - move "$@" +Trash -} -commandalias del call trash - -retain date from to cc subject -set mime-counter-evidence=0xE - -define sync { - !mbsync -a - newmail -} -commandalias n call sync -commandalias mv mimeview - -define signature { - vput ! sig cat ~/.signature - vput csop message-inject-tail trim-end $sig -} - -set on-compose-leave=signature
D
home/.mbsyncrc
@@ -1,20 +0,0 @@
-IMAPAccount personal -Host imap.migadu.com -User x@icyphox.sh -PassCmd "pw -s default" -SSLType IMAPS - -IMAPStore remote -Account personal - -MaildirStore local -Subfolders Verbatim -Path ~/mail/personal/ -Inbox ~/mail/personal/Inbox - -Channel personal -Master :remote: -Slave :local: -Patterns * -Create Both -SyncState *
D
home/.tmux.conf
@@ -1,82 +0,0 @@
-set -g prefix C-q -set -g set-titles on -set-option -g set-titles-string "#T" -unbind-key C-b -bind-key C-q send-prefix -set -g update-environment "KEYBOARD_LAYOUT" - -bind r source-file ~/.tmux.conf - -set-option -g default-terminal xterm-256color -set -as terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[2 q' -set escape-time 20 - -set -g mouse on - -set -g base-index 1 -setw -g pane-base-index 1 - -# pane binds -bind -n M-n select-pane -D -bind -n M-e select-pane -U -bind -n M-y select-pane -L -bind -n M-o select-pane -R -bind -n M-Up resize-pane -U 5 -bind -n M-Down resize-pane -D 5 -bind -n M-Left resize-pane -L 5 -bind -n M-Right resize-pane -R 5 - -# window binds -bind -n C-M-y previous-window -bind -n C-M-o next-window -bind-key c split-window -h -c "#{pane_current_path}" -bind-key v new-window -c "#{pane_current_path}" -bind-key s choose-session -bind-key ) swap-window -t +2 -bind-key ( swap-window -t -1 - -unbind -T copy-mode MouseDragEnd1Pane -bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -in -selection clipboard" -bind-key -T copy-mode-vi v send-keys -X begin-selection -bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c " -bind-key -T copy-mode-vi r send-keys -X rectangle-toggle -bind P paste-buffer - -# pop-up pane to open urls -bind-key u display-popup -E "xurls" - -# statusline on top -set-option -g status-position top - -# statusline hide / unhide -bind -n C-down set -q status off -bind -n C-up set -q status on -bind P paste-buffer - -set-window-option -g allow-rename off - -set -g pane-border-style fg=colour11 -set -g pane-active-border-style fg=colour8 - -set -g status-justify right -set -g status-right "" -set -g status-left "" -set -g status-style "bg=colour0" -set -ag status-style "fg=colour7" - -set -g window-status-current-format "#[fg=colour15] #W" -set -g window-status-format "#[fg=colour8] #W" - -set -g @resurrect-strategy-nvim 'session' -set -g status-left-length 100 -if-shell '[[ $HOSTNAME != methi ]]' { - set -ag status-left "#[fg=colour8]cwd #[fg=colour15]#(prompt -p #{pane_current_path}) " - set -ag status-left "#[fg=colour8]#(prompt -gb #{pane_current_path}) " - set -ag status-left "#[fg=colour15]#(prompt -gs #{pane_current_path})" -} - -# dim inactive pane -set -g window-style 'fg=color8,bg=default' -set -g window-active-style 'fg=color7,bg=default' - -run-shell ~/leet/tmux-resurrect/resurrect.tmux
D
home/.xinitrc
@@ -1,19 +0,0 @@
-#!/bin/sh - -# _ _ _ -# __ _(_)_ __ (_) |_ _ __ ___ -# \ \/ / | '_ \| | __| '__/ __| -# _ > <| | | | | | |_| | | (__ -#(_)_/\_\_|_| |_|_|\__|_| \___| -# - -setxkbmap -option 'grp:alt_shift_toggle' -layout us,ru -variant ',phonetic' -option 'compose:caps' -# ~/.fehbg & -eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "${HOME}/.gpg-agent-info")" -# sxhkd & -xrdb -l ~/.Xresources -# st & -compton & -urxvtd & -xsetroot -cursor_name left_ptr -exec cwm
D
home/.xmodmap
@@ -1,272 +0,0 @@
-keycode 49 = grave asciitilde dead_tilde asciitilde -keycode 10 = 1 exclam exclamdown onesuperior -keycode 11 = 2 at masculine twosuperior -keycode 12 = 3 numbersign ordfeminine threesuperior -keycode 13 = 4 dollar cent sterling -keycode 14 = 5 percent EuroSign yen -keycode 15 = 6 asciicircum hstroke Hstroke -keycode 16 = 7 ampersand eth ETH -keycode 17 = 8 asterisk thorn THORN -keycode 18 = 9 parenleft leftsinglequotemark leftdoublequotemark -keycode 19 = 0 parenright rightsinglequotemark rightdoublequotemark -keycode 20 = minus underscore emdash endash -keycode 21 = equal plus multiply division - -keycode 24 = q Q adiaeresis Adiaeresis -keycode 25 = d D dead_diaeresis asciitilde -keycode 26 = r R dead_grave asciitilde -keycode 27 = w W aring Aring -keycode 28 = b B atilde Atilde -keycode 29 = j J dstroke Dstroke -keycode 30 = f F dead_breve asciitilde -keycode 31 = u U uacute Uacute -keycode 32 = p P oslash Ooblique -keycode 33 = semicolon colon odiaeresis Odiaeresis -keycode 34 = bracketleft braceleft guillemotleft U2039 -keycode 35 = bracketright braceright guillemotright U203a -keycode 51 = backslash bar asciitilde asciitilde - -keycode 38 = a A aacute Aacute -keycode 39 = s S ssharp asciitilde -keycode 40 = h H dead_caron asciitilde -keycode 41 = t T dead_acute dead_doubleacute -keycode 42 = g G dead_ogonek asciitilde -keycode 43 = y Y Left udiaeresis -keycode 44 = n N Down ntilde -keycode 45 = e E Up eacute -keycode 46 = o O Right oacute -keycode 47 = i I leftsinglequotemark leftdoublequotemark -keycode 48 = apostrophe quotedbl rightsinglequotemark rightdoublequotemark - -keycode 52 = z Z ae AE -keycode 53 = x X dead_circumflex asciitilde -keycode 54 = m M dead_macron asciitilde -keycode 55 = c C ccedilla Ccedilla -keycode 56 = v V oe OE -keycode 57 = k K dead_abovering asciitilde -keycode 58 = l L lstroke Lstroke -keycode 59 = comma less dead_cedilla asciitilde -keycode 60 = period greater ellipsis asciitilde -keycode 61 = slash question questiondown asciitilde - -keycode 66 = Multi_key -keycode 66 = Mode_switch -keycode 64 = Alt_L -keycode 94 = minus underscore endash emdash -keycode 65 = space space space nobreakspace - -clear Lock - -!clear Shift -!clear Control -!clear Mod1 -!clear Mod2 -!clear Mod3 -!clear Mod4 -!clear Mod5 - -!add Shift = Shift_L Shift_R -!add Control = Control_L Control_R -!add Mod1 = Alt_L Alt_R -!add Mod2 = Num_Lock -!add Mod4 = Meta_L Meta_R -!add Mod5 = Scroll_Lock - -!keycode 9 = Escape -!keycode 22 = BackSpace Terminate_Server -!keycode 23 = Tab ISO_Left_Tab -!keycode 36 = Return -!keycode 37 = Control_L -!keycode 50 = Shift_L -!keycode 62 = Shift_R -!keycode 63 = KP_Multiply XF86_ClearGrab -!keycode 64 = Alt_L Meta_L -!keycode 67 = F1 XF86_Switch_VT_1 -!keycode 68 = F2 XF86_Switch_VT_2 -!keycode 69 = F3 XF86_Switch_VT_3 -!keycode 70 = F4 XF86_Switch_VT_4 -!keycode 71 = F5 XF86_Switch_VT_5 -!keycode 72 = F6 XF86_Switch_VT_6 -!keycode 73 = F7 XF86_Switch_VT_7 -!keycode 74 = F8 XF86_Switch_VT_8 -!keycode 75 = F9 XF86_Switch_VT_9 -!keycode 76 = F10 XF86_Switch_VT_10 -!keycode 95 = F11 XF86_Switch_VT_11 -!keycode 96 = F12 XF86_Switch_VT_12 -!keycode 77 = Num_Lock Pointer_EnableKeys -!keycode 78 = Scroll_Lock -!keycode 79 = KP_Home KP_7 -!keycode 80 = KP_Up KP_8 -!keycode 81 = KP_Prior KP_9 -!keycode 82 = KP_Subtract XF86_Prev_VMode -!keycode 83 = KP_Left KP_4 -!keycode 84 = KP_Begin KP_5 -!keycode 85 = KP_Right KP_6 -!keycode 86 = KP_Add XF86_Next_VMode -!keycode 87 = KP_End KP_1 -!keycode 88 = KP_Down KP_2 -!keycode 89 = KP_Next KP_3 -!keycode 90 = KP_Insert KP_0 -!keycode 91 = KP_Delete KP_Decimal -!keycode 92 = Print Sys_Req -!keycode 93 = Mode_switch -!keycode 97 = Home -!keycode 98 = Up -!keycode 99 = Prior -!keycode 100 = Left -!keycode 102 = Right -!keycode 103 = End -!keycode 104 = Down -!keycode 105 = Next -!keycode 106 = Insert -!keycode 107 = Delete -!keycode 108 = KP_Enter -!keycode 109 = Control_R -!keycode 110 = Pause Break -!keycode 111 = Print Sys_Req -!keycode 112 = KP_Divide XF86_Ungrab -!keycode 114 = Pause Break -!keycode 115 = Super_L -!keycode 116 = Super_R -!keycode 117 = Menu -!keycode 124 = ISO_Level3_Shift -!keycode 125 = NoSymbol Alt_L -!keycode 126 = KP_Equal -!keycode 127 = NoSymbol Super_L -!keycode 128 = NoSymbol Hyper_L -!keycode 156 = NoSymbol Meta_L - -!keycode 8 = -!keycode 101 = -!keycode 118 = -!keycode 119 = -!keycode 120 = -!keycode 121 = -!keycode 122 = -!keycode 123 = -!keycode 129 = -!keycode 130 = -!keycode 131 = -!keycode 132 = -!keycode 133 = -!keycode 134 = -!keycode 135 = -!keycode 136 = -!keycode 137 = -!keycode 138 = -!keycode 139 = -!keycode 140 = -!keycode 141 = -!keycode 142 = -!keycode 143 = -!keycode 144 = -!keycode 145 = -!keycode 146 = -!keycode 147 = -!keycode 148 = -!keycode 149 = -!keycode 150 = -!keycode 151 = -!keycode 152 = -!keycode 153 = -!keycode 154 = -!keycode 155 = -!keycode 157 = -!keycode 158 = -!keycode 159 = -!keycode 160 = -!keycode 161 = -!keycode 162 = -!keycode 163 = -!keycode 164 = -!keycode 165 = -!keycode 166 = -!keycode 167 = -!keycode 168 = -!keycode 169 = -!keycode 170 = -!keycode 171 = -!keycode 172 = -!keycode 173 = -!keycode 174 = -!keycode 175 = -!keycode 176 = -!keycode 177 = -!keycode 178 = -!keycode 179 = -!keycode 180 = -!keycode 181 = -!keycode 182 = -!keycode 183 = -!keycode 184 = -!keycode 185 = -!keycode 186 = -!keycode 187 = -!keycode 188 = -!keycode 189 = -!keycode 190 = -!keycode 191 = -!keycode 192 = -!keycode 193 = -!keycode 194 = -!keycode 195 = -!keycode 196 = -!keycode 197 = -!keycode 198 = -!keycode 199 = -!keycode 200 = -!keycode 201 = -!keycode 202 = -!keycode 203 = -!keycode 204 = -!keycode 205 = -!keycode 206 = -!keycode 207 = -!keycode 208 = -!keycode 209 = -!keycode 210 = -!keycode 211 = -!keycode 212 = -!keycode 213 = -!keycode 214 = -!keycode 215 = -!keycode 216 = -!keycode 217 = -!keycode 218 = -!keycode 219 = -!keycode 220 = -!keycode 221 = -!keycode 222 = -!keycode 223 = -!keycode 224 = -!keycode 225 = -!keycode 226 = -!keycode 227 = -!keycode 228 = -!keycode 229 = -!keycode 230 = -!keycode 231 = -!keycode 232 = -!keycode 233 = -!keycode 234 = -!keycode 235 = -!keycode 236 = -!keycode 237 = -!keycode 238 = -!keycode 239 = -!keycode 240 = -!keycode 241 = -!keycode 242 = -!keycode 243 = -!keycode 244 = -!keycode 245 = -!keycode 246 = -!keycode 247 = -!keycode 248 = -!keycode 249 = -!keycode 250 = -!keycode 251 = -!keycode 252 = -!keycode 253 = -!keycode 254 = -!keycode 255 =
D
home/.xsession
@@ -1,48 +0,0 @@
-#!/bin/sh - -xmodmap ~/.xmodmap -eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "${HOME}/.gpg-agent-info")" -export LC_CTYPE="en_US.UTF-8" -sxhkd & - -# xorg things -xrdb -l ~/.Xresources -xsetroot -solid '#cccccc' -xrandr --dpi 96 -xsetroot -cursor_name left_ptr -xrandr --output DP-1 --set "Broadcast RGB" "Full" - -# touchpad setup -syndaemon -k -i 0.5 -d - -redshift -l 12.972442:77.580643 -t 6400:5700 -m randr & - -# xnotify -XNOTIFY_FIFO="$HOME/.cache/xnotify$DISPLAY.fifo" -export XNOTIFY_FIFO -rm -f $XNOTIFY_FIFO -mkfifo $XNOTIFY_FIFO -xnotify <$XNOTIFY_FIFO 3<>$XNOTIFY_FIFO & - -# notifications -notifycpu() { - tail -f /var/log/daemon |\ - awk ' - $5 ~ /^apmd.*:$/ && $0 ~ "external power status: not connected" && $(NF - 2) < 25 { - printf "SEC:0\tTAG:power\tBattery is low: %s\n", $(NF - 2) - } - $5 ~ /^sensorsd.*:$/ && $7 == "exceeds" { - printf "SEC:5\tTAG:temp\tTemperature is at %d°C\n", $9 - } - { - fflush() - } - ' -} - -notifycpu > "$XNOTIFY_FIFO" & - -~/bin/bar & - -# window manager -~/leet/cwm/cwm
M
nix/bin/default.nix
→
nix/bin/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, theme, host, ... }: +{ pkgs, host, ... }: let
M
nix/flake.lock
→
nix/flake.lock
@@ -1,5 +1,26 @@
{ "nodes": { + "darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1662478528, + "narHash": "sha256-Myjd0HPL5lXri3NXOcJ6gP7IKod2eMweQBKM4uxgEGw=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "3b69bf3cc26ae19de847bfe54d6ab22d7381a90a", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [@@ -210,6 +231,7 @@ }
}, "root": { "inputs": { + "darwin": "darwin", "home-manager": "home-manager", "neovim": "neovim", "nixos-hardware": "nixos-hardware",
M
nix/flake.nix
→
nix/flake.nix
@@ -13,6 +13,11 @@ };
neovim.url = "github:icyphox/neovim-nightly-overlay"; + darwin = { + url = "github:lnl7/nix-darwin/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + prompt = { url = "git+https://git.peppe.rs/cli/prompt"; inputs.nixpkgs.follows = "nixpkgs";@@ -26,6 +31,7 @@ , nixos-hardware
, home-manager , neovim , prompt + , darwin , ... } @ inputs: {@@ -33,6 +39,8 @@ overlays = {
nvim-nightly = neovim.overlay; prompt = prompt.overlay; }; + + darwinConfigurations = { }; nixosConfigurations = { wyndle = nixpkgs.lib.nixosSystem {@@ -51,7 +59,6 @@ imports = [ ./home.nix ];
_module.args.self = self; _module.args.host = "wyndle"; _module.args.inputs = inputs; - _module.args.theme = import ./theme.nix; }; } ];
M
nix/home.nix
→
nix/home.nix
@@ -1,6 +1,5 @@
{ config , pkgs -, theme , self , host , ...@@ -46,7 +45,7 @@ trojita
korganizer libreoffice-qt - ] ++ (import ./bin { inherit pkgs theme host; }); + ] ++ (import ./bin { inherit pkgs host; }); xdg = { userDirs = {
M
nix/hosts/wyndle/configuration.nix
→
nix/hosts/wyndle/configuration.nix
@@ -1,7 +1,7 @@
let asusctl-tar = fetchTarball "https://github.com/NixOS/nixpkgs/archive/a4a81b6f6c27e5a964faea25b7b5cbe611f98691.tar.gz"; in -{ self, config, pkgs, theme, lib, ... }: +{ self, config, pkgs, lib, ... }: { imports =
M
nix/programs/bash.nix
→
nix/programs/bash.nix
@@ -42,12 +42,53 @@
TERM = "xterm-256color-italic"; EDITOR = "nvim"; MANPAGER = "nvim +Man!"; - PW_DIR = "$HOME/.pw"; - PW_KEY = "x@icyphox.sh"; PATH = "$PATH:$HOME/go/bin:$HOME/bin"; }; + # TODO: nixify this + bashrcExtra = '' + refresh_tmux() { + tmux refresh-client -S + } + + PROMPT_COMMAND=refresh_tmux + PS1="\n\001\e[0;36m\002▲\001\e[0m\002 "; + PS2="> " + + ggp() { + if [[ "$1" == "-f" ]]; then + git push "$(git remote show)" -f "$(git branch --show-current)" + else + git push "$(git remote show)" "$(git branch --show-current)" + fi + } + + gpl() { + if [[ "$1" != "" ]]; then + branch="$1" + else + branch="$(git branch --show-current)" + fi + git pull -r "$(git remote show)" "$branch" + } + + gco() { + [[ "$1" == "" ]] && return 1 + + git rev-parse --verify "$1" &> /dev/null + if [ $? -eq 0 ]; then + git checkout "$1" + else + git checkout -b "$1" + fi + } + + gaf() { + git status --short | grep "^ M\|^ D\|^\?\?" | fzy | awk '{ print $2 }' | xargs git add + } + ''; + initExtra = '' # Ctrl+W kills word stty werase undef@@ -63,10 +104,6 @@ bind -x '"\C-r": READLINE_LINE=$(__fzy_history); READLINE_POINT="''${#READLINE_LINE}"'
complete -cf doas complete -F __start_kubectl k - - for i in ~/.bashrc.d/[0-9]*; do - . "$i" - done ''; };
M
nix/programs/default.nix
→
nix/programs/default.nix
@@ -1,6 +1,5 @@
{ config , pkgs -, theme , self , ... }:
M
nix/programs/git.nix
→
nix/programs/git.nix
@@ -1,10 +1,8 @@
{ config , pkgs -, theme , ... }: -with theme; { programs.git = { enable = true;
D
nix/programs/zathura.nix
@@ -1,37 +0,0 @@
-{ config -, pkgs -, theme -, ... -}: - -with theme; -{ - programs.zathura = { - enable = true; - options = { - incremental-search = "true"; - recolor = "true"; - default-bg = base00; - default-fg = base05; - completion-bg = base00; - completion-fg = base05; - completion-highlight-bg = base0E; - completion-highlight-fg = base05; - statusbar-bg = base00; - statusbar-fg = base05; - inputbar-bg = base00; - inputbar-fg = base05; - recolor-darkcolor = base05; - recolor-lightcolor = base00; - window-height = "800"; - window-width = "600"; - adjust-open = "width"; - smooth-scroll = "true"; - statusbar-home-tilde = "true"; - statusbar-h-padding = "50"; - statusbar-v-padding = "50"; - guioptions = "s"; - font = "Input 10"; - }; - }; -}
M
nix/services/default.nix
→
nix/services/default.nix
@@ -1,6 +1,5 @@
{ config , pkgs -, theme , ... }: