commit 83eec53c1a6038bf44c1b0942b4c7225433174fe · hauleth.dev/dotfiles

+230 -4

flake.lock

···

       41
       41
        
               "type": "github"

     

       42
       42
        
             }

     

       43
       43
        
           },

     

       44
       44
       +
           "flake-compat": {

     

       45
       45
       +
             "flake": false,

     

       46
       46
       +
             "locked": {

     

       47
       47
       +
               "lastModified": 1641205782,

     

       48
       48
       +
               "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",

     

       49
       49
       +
               "owner": "edolstra",

     

       50
       50
       +
               "repo": "flake-compat",

     

       51
       51
       +
               "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",

     

       52
       52
       +
               "type": "github"

     

       53
       53
       +
             },

     

       54
       54
       +
             "original": {

     

       55
       55
       +
               "owner": "edolstra",

     

       56
       56
       +
               "repo": "flake-compat",

     

       57
       57
       +
               "type": "github"

     

       58
       58
       +
             }

     

       59
       59
       +
           },

     

       60
       60
       +
           "flake-compat_2": {

     

       61
       61
       +
             "flake": false,

     

       62
       62
       +
             "locked": {

     

       63
       63
       +
               "lastModified": 1641205782,

     

       64
       64
       +
               "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",

     

       65
       65
       +
               "owner": "edolstra",

     

       66
       66
       +
               "repo": "flake-compat",

     

       67
       67
       +
               "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",

     

       68
       68
       +
               "type": "github"

     

       69
       69
       +
             },

     

       70
       70
       +
             "original": {

     

       71
       71
       +
               "owner": "edolstra",

     

       72
       72
       +
               "repo": "flake-compat",

     

       73
       73
       +
               "type": "github"

     

       74
       74
       +
             }

     

       75
       75
       +
           },

     

       44
       76
        
           "flake-parts": {

     

       45
       77
        
             "inputs": {

     

       46
       78
        
               "nixpkgs-lib": "nixpkgs-lib"

     
···

       92
       124
        
               "type": "github"

     

       93
       125
        
             }

     

       94
       126
        
           },

     

       127
       127
       +
           "flake-utils_3": {

     

       128
       128
       +
             "inputs": {

     

       129
       129
       +
               "systems": "systems_2"

     

       130
       130
       +
             },

     

       131
       131
       +
             "locked": {

     

       132
       132
       +
               "lastModified": 1710146030,

     

       133
       133
       +
               "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",

     

       134
       134
       +
               "owner": "numtide",

     

       135
       135
       +
               "repo": "flake-utils",

     

       136
       136
       +
               "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",

     

       137
       137
       +
               "type": "github"

     

       138
       138
       +
             },

     

       139
       139
       +
             "original": {

     

       140
       140
       +
               "owner": "numtide",

     

       141
       141
       +
               "repo": "flake-utils",

     

       142
       142
       +
               "type": "github"

     

       143
       143
       +
             }

     

       144
       144
       +
           },

     

       145
       145
       +
           "flake-utils_4": {

     

       146
       146
       +
             "locked": {

     

       147
       147
       +
               "lastModified": 1644229661,

     

       148
       148
       +
               "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",

     

       149
       149
       +
               "owner": "numtide",

     

       150
       150
       +
               "repo": "flake-utils",

     

       151
       151
       +
               "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",

     

       152
       152
       +
               "type": "github"

     

       153
       153
       +
             },

     

       154
       154
       +
             "original": {

     

       155
       155
       +
               "owner": "numtide",

     

       156
       156
       +
               "repo": "flake-utils",

     

       157
       157
       +
               "type": "github"

     

       158
       158
       +
             }

     

       159
       159
       +
           },

     

       160
       160
       +
           "flake-utils_5": {

     

       161
       161
       +
             "locked": {

     

       162
       162
       +
               "lastModified": 1644229661,

     

       163
       163
       +
               "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",

     

       164
       164
       +
               "owner": "numtide",

     

       165
       165
       +
               "repo": "flake-utils",

     

       166
       166
       +
               "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",

     

       167
       167
       +
               "type": "github"

     

       168
       168
       +
             },

     

       169
       169
       +
             "original": {

     

       170
       170
       +
               "owner": "numtide",

     

       171
       171
       +
               "repo": "flake-utils",

     

       172
       172
       +
               "type": "github"

     

       173
       173
       +
             }

     

       174
       174
       +
           },

     

       95
       175
        
           "flakey-profile": {

     

       96
       176
        
             "locked": {

     

       97
       177
        
               "lastModified": 1712898590,

     
···

       162
       242
        
               "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"

     

       163
       243
        
             }

     

       164
       244
        
           },

     

       245
       245
       +
           "neorg": {

     

       246
       246
       +
             "flake": false,

     

       247
       247
       +
             "locked": {

     

       248
       248
       +
               "lastModified": 1723939227,

     

       249
       249
       +
               "narHash": "sha256-emIQ0DtsCG3m8d7zEe5DDAz7b1I4wOnuXEClAXnWTlQ=",

     

       250
       250
       +
               "owner": "nvim-neorg",

     

       251
       251
       +
               "repo": "neorg",

     

       252
       252
       +
               "rev": "85f15f033d8c56366ac1e6ae93c940db8ad067ca",

     

       253
       253
       +
               "type": "github"

     

       254
       254
       +
             },

     

       255
       255
       +
             "original": {

     

       256
       256
       +
               "owner": "nvim-neorg",

     

       257
       257
       +
               "repo": "neorg",

     

       258
       258
       +
               "type": "github"

     

       259
       259
       +
             }

     

       260
       260
       +
           },

     

       261
       261
       +
           "neorg-overlay": {

     

       262
       262
       +
             "inputs": {

     

       263
       263
       +
               "flake-utils": "flake-utils_3",

     

       264
       264
       +
               "neorg": "neorg",

     

       265
       265
       +
               "neorg-telescope": "neorg-telescope",

     

       266
       266
       +
               "nixpkgs": [

     

       267
       267
       +
                 "nixpkgs"

     

       268
       268
       +
               ],

     

       269
       269
       +
               "norg": "norg",

     

       270
       270
       +
               "norg-meta": "norg-meta"

     

       271
       271
       +
             },

     

       272
       272
       +
             "locked": {

     

       273
       273
       +
               "lastModified": 1724202334,

     

       274
       274
       +
               "narHash": "sha256-RvNsEbIfnvJr0rtyafSkWhp7IoE+Ve5E9Lb4fLG2s5k=",

     

       275
       275
       +
               "owner": "nvim-neorg",

     

       276
       276
       +
               "repo": "nixpkgs-neorg-overlay",

     

       277
       277
       +
               "rev": "d1fbc526b763250ef790d2797ec9fff5e8add6ac",

     

       278
       278
       +
               "type": "github"

     

       279
       279
       +
             },

     

       280
       280
       +
             "original": {

     

       281
       281
       +
               "owner": "nvim-neorg",

     

       282
       282
       +
               "repo": "nixpkgs-neorg-overlay",

     

       283
       283
       +
               "type": "github"

     

       284
       284
       +
             }

     

       285
       285
       +
           },

     

       286
       286
       +
           "neorg-telescope": {

     

       287
       287
       +
             "flake": false,

     

       288
       288
       +
             "locked": {

     

       289
       289
       +
               "lastModified": 1722358034,

     

       290
       290
       +
               "narHash": "sha256-ei4uUqpIQjGKzu5ryu0Hlmis9TS9FJsYnjt4J4QdWlw=",

     

       291
       291
       +
               "owner": "nvim-neorg",

     

       292
       292
       +
               "repo": "neorg-telescope",

     

       293
       293
       +
               "rev": "ddb2556644cae922699a239bbb0fe16e25b084b7",

     

       294
       294
       +
               "type": "github"

     

       295
       295
       +
             },

     

       296
       296
       +
             "original": {

     

       297
       297
       +
               "owner": "nvim-neorg",

     

       298
       298
       +
               "repo": "neorg-telescope",

     

       299
       299
       +
               "type": "github"

     

       300
       300
       +
             }

     

       301
       301
       +
           },

     

       165
       302
        
           "nixpkgs": {

     

       166
       303
        
             "locked": {

     

       167
       167
       -
               "lastModified": 1723603349,

     

       168
       168
       -
               "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",

     

       304
       304
       +
               "lastModified": 1644486793,

     

       305
       305
       +
               "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",

     

       169
       306
        
               "owner": "NixOS",

     

       170
       307
        
               "repo": "nixpkgs",

     

       171
       171
       -
               "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",

     

       308
       308
       +
               "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",

     

       172
       309
        
               "type": "github"

     

       173
       310
        
             },

     

       174
       311
        
             "original": {

     
···

       190
       327
        
               "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"

     

       191
       328
        
             }

     

       192
       329
        
           },

     

       330
       330
       +
           "nixpkgs_2": {

     

       331
       331
       +
             "locked": {

     

       332
       332
       +
               "lastModified": 1644486793,

     

       333
       333
       +
               "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",

     

       334
       334
       +
               "owner": "NixOS",

     

       335
       335
       +
               "repo": "nixpkgs",

     

       336
       336
       +
               "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",

     

       337
       337
       +
               "type": "github"

     

       338
       338
       +
             },

     

       339
       339
       +
             "original": {

     

       340
       340
       +
               "owner": "NixOS",

     

       341
       341
       +
               "ref": "nixpkgs-unstable",

     

       342
       342
       +
               "repo": "nixpkgs",

     

       343
       343
       +
               "type": "github"

     

       344
       344
       +
             }

     

       345
       345
       +
           },

     

       346
       346
       +
           "nixpkgs_3": {

     

       347
       347
       +
             "locked": {

     

       348
       348
       +
               "lastModified": 1723603349,

     

       349
       349
       +
               "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",

     

       350
       350
       +
               "owner": "NixOS",

     

       351
       351
       +
               "repo": "nixpkgs",

     

       352
       352
       +
               "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",

     

       353
       353
       +
               "type": "github"

     

       354
       354
       +
             },

     

       355
       355
       +
             "original": {

     

       356
       356
       +
               "owner": "NixOS",

     

       357
       357
       +
               "ref": "nixpkgs-unstable",

     

       358
       358
       +
               "repo": "nixpkgs",

     

       359
       359
       +
               "type": "github"

     

       360
       360
       +
             }

     

       361
       361
       +
           },

     

       362
       362
       +
           "norg": {

     

       363
       363
       +
             "inputs": {

     

       364
       364
       +
               "flake-compat": "flake-compat",

     

       365
       365
       +
               "flake-utils": "flake-utils_4",

     

       366
       366
       +
               "nixpkgs": "nixpkgs"

     

       367
       367
       +
             },

     

       368
       368
       +
             "locked": {

     

       369
       369
       +
               "lastModified": 1672582520,

     

       370
       370
       +
               "narHash": "sha256-kv3UiJUqMSF1qd3r4OCWomVTHTYjwX/EBRWm8mOSdwg=",

     

       371
       371
       +
               "owner": "nvim-neorg",

     

       372
       372
       +
               "repo": "tree-sitter-norg",

     

       373
       373
       +
               "rev": "d7a466e182a532065a559dbfc7a847271d5e9c29",

     

       374
       374
       +
               "type": "github"

     

       375
       375
       +
             },

     

       376
       376
       +
             "original": {

     

       377
       377
       +
               "owner": "nvim-neorg",

     

       378
       378
       +
               "ref": "dev",

     

       379
       379
       +
               "repo": "tree-sitter-norg",

     

       380
       380
       +
               "type": "github"

     

       381
       381
       +
             }

     

       382
       382
       +
           },

     

       383
       383
       +
           "norg-meta": {

     

       384
       384
       +
             "inputs": {

     

       385
       385
       +
               "flake-compat": "flake-compat_2",

     

       386
       386
       +
               "flake-utils": "flake-utils_5",

     

       387
       387
       +
               "nixpkgs": "nixpkgs_2"

     

       388
       388
       +
             },

     

       389
       389
       +
             "locked": {

     

       390
       390
       +
               "lastModified": 1713028366,

     

       391
       391
       +
               "narHash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=",

     

       392
       392
       +
               "owner": "nvim-neorg",

     

       393
       393
       +
               "repo": "tree-sitter-norg-meta",

     

       394
       394
       +
               "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d",

     

       395
       395
       +
               "type": "github"

     

       396
       396
       +
             },

     

       397
       397
       +
             "original": {

     

       398
       398
       +
               "owner": "nvim-neorg",

     

       399
       399
       +
               "repo": "tree-sitter-norg-meta",

     

       400
       400
       +
               "type": "github"

     

       401
       401
       +
             }

     

       402
       402
       +
           },

     

       193
       403
        
           "root": {

     

       194
       404
        
             "inputs": {

     

       195
       405
        
               "agnoster": "agnoster",

     
···

       197
       407
        
               "flake-parts": "flake-parts",

     

       198
       408
        
               "home-manager": "home-manager",

     

       199
       409
        
               "lix-module": "lix-module",

     

       200
       200
       -
               "nixpkgs": "nixpkgs"

     

       410
       410
       +
               "neorg-overlay": "neorg-overlay",

     

       411
       411
       +
               "nixpkgs": "nixpkgs_3"

     

       201
       412
        
             }

     

       202
       413
        
           },

     

       203
       414
        
           "systems": {

     

       415
       415
       +
             "locked": {

     

       416
       416
       +
               "lastModified": 1681028828,

     

       417
       417
       +
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       418
       418
       +
               "owner": "nix-systems",

     

       419
       419
       +
               "repo": "default",

     

       420
       420
       +
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       421
       421
       +
               "type": "github"

     

       422
       422
       +
             },

     

       423
       423
       +
             "original": {

     

       424
       424
       +
               "owner": "nix-systems",

     

       425
       425
       +
               "repo": "default",

     

       426
       426
       +
               "type": "github"

     

       427
       427
       +
             }

     

       428
       428
       +
           },

     

       429
       429
       +
           "systems_2": {

     

       204
       430
        
             "locked": {

     

       205
       431
        
               "lastModified": 1681028828,

     

       206
       432
        
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

flake.nix

···

       23
       23
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       24
       24
        
           };

     

       25
       25
        
       

     

       26
       26
       +
           neorg-overlay = {

     

       27
       27
       +
             url = "github:nvim-neorg/nixpkgs-neorg-overlay";

     

       28
       28
       +
             inputs.nixpkgs.follows = "nixpkgs";

     

       29
       29
       +
           };

     

       30
       30
       +
       

     

       26
       31
        
           # nixvim = {

     

       27
       32
        
           #   url = "github:nix-community/nixvim";

     

       28
       33
        
           #   inputs.nixpkgs.follows = "nixpkgs";

+7 -2

modules/nvim.nix

···

       24
       24
        
                 nvim-treesitter.withAllGrammars

     

       25
       25
        
                 vim-nickel

     

       26
       26
        
                 # XXX: Currently broken

     

       27
       27
       -
                 # neorg

     

       28
       28
       -
                 # neorg-telescope

     

       27
       27
       +
                 lua-utils-nvim

     

       28
       28
       +
                 neorg

     

       29
       29
       +
                 neorg-telescope

     

       29
       30
        
               ];

     

       30
       31
        
       

     

       31
       32
        
               opt = [];

     
···

       33
       34
        
           };

     

       34
       35
        
         };

     

       35
       36
        
       in {

     

       37
       37
       +
         nixpkgs.overlays = [

     

       38
       38
       +
           inputs.neorg-overlay.overlays.default

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       36
       41
        
         environment.variables.EDITOR = "nvim";

     

       37
       42
        
         environment.systemPackages = [nvim];

     

       38
       43
        
       }

+3 -3

vim/.config/nvim/init.fnl

···

       280
       280
        
                   :matchup {:enable true}

     

       281
       281
        
                   :indent {:enable true}

     

       282
       282
        
                   :incremental_selection {:enable true}})

     

       283
       283
       -
            ;(setup :neorg

     

       284
       284
       -
            ;       {:load {:core.defaults {}

     

       285
       285
       -
            ;               :core.concealer {}}})

     

       283
       283
       +
            (setup :neorg

     

       284
       284
       +
                   {:load {:core.defaults {}

     

       285
       285
       +
                           :core.concealer {}}})

     

       286
       286
        
            ))

     

       287
       287
        
       

     

       288
       288
        
       (defcommand Clean "keeppatterns %s/\\s\\+$//e | set nohlsearch")