this repo has no description
cleanup Fennel files
+113
-90
+2
-2
devShells.nix
dev_shells.nix
+2
-2
devShells.nix
dev_shells.nix
+10
-9
flake.lock
+10
-9
flake.lock
···
30
30
]
31
31
},
32
32
"locked": {
33
-
"lastModified": 1672753581,
34
-
"narHash": "sha256-EIi2tqHoje5cE9WqH23ZghW28NOOWSUM7tcxKE1U9KI=",
33
+
"lastModified": 1673295039,
34
+
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
35
35
"owner": "lnl7",
36
36
"repo": "nix-darwin",
37
-
"rev": "3db1d870b04b13411f56ab1a50cd32b001f56433",
37
+
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
38
38
"type": "github"
39
39
},
40
40
"original": {
···
45
45
},
46
46
"flake-utils": {
47
47
"locked": {
48
-
"lastModified": 1667395993,
49
-
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
48
+
"lastModified": 1676283394,
49
+
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
50
50
"owner": "numtide",
51
51
"repo": "flake-utils",
52
-
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
52
+
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
53
53
"type": "github"
54
54
},
55
55
"original": {
···
107
107
},
108
108
"nixpkgs_2": {
109
109
"locked": {
110
-
"lastModified": 1673180965,
111
-
"narHash": "sha256-gMhL6w9RVluvPs+irJ9n0Q1BphZm+Ek4XGn5Ow7YQ3k=",
110
+
"lastModified": 1676150441,
111
+
"narHash": "sha256-Nfeua9Ua/dGHOQpzOjLtkyMyW/ysQCvZJ9Dd74QQSNk=",
112
112
"owner": "NixOS",
113
113
"repo": "nixpkgs",
114
-
"rev": "0c9aadc8eff6daaa5149d2df9e6c49baaf44161c",
114
+
"rev": "6d87734c880d704f6ee13e5c0fe835b98918c34e",
115
115
"type": "github"
116
116
},
117
117
"original": {
118
118
"id": "nixpkgs",
119
+
"ref": "nixpkgs-unstable",
119
120
"type": "indirect"
120
121
}
121
122
},
+10
-4
flake.nix
+10
-4
flake.nix
···
2
2
description = "Hauleth's configuration";
3
3
4
4
inputs = {
5
-
nixpkgs.url = "flake:nixpkgs";
5
+
nixpkgs.url = "nixpkgs/nixpkgs-unstable";
6
6
flake-utils.url = "flake:flake-utils";
7
7
agnoster = {
8
8
url = "github:hauleth/agnoster";
···
42
42
43
43
legacyPackages = pkgs;
44
44
45
-
devShells = (pkgs.callPackage ./devShells.nix { }) // {
46
-
default = pkgs.mkShell {
45
+
devShells = (pkgs.callPackage ./dev_shells.nix { }) // {
46
+
_sefault = pkgs.mkShell {
47
47
nativeBuildInputs = [
48
48
pkgs.fnlfmt
49
49
pkgs.alejandra
···
67
67
./modules/nvim.nix
68
68
{
69
69
system.stateVersion = 4;
70
-
documentation.enable = false;
70
+
documentation.enable = true;
71
71
}
72
72
];
73
+
74
+
specialArgs = {
75
+
inherit darwin nixpkgs;
76
+
77
+
dotfiles = self;
78
+
};
73
79
};
74
80
75
81
# for convenience
+3
-1
nix/environment.nix
+3
-1
nix/environment.nix
···
17
17
in
18
18
[
19
19
# _1password
20
-
age
21
20
alejandra
22
21
asciinema
23
22
bat
···
53
52
noti
54
53
pinentry_mac
55
54
# qmk
55
+
rage
56
56
ripgrep
57
57
rnix-lsp
58
+
senpai
58
59
universal-ctags
59
60
# w3m
60
61
# watchman
···
102
103
103
104
source (${pkgs.direnv}/bin/direnv hook fish | psub)
104
105
source (${pkgs.lima}/bin/limactl completion fish | psub)
106
+
source $HOME/.op/plugins.sh
105
107
106
108
if which op > /dev/null; source (op completion fish | psub); end
107
109
+11
-3
nix/nix.nix
+11
-3
nix/nix.nix
···
1
-
{pkgs, ...}: {
1
+
{ pkgs, ... }@args: {
2
2
nixpkgs.config.allowUnfree = true;
3
3
4
4
nix.useDaemon = true;
5
5
services.nix-daemon.enable = true;
6
6
7
+
environment.systemPackages = [
8
+
pkgs.cachix
9
+
];
10
+
11
+
nix.registry = {
12
+
nixpkgs.flake = args.nixpkgs;
13
+
darwin.flake = args.darwin;
14
+
# dotfiles.flake = args.dotfiles;
15
+
};
16
+
7
17
# You should generally set this to the total number of logical cores in your system.
8
18
# $ sysctl -n hw.ncpu
9
19
nix.settings.max-jobs = 8;
···
11
21
12
22
nix.package = pkgs.nixFlakes;
13
23
nix.extraOptions = ''
14
-
auto-optimise-store = true
15
-
16
24
keep-outputs = true
17
25
keep-derivations = true
18
26
+1
-1
vim/.config/nvim/after/ftplugin/dhall.vim
+1
-1
vim/.config/nvim/after/ftplugin/dhall.vim
+4
vim/.config/nvim/after/ftplugin/zig.vim
+4
vim/.config/nvim/after/ftplugin/zig.vim
+17
vim/.config/nvim/fnl/codestats.fnl
+17
vim/.config/nvim/fnl/codestats.fnl
···
1
+
(import-macros {: use} :relude)
2
+
(use nvim {: fun})
3
+
4
+
(use plenary.curl)
5
+
6
+
(local xps {})
7
+
8
+
(fn profile [user]
9
+
(let [res (curl.get (.. "https://codestats.net/api/users/" user))]
10
+
(print (fennel.view res))
11
+
(when (= res.status 200)
12
+
(fun.json_decode res.body))))
13
+
14
+
(fn add-xp [ft xp]
15
+
(tset xps ft (+ (if (= nil (. xps ft)) 0 (. xps ft)) xp)))
16
+
17
+
{: profile : add-xp}
+15
vim/.config/nvim/fnl/projections.fnl
+15
vim/.config/nvim/fnl/projections.fnl
···
1
+
(fn compile-heurestic [spec]
2
+
(let [wrap #(if (= (type $1) :table) $1 [$1])]
3
+
(table.concat (icollect [_ v (ipairs (wrap spec))] (table.concat (wrap v) "&")) "|")))
4
+
5
+
(fn projection [guards spec]
6
+
; Guard for empty variable
7
+
(let [heurestic (compile-heurestic guards)]
8
+
(when (= vim.g.projectionist_heuristics nil) (set vim.g.projectionist_heuristics {}))
9
+
{heurestic spec}))
10
+
11
+
(fn template [name]
12
+
(let [[name] (vim.api.nvim_get_runtime_file (.. "templates/" name ".tpl") false)]
13
+
(vim.fn.readfile name)))
14
+
15
+
{: projection : template}
vim/.config/nvim/fnl/relude.fnl
vim/.config/nvim/fnl/relude/macro-init.fnl
vim/.config/nvim/fnl/relude.fnl
vim/.config/nvim/fnl/relude/macro-init.fnl
+1
vim/.config/nvim/fnl/relude/init.fnl
+1
vim/.config/nvim/fnl/relude/init.fnl
···
1
+
{}
+32
-16
vim/.config/nvim/init.fnl
+32
-16
vim/.config/nvim/init.fnl
···
219
219
:table config)]
220
220
(f opts)
221
221
lib))]
222
-
(setup :mini.starter (fn [starter]
223
-
{:items [(starter.sections.sessions 10 true)
224
-
(starter.sections.builtin_actions)]}))
225
-
(setup :mini.sessions {:directory (.. (fun.stdpath :data) "/site/sessions/")})
226
-
(setup :mini.align {:mappings {:start :gl
227
-
:start_with_preview :gL}})
228
-
(setup :mini.bufremove (fn [bufremove]
229
-
(defcommand Bd (bufremove.delete))
230
-
(defcommand BClean
231
-
(->> (fun.getbufinfo {:buflisted true})
232
-
(vim.tbl_filter #(= (next $1.windows) nil))
233
-
(#(each [_ v (ipairs $1)]
234
-
(bufremove.delete v.bufnr)))))
235
-
{:set_vim_settings false}))
222
+
(setup :mini.starter
223
+
(fn [starter]
224
+
{:items [(starter.sections.sessions 10 true)
225
+
(starter.sections.builtin_actions)]}))
226
+
(setup :mini.sessions
227
+
(fn [sessions]
228
+
(let [complete (fn [with-current?]
229
+
#(icollect [_ spec (pairs sessions.detected)]
230
+
(when (not (and with-current?
231
+
(= spec.path vim.v.this_session)))
232
+
spec.name)))]
233
+
(defcommand SSave {:nargs "?" :bang true}
234
+
(print (sessions.write args {:force bang})))
235
+
(defcommand SDelete {:nargs "?" :bang true :complete (complete true)}
236
+
(print (sessions.delete args {:force bang})))
237
+
(defcommand SRead {:nargs 1 :bang true :complete (complete false)}
238
+
(print (sessions.read args {:force bang}))))
239
+
{:directory (.. (fun.stdpath :data) "/site/sessions/")}))
240
+
(setup :mini.align
241
+
{:mappings {:start :gl
242
+
:start_with_preview :gL}})
243
+
(setup :mini.bufremove
244
+
(fn [bufremove]
245
+
(defcommand Bd (bufremove.delete))
246
+
(defcommand BClean
247
+
(->> (fun.getbufinfo {:buflisted true})
248
+
(vim.tbl_filter #(= (next $1.windows) nil))
249
+
(#(each [_ v (ipairs $1)]
250
+
(bufremove.delete v.bufnr)))))
251
+
{:set_vim_settings false}))
236
252
(setup :mini.comment)
237
253
(setup :mini.ai)
238
254
(setup :mini.jump {:mappings {:repeat_jump ":"}})
239
255
(setup :mini.surround
240
256
{:mappings {:add :gsa
241
-
:delete :gsdw
257
+
:delete :gsd
242
258
:find :gsf
243
-
:find_left ""
259
+
:find_left :gsF
244
260
:highlight ""
245
261
:replace :gss
246
262
:update_n_lines ""}})
-54
vim/.config/nvim/plugin/projections.vim
-54
vim/.config/nvim/plugin/projections.vim
···
72
72
\ '*.js': { 'make': 'yarn' },
73
73
\ 'package.json': { 'type': 'package' }
74
74
\ }
75
-
76
-
let g:projectionist_heuristics['nuxt.config.js'] = {
77
-
\ '*.vue': {
78
-
\ 'make': 'yarn',
79
-
\ 'template': [
80
-
\ '<template>',
81
-
\ '</template>',
82
-
\ '',
83
-
\ '<script>',
84
-
\ 'export default {open}',
85
-
\ '{close}',
86
-
\ '</script>',
87
-
\ '',
88
-
\ '<style>',
89
-
\ '</style>',
90
-
\ ]
91
-
\ },
92
-
\ 'components/*.vue': { 'type': 'component' },
93
-
\ 'layouts/*.vue': { 'type': 'layout' },
94
-
\ 'pages/*.vue': { 'type': 'page' },
95
-
\ 'plugins/*.js': { 'type': 'plugin' },
96
-
\ 'middlewares/*.js': { 'type': 'middleware' },
97
-
\ 'store/*.js': {
98
-
\ 'type': 'store',
99
-
\ 'template': [
100
-
\ 'export const state = () => ({open}',
101
-
\ '{close})',
102
-
\ '',
103
-
\ 'export const getters = {open}',
104
-
\ '{close}',
105
-
\ '',
106
-
\ 'export const mutations = {open}',
107
-
\ '{close}',
108
-
\ '',
109
-
\ 'export const actions = {open}',
110
-
\ '{close}',
111
-
\ ]
112
-
\ },
113
-
\ 'nuxt.config.js': { 'type': 'config' },
114
-
\ }
115
-
116
-
func! s:options() abort
117
-
if &ft !=# '' | return | endif
118
-
119
-
for [_, value] in projectionist#query('filetype')
120
-
exec 'setf '.l:value
121
-
return
122
-
endfor
123
-
endfunc
124
-
125
-
augroup projectionist_ft
126
-
au!
127
-
au BufEnter * call <sid>options()
128
-
augroup END