this repo has no description
chore: update Flakes
+67
-43
+24
-22
flake.lock
+24
-22
flake.lock
···
30
30
]
31
31
},
32
32
"locked": {
33
-
"lastModified": 1673295039,
34
-
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
33
+
"lastModified": 1682773107,
34
+
"narHash": "sha256-+h94XeJnG3uk5imJlBi/1lVmcfCbxHpwZp5u7n3Krwg=",
35
35
"owner": "lnl7",
36
36
"repo": "nix-darwin",
37
-
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
37
+
"rev": "379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8",
38
38
"type": "github"
39
39
},
40
40
"original": {
···
44
44
}
45
45
},
46
46
"flake-utils": {
47
+
"inputs": {
48
+
"systems": "systems"
49
+
},
47
50
"locked": {
48
-
"lastModified": 1678901627,
49
-
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
51
+
"lastModified": 1681202837,
52
+
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
50
53
"owner": "numtide",
51
54
"repo": "flake-utils",
52
-
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
55
+
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
53
56
"type": "github"
54
57
},
55
58
"original": {
···
76
79
"inputs": {
77
80
"nixpkgs": [
78
81
"nixpkgs"
79
-
],
80
-
"utils": "utils"
82
+
]
81
83
},
82
84
"locked": {
83
-
"lastModified": 1680000368,
84
-
"narHash": "sha256-TlgC4IJ7aotynUdkGRtaAVxquaiddO38Ws89nB7VGY8=",
85
+
"lastModified": 1683221986,
86
+
"narHash": "sha256-n688GK4wO2pZpI4gHOxj/PF85bzUMPEJ8B3Wd3cHSjk=",
85
87
"owner": "nix-community",
86
88
"repo": "home-manager",
87
-
"rev": "765e4007b6f9f111469a25d1df6540e8e0ca73a6",
89
+
"rev": "f3824311a16cbe70dbaeedc17a97dfcd11901c3f",
88
90
"type": "github"
89
91
},
90
92
"original": {
···
127
129
},
128
130
"nixpkgs_2": {
129
131
"locked": {
130
-
"lastModified": 1679793451,
131
-
"narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=",
132
+
"lastModified": 1683168220,
133
+
"narHash": "sha256-+2gNbWwWeECbQ4WHjdWWUDErdNbyHQvn+C9G47tMwxQ=",
132
134
"owner": "NixOS",
133
135
"repo": "nixpkgs",
134
-
"rev": "0cd51a933d91078775b300cf0f29aa3495231aa2",
136
+
"rev": "2395e4f1f733dc2a048a1b048f259763b2622ea2",
135
137
"type": "github"
136
138
},
137
139
"original": {
···
150
152
"nixpkgs": "nixpkgs_2"
151
153
}
152
154
},
153
-
"utils": {
155
+
"systems": {
154
156
"locked": {
155
-
"lastModified": 1676283394,
156
-
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
157
-
"owner": "numtide",
158
-
"repo": "flake-utils",
159
-
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
157
+
"lastModified": 1681028828,
158
+
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
159
+
"owner": "nix-systems",
160
+
"repo": "default",
161
+
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
160
162
"type": "github"
161
163
},
162
164
"original": {
163
-
"owner": "numtide",
164
-
"repo": "flake-utils",
165
+
"owner": "nix-systems",
166
+
"repo": "default",
165
167
"type": "github"
166
168
}
167
169
}
+2
-2
flake.nix
+2
-2
flake.nix
···
7
7
home-manager = {
8
8
url = "flake:home-manager";
9
9
inputs.nixpkgs.follows = "nixpkgs";
10
-
};
10
+
};
11
11
agnoster = {
12
12
url = "github:hauleth/agnoster";
13
13
inputs.nixpkgs.follows = "nixpkgs";
···
94
94
95
95
homeConfigurations."hauleth" = home-manager.lib.homeManagerConfiguration {
96
96
pkgs = import nixpkgs {
97
-
system = "x86_64-darwin";
97
+
system = "x86_64-darwin";
98
98
inherit overlays;
99
99
};
100
100
+4
-8
modules/fish.nix
+4
-8
modules/fish.nix
···
20
20
};
21
21
22
22
functions = {
23
-
e = "$EDITOR $argv";
24
23
p = ''
25
-
function p
26
-
if test (count $argv) -gt 0 && test -f $argv[1] || not isatty
27
-
bat $argv
28
-
else
29
-
ls -Alh $argv
30
-
end
24
+
if test (count $argv) -gt 0 && test -f $argv[1] || not isatty
25
+
bat $argv
26
+
else
27
+
ls -Alh $argv
31
28
end
32
29
'';
33
30
ix = "curl --netrc-optional -F 'f:1=@-' ix.io | pbcopy";
···
58
55
59
56
set -gx SSH_AUTH_SOCK ~/.local/share/1password/auth.sock
60
57
61
-
source (${pkgs.direnv}/bin/direnv hook fish | psub)
62
58
source (${pkgs.lima}/bin/limactl completion fish | psub)
63
59
source $HOME/.op/plugins.sh
64
60
+10
-2
modules/git.nix
+10
-2
modules/git.nix
···
2
2
programs.gh = {
3
3
enable = true;
4
4
5
+
extensions = with pkgs; [
6
+
gh-dash
7
+
gh-eco
8
+
gh-actions-cache
9
+
];
10
+
5
11
settings.aliases.co = "pr checkout";
6
12
};
7
13
8
14
home.packages = with pkgs; [
15
+
git-absorb
16
+
git-branchless
9
17
git-gone
10
18
git-revise
11
19
gitAndTools.git-imerge
···
46
54
b = "branch";
47
55
ca = "commit --amend";
48
56
ci = "commit";
57
+
co = "checkout";
49
58
rci = "commit --amend --reuse-message HEAD";
50
59
51
60
lg = "log --color --graph --abbrev-commit --pretty=simple-oneline";
52
61
53
-
squash = "rebase --interactive --autosquash @{upstream}";
54
-
update = "!git rebase -i \"$(git merge-base HEAD \"$(git default-branch)\")\"";
62
+
squash = "!git rebase -i \"$(git merge-base HEAD \"$(git default-branch)\")\"";
55
63
56
64
st = "status -sb";
57
65
todo = "grep -Ee '\\\\bTODO:?\\\\b'";
+19
-4
modules/iosevka.nix
+19
-4
modules/iosevka.nix
···
1
-
{pkgs, ...}: let
1
+
{ pkgs, ... }:
2
+
let
2
3
variants = {
3
4
design = {
4
5
i = "hooky";
···
62
63
inherit variants weights slopes;
63
64
};
64
65
};
65
-
in {
66
+
nf-patch = font: pkgs.stdenvNoCC.mkDerivation {
67
+
pname = "${font.pname}-nerd-font-patched";
68
+
version = font.version;
69
+
70
+
src = font;
71
+
72
+
nativeBuildInputs = [ pkgs.nerd-font-patcher ];
73
+
74
+
buildPhase = ''
75
+
mkdir -p $out
76
+
find -name \*.ttf -exec nerd-font-patcher -o $out/share/fonts/truetype/ -c {} \;
77
+
'';
78
+
installPhase = "";
79
+
};
80
+
in
81
+
{
66
82
fonts = {
67
83
fontDir.enable = true;
68
84
fonts = [
69
85
pkgs.lato
70
-
iosevka-ss09
71
-
iosevka-ss09-term
86
+
(nf-patch iosevka-ss09-term)
72
87
];
73
88
};
74
89
}
+3
-2
vim/.config/nvim/fnl/nvim/macro-init.fnl
+3
-2
vim/.config/nvim/fnl/nvim/macro-init.fnl
-1
vim/.config/nvim/fnl/picker.fnl
-1
vim/.config/nvim/fnl/picker.fnl
+4
-1
vim/.config/nvim/fnl/plugins.fnl
+4
-1
vim/.config/nvim/fnl/plugins.fnl
···
26
26
27
27
; File picker
28
28
(pkg :nvim-telescope/telescope.nvim {
29
-
:opt true
30
29
:requires [(pkg :natecraddock/telescope-zf-native.nvim)
31
30
(pkg :nvim-lua/plenary.nvim)]})
31
+
(pkg :pwntester/octo.nvim
32
+
{:cmd [:Octo]
33
+
:requires [:nvim-telescope/telescope.nvim]
34
+
:config (fn [] ((. (require :octo) :setup)) {})})
32
35
33
36
; Git
34
37
(pkg :tpope/vim-fugitive)
+1
-1
vim/.config/nvim/init.fnl
+1
-1
vim/.config/nvim/init.fnl
···
235
235
(defcommand SDelete {:nargs "?" :bang true :complete (complete true)}
236
236
(print (sessions.delete args {:force bang})))
237
237
(defcommand SRead {:nargs 1 :bang true :complete (complete false)}
238
-
(print (sessions.read args {:force bang}))))
238
+
(print (sessions.read (tostring args) {:force bang}))))
239
239
{:directory (.. (fun.stdpath :data) "/site/sessions/")}))
240
240
(setup :mini.align
241
241
{:mappings {:start :gl