blob: 8d58312a9d7d93cf055752af819785049f2157b1 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
|
{ config, pkgs, ... }:
let
hcr = pkgs.callPackage ./scripts/hm-changes-report.nix { inherit config pkgs; };
scr = pkgs.callPackage ./scripts/system-changes-report.nix { inherit config pkgs; };
in
{
imports = [
./zsh.nix
];
home.packages = with pkgs; [
hcr
scr
aspell
aspellDicts.en
aspellDicts.en-computers
aspellDicts.en-science
bat
bat-extras.batdiff
bat-extras.batgrep
bat-extras.batman
bat-extras.batwatch
#bat-extras.batpipe # wait for 22.11
bottom
broot
curl
diff-so-fancy
difftastic
duf
du-dust
elinks
entr
exa
fd
file
fzf
git
gnupg
gopass
inetutils
ispell
isync
jq
libqalculate
lscolors
lsd
lynx
nixfmt
nix-info
nix-prefetch-git
nix-prefetch-github
nvd
pinentry
pass
ripgrep
rlwrap
sd
tealdeer
ugrep
uni
w3m
];
programs.gpg.enable = true;
programs.nix-index = {
enable = true;
enableZshIntegration = false;
enableBashIntegration = false;
};
programs.vim = {
enable = true;
extraConfig = ''
colorscheme molokai
" highlight doesn't work properly without this
syntax enable
highlight Normal ctermfg=white ctermbg=black
set hlsearch
set showmatch
set pastetoggle=<F2>
nmap <silent> <F3> :silent nohlsearch<CR>
imap <silent> <F3> <C-o>:silent nohlsearch<CR>
'';
plugins = [ pkgs.vimPlugins.sensible
pkgs.vimPlugins.auto-pairs
pkgs.vimPlugins.ctrlp
pkgs.vimPlugins.inkpot
pkgs.vimPlugins.molokai
pkgs.vimPlugins.surround
pkgs.vimPlugins.vim-lastplace
pkgs.vimPlugins.vim-pasta
pkgs.vimPlugins.vim-repeat
pkgs.vimPlugins.vim-sexp-mappings-for-regular-people
pkgs.vimPlugins.vim-sleuth
];
settings = {
background = "dark";
copyindent = true;
expandtab = true;
ignorecase = true;
number = true;
shiftwidth = 4;
smartcase = true;
tabstop = 4;
};
};
programs.ssh = {
enable = true;
extraConfig = ''
Host *
AddKeysToAgent yes
IgnoreUnknown UseKeychain
UseKeychain yes
'';
includes = [ "~/.ssh/config_local" ];
matchBlocks = {
"djm.ovh" = {
hostname = "v.djm.ovh";
port = 2222;
};
"devio" = {
hostname = "devio.us";
user = "deejayem";
port = 2222;
};
"sdf" = {
hostname = "sdf.org";
user = "deejayem";
};
"sdfeu" = {
hostname = "sdf-eu.org";
user = "deejayem";
};
"grex" = {
hostname = "grex.org";
user = "deejayem";
};
"blinkenshell" = {
hostname = "ssh.blinkenshell.org";
port = 2222;
};
"hashbang" = {
hostname = "de1.hashbang.sh";
};
"o1" = {
hostname = "130.162.163.108";
};
"o2" = {
hostname = "143.47.239.39";
};
"tilde.institute" = {
hostname = "tilde.institute";
};
"tilde.team" = {
hostname = "tilde.team";
};
"ctrl-c.club" = {
hostname = "ctrl-c.club";
};
"github.com" = {
hostname = "github.com";
user = "git";
identityFile = "~/.ssh/id_ed25519";
identitiesOnly = true;
};
};
};
programs.git = {
enable = true;
userName = "David Morgan";
aliases = {
# difftastic
logt = "!sh -c 'GIT_EXTERNAL_DIFF=\"difft --background=dark\" git log -p --ext-diff'";
showt = "!show() { GIT_EXTERNAL_DIFF=difft git show \${1} --ext-diff; }; show";
difft = "difftool";
# "raw" output
rlog = "!git -c delta.raw=true -c core.pager=${pkgs.less}/bin/less log"; # usually used with -p
rshow = "!git -c delta.raw=true -c core.pager=${pkgs.less}/bin/less show";
rdiff = "!git -c delta.raw=true -c core.pager=${pkgs.less}/bin/less diff";
# copiable output (without line numbers or +/- indicators)
clog = "!git -c delta.line-numbers=false log"; # usually used with -p
cshow = "!git -c delta.line-numbers=false show";
cdiff = "!git -c delta.line-numbers=false diff";
# diff-so-fancy
flog = "!git -c core.pager=\"diff-so-fancy | less\" log"; # usually used with -p
fshow = "!git -c core.pager=\"diff-so-fancy | less\" show";
fdiff = "!git -c core.pager=\"diff-so-fancy | less\" diff";
upstream = "!git push -u origin HEAD";
update-master = "!git fetch origin master:master";
update-main = "!git fetch origin main:main";
};
extraConfig = {
core.editor = "vim";
diff = {
tool = "difftastic";
colorMoved = "default";
};
difftool = {
prompt = false;
difftastic = { cmd = ''difft "$LOCAL" "$REMOTE"''; };
};
merge = {
conflictstyle = "diff3";
ff = "only";
};
pull = {
ff = "only";
rebase = false;
};
push.autoSetupRemote = true;
rebase = {
# TODO
# autosquash = true;
autostash = true;
};
};
delta = {
enable = true;
options = {
line-numbers = true;
navigate = true;
light = false;
file-style = "bold yellow ul";
hunk-header-line-number-style = "brightyellow";
};
};
ignores = [
".lein-repl-history"
".lsp"
".rebel_readline_history"
".cider-repl-history"
"nohup.out"
"*.elc"
"*.eln"
"*~"
];
signing = {
key = "9B436B1477A879C26CDB6604C171251002C200F2";
signByDefault = true;
};
};
}
|