commit d5cd5f950a6f6467685cb0adfcdd4df64ea762b0 · hauleth.dev/dotfiles

+120 -40

flake.lock

···

       28
       28
        
               ]

     

       29
       29
        
             },

     

       30
       30
        
             "locked": {

     

       31
       31
       -
               "lastModified": 1738277753,

     

       32
       32
       -
               "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",

     

       31
       31
       +
               "lastModified": 1739933872,

     

       32
       32
       +
               "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=",

     

       33
       33
        
               "owner": "lnl7",

     

       34
       34
        
               "repo": "nix-darwin",

     

       35
       35
       -
               "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",

     

       35
       35
       +
               "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53",

     

       36
       36
        
               "type": "github"

     

       37
       37
        
             },

     

       38
       38
        
             "original": {

     
···

       43
       43
        
           },

     

       44
       44
        
           "darwin-stable": {

     

       45
       45
        
             "locked": {

     

       46
       46
       -
               "lastModified": 1738148668,

     

       47
       47
       -
               "narHash": "sha256-arE53pUYTdPbQ0Ctrd1xtltngqKn2EzIOKGhA480DvY=",

     

       46
       46
       +
               "lastModified": 1740262732,

     

       47
       47
       +
               "narHash": "sha256-WR2OskzqD1qG6lh/eHrGw2OxyvuhJ5sUibY3J6RBOhM=",

     

       48
       48
        
               "owner": "nixos",

     

       49
       49
        
               "repo": "nixpkgs",

     

       50
       50
       -
               "rev": "7dfcd13937964a3592766064a8bed6d2b9666eaa",

     

       50
       50
       +
               "rev": "dd647c1bb3e8fc4c9545376bcc5622f7d1957b94",

     

       51
       51
        
               "type": "github"

     

       52
       52
        
             },

     

       53
       53
        
             "original": {

     
···

       94
       94
        
               "nixpkgs-lib": "nixpkgs-lib"

     

       95
       95
        
             },

     

       96
       96
        
             "locked": {

     

       97
       97
       -
               "lastModified": 1736143030,

     

       98
       98
       -
               "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",

     

       97
       97
       +
               "lastModified": 1738453229,

     

       98
       98
       +
               "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",

     

       99
       99
        
               "owner": "hercules-ci",

     

       100
       100
        
               "repo": "flake-parts",

     

       101
       101
       -
               "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",

     

       101
       101
       +
               "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",

     

       102
       102
       +
               "type": "github"

     

       103
       103
       +
             },

     

       104
       104
       +
             "original": {

     

       105
       105
       +
               "owner": "hercules-ci",

     

       106
       106
       +
               "repo": "flake-parts",

     

       107
       107
       +
               "type": "github"

     

       108
       108
       +
             }

     

       109
       109
       +
           },

     

       110
       110
       +
           "flake-parts_2": {

     

       111
       111
       +
             "inputs": {

     

       112
       112
       +
               "nixpkgs-lib": "nixpkgs-lib_2"

     

       113
       113
       +
             },

     

       114
       114
       +
             "locked": {

     

       115
       115
       +
               "lastModified": 1719994518,

     

       116
       116
       +
               "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",

     

       117
       117
       +
               "owner": "hercules-ci",

     

       118
       118
       +
               "repo": "flake-parts",

     

       119
       119
       +
               "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",

     

       102
       120
        
               "type": "github"

     

       103
       121
        
             },

     

       104
       122
        
             "original": {

     
···

       124
       142
        
           },

     

       125
       143
        
           "flake-utils_2": {

     

       126
       144
        
             "inputs": {

     

       127
       127
       -
               "systems": "systems"

     

       145
       145
       +
               "systems": "systems_2"

     

       128
       146
        
             },

     

       129
       147
        
             "locked": {

     

       130
       148
        
               "lastModified": 1726560853,

     
···

       142
       160
        
           },

     

       143
       161
        
           "flake-utils_3": {

     

       144
       162
        
             "inputs": {

     

       145
       145
       -
               "systems": "systems_2"

     

       163
       163
       +
               "systems": "systems_3"

     

       146
       164
        
             },

     

       147
       165
        
             "locked": {

     

       148
       166
        
               "lastModified": 1731533236,

     
···

       210
       228
        
               ]

     

       211
       229
        
             },

     

       212
       230
        
             "locked": {

     

       213
       213
       -
               "lastModified": 1737475923,

     

       214
       214
       -
               "narHash": "sha256-GuIPb8YSgDKXelYwEPZqXodAso9k0CLzBT6oRf0WlJ8=",

     

       231
       231
       +
               "lastModified": 1740360785,

     

       232
       232
       +
               "narHash": "sha256-pmE2/kO8izZx+63u84I0qf/QCGKqqKFrpKsTqIBOGvQ=",

     

       215
       233
        
               "owner": "arxanas",

     

       216
       234
        
               "repo": "git-branchless",

     

       217
       217
       -
               "rev": "ca7bddba1e64a2c470af1128ca87281d9af53501",

     

       235
       235
       +
               "rev": "36046bc0c0c81a29303fff6923f62ba9d05ed926",

     

       218
       236
        
               "type": "github"

     

       219
       237
        
             },

     

       220
       238
        
             "original": {

     
···

       230
       248
        
               ]

     

       231
       249
        
             },

     

       232
       250
        
             "locked": {

     

       233
       233
       -
               "lastModified": 1738275749,

     

       234
       234
       -
               "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=",

     

       251
       251
       +
               "lastModified": 1740347597,

     

       252
       252
       +
               "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=",

     

       235
       253
        
               "owner": "nix-community",

     

       236
       254
        
               "repo": "home-manager",

     

       237
       237
       -
               "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9",

     

       255
       255
       +
               "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449",

     

       238
       256
        
               "type": "github"

     

       239
       257
        
             },

     

       240
       258
        
             "original": {

     
···

       243
       261
        
               "type": "github"

     

       244
       262
        
             }

     

       245
       263
        
           },

     

       264
       264
       +
           "lexical": {

     

       265
       265
       +
             "inputs": {

     

       266
       266
       +
               "flake-parts": "flake-parts_2",

     

       267
       267
       +
               "nixpkgs": "nixpkgs",

     

       268
       268
       +
               "systems": "systems"

     

       269
       269
       +
             },

     

       270
       270
       +
             "locked": {

     

       271
       271
       +
               "lastModified": 1739906465,

     

       272
       272
       +
               "narHash": "sha256-p8XSJBX1igwC+ssEJGD8wb/ZYaEgLGozlY8N6spo3cA=",

     

       273
       273
       +
               "owner": "lexical-lsp",

     

       274
       274
       +
               "repo": "lexical",

     

       275
       275
       +
               "rev": "477e8b418b27960710109d0014167bb371b0cade",

     

       276
       276
       +
               "type": "github"

     

       277
       277
       +
             },

     

       278
       278
       +
             "original": {

     

       279
       279
       +
               "owner": "lexical-lsp",

     

       280
       280
       +
               "repo": "lexical",

     

       281
       281
       +
               "type": "github"

     

       282
       282
       +
             }

     

       283
       283
       +
           },

     

       246
       284
        
           "lix": {

     

       247
       285
        
             "flake": false,

     

       248
       286
        
             "locked": {

     
···

       281
       319
        
           "neorg": {

     

       282
       320
        
             "flake": false,

     

       283
       321
        
             "locked": {

     

       284
       284
       -
               "lastModified": 1738251236,

     

       285
       285
       -
               "narHash": "sha256-J5PoxbtD0jKScY1ScfbHfv2IJpkS/a7T9qMFk6eepEM=",

     

       322
       322
       +
               "lastModified": 1740325949,

     

       323
       323
       +
               "narHash": "sha256-2we6H3PuvuWGC7tmPeIVdUBb2ugpfYyY1t0/FImYOvU=",

     

       286
       324
        
               "owner": "nvim-neorg",

     

       287
       325
        
               "repo": "neorg",

     

       288
       288
       -
               "rev": "bdb29ea3e069f827d31973bc942c18793ee9fa64",

     

       326
       326
       +
               "rev": "b47b4d3138beef51ffbf59bcbd7d149150b4bd2e",

     

       289
       327
        
               "type": "github"

     

       290
       328
        
             },

     

       291
       329
        
             "original": {

     
···

       306
       344
        
               "norg-meta": "norg-meta"

     

       307
       345
        
             },

     

       308
       346
        
             "locked": {

     

       309
       309
       -
               "lastModified": 1738326622,

     

       310
       310
       -
               "narHash": "sha256-sKRJfv7KCb2sjJQI9HRU0vH6HDLQ5QfrJilj7TSZ5EA=",

     

       347
       347
       +
               "lastModified": 1740385308,

     

       348
       348
       +
               "narHash": "sha256-vfD9E17uk1bSjXQskLlR7kwGl3vdTPPrX/TaD8uPUp4=",

     

       311
       349
        
               "owner": "nvim-neorg",

     

       312
       350
        
               "repo": "nixpkgs-neorg-overlay",

     

       313
       313
       -
               "rev": "9dcb1b515a025dc8ace9c349090d62bbf94e9334",

     

       351
       351
       +
               "rev": "dfcc958524cbb3afbdd1d7b96bc95faa9eeb6457",

     

       314
       352
        
               "type": "github"

     

       315
       353
        
             },

     

       316
       354
        
             "original": {

     
···

       337
       375
        
           },

     

       338
       376
        
           "nixpkgs": {

     

       339
       377
        
             "locked": {

     

       340
       340
       -
               "lastModified": 1644486793,

     

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

     

       378
       378
       +
               "lastModified": 1719931832,

     

       379
       379
       +
               "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=",

     

       342
       380
        
               "owner": "NixOS",

     

       343
       381
        
               "repo": "nixpkgs",

     

       344
       344
       -
               "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",

     

       382
       382
       +
               "rev": "0aeab749216e4c073cece5d34bc01b79e717c3e0",

     

       345
       383
        
               "type": "github"

     

       346
       384
        
             },

     

       347
       385
        
             "original": {

     

       348
       348
       -
               "owner": "NixOS",

     

       349
       349
       -
               "ref": "nixpkgs-unstable",

     

       350
       350
       -
               "repo": "nixpkgs",

     

       351
       351
       -
               "type": "github"

     

       386
       386
       +
               "id": "nixpkgs",

     

       387
       387
       +
               "type": "indirect"

     

       352
       388
        
             }

     

       353
       389
        
           },

     

       354
       390
        
           "nixpkgs-lib": {

     

       355
       391
        
             "locked": {

     

       356
       356
       -
               "lastModified": 1735774519,

     

       357
       357
       -
               "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",

     

       392
       392
       +
               "lastModified": 1738452942,

     

       393
       393
       +
               "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",

     

       358
       394
        
               "type": "tarball",

     

       359
       359
       -
               "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"

     

       395
       395
       +
               "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"

     

       360
       396
        
             },

     

       361
       397
        
             "original": {

     

       362
       398
        
               "type": "tarball",

     

       363
       363
       -
               "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"

     

       399
       399
       +
               "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"

     

       400
       400
       +
             }

     

       401
       401
       +
           },

     

       402
       402
       +
           "nixpkgs-lib_2": {

     

       403
       403
       +
             "locked": {

     

       404
       404
       +
               "lastModified": 1719876945,

     

       405
       405
       +
               "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",

     

       406
       406
       +
               "type": "tarball",

     

       407
       407
       +
               "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"

     

       408
       408
       +
             },

     

       409
       409
       +
             "original": {

     

       410
       410
       +
               "type": "tarball",

     

       411
       411
       +
               "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"

     

       364
       412
        
             }

     

       365
       413
        
           },

     

       366
       414
        
           "nixpkgs_2": {

     
···

       381
       429
        
           },

     

       382
       430
        
           "nixpkgs_3": {

     

       383
       431
        
             "locked": {

     

       384
       384
       -
               "lastModified": 1738172511,

     

       385
       385
       -
               "narHash": "sha256-v/8yB8LIy/KsySZYN6rO/f4kCEkj+fTLkzR0TaNMB+w=",

     

       432
       432
       +
               "lastModified": 1644486793,

     

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

     

       386
       434
        
               "owner": "NixOS",

     

       387
       435
        
               "repo": "nixpkgs",

     

       388
       388
       -
               "rev": "762a398892576efcc76fb233befbd58c2cef59e0",

     

       436
       436
       +
               "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",

     

       437
       437
       +
               "type": "github"

     

       438
       438
       +
             },

     

       439
       439
       +
             "original": {

     

       440
       440
       +
               "owner": "NixOS",

     

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

     

       442
       442
       +
               "repo": "nixpkgs",

     

       443
       443
       +
               "type": "github"

     

       444
       444
       +
             }

     

       445
       445
       +
           },

     

       446
       446
       +
           "nixpkgs_4": {

     

       447
       447
       +
             "locked": {

     

       448
       448
       +
               "lastModified": 1740303746,

     

       449
       449
       +
               "narHash": "sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM=",

     

       450
       450
       +
               "owner": "NixOS",

     

       451
       451
       +
               "repo": "nixpkgs",

     

       452
       452
       +
               "rev": "2d068ae5c6516b2d04562de50a58c682540de9bf",

     

       389
       453
        
               "type": "github"

     

       390
       454
        
             },

     

       391
       455
        
             "original": {

     
···

       399
       463
        
             "inputs": {

     

       400
       464
        
               "flake-compat": "flake-compat",

     

       401
       465
        
               "flake-utils": "flake-utils_4",

     

       402
       402
       -
               "nixpkgs": "nixpkgs"

     

       466
       466
       +
               "nixpkgs": "nixpkgs_2"

     

       403
       467
        
             },

     

       404
       468
        
             "locked": {

     

       405
       469
        
               "lastModified": 1672582520,

     
···

       420
       484
        
             "inputs": {

     

       421
       485
        
               "flake-compat": "flake-compat_2",

     

       422
       486
        
               "flake-utils": "flake-utils_5",

     

       423
       423
       -
               "nixpkgs": "nixpkgs_2"

     

       487
       487
       +
               "nixpkgs": "nixpkgs_3"

     

       424
       488
        
             },

     

       425
       489
        
             "locked": {

     

       426
       490
        
               "lastModified": 1713028366,

     
···

       444
       508
        
               "flake-parts": "flake-parts",

     

       445
       509
        
               "git-branchless": "git-branchless",

     

       446
       510
        
               "home-manager": "home-manager",

     

       511
       511
       +
               "lexical": "lexical",

     

       447
       512
        
               "lix-module": "lix-module",

     

       448
       513
        
               "neorg-overlay": "neorg-overlay",

     

       449
       449
       -
               "nixpkgs": "nixpkgs_3"

     

       514
       514
       +
               "nixpkgs": "nixpkgs_4"

     

       450
       515
        
             }

     

       451
       516
        
           },

     

       452
       517
        
           "systems": {

     
···

       465
       530
        
             }

     

       466
       531
        
           },

     

       467
       532
        
           "systems_2": {

     

       533
       533
       +
             "locked": {

     

       534
       534
       +
               "lastModified": 1681028828,

     

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

     

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

     

       537
       537
       +
               "repo": "default",

     

       538
       538
       +
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       539
       539
       +
               "type": "github"

     

       540
       540
       +
             },

     

       541
       541
       +
             "original": {

     

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

     

       543
       543
       +
               "repo": "default",

     

       544
       544
       +
               "type": "github"

     

       545
       545
       +
             }

     

       546
       546
       +
           },

     

       547
       547
       +
           "systems_3": {

     

       468
       548
        
             "locked": {

     

       469
       549
        
               "lastModified": 1681028828,

     

       470
       550
        
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

flake.nix

···

       34
       34
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       35
       35
        
           };

     

       36
       36
        
       

     

       37
       37
       +
           lexical = {

     

       38
       38
       +
             url = "github:lexical-lsp/lexical";

     

       39
       39
       +
           };

     

       40
       40
       +
       

     

       37
       41
        
           # nixvim = {

     

       38
       42
        
           #   url = "github:nix-community/nixvim";

     

       39
       43
        
           #   inputs.nixpkgs.follows = "nixpkgs";

+1 -2

hosts/niuniobook.nix

···

       18
       18
        
             ./modules/environment.nix

     

       19
       19
        
             ./modules/builders.nix

     

       20
       20
        
             {

     

       21
       21
       -
               system.stateVersion = 4;

     

       21
       21
       +
               system.stateVersion = 5;

     

       22
       22
        
               documentation.enable = true;

     

       23
       23
        
             }

     

       24
       24
        
             inputs.lix-module.nixosModules.default

     

       25
       25
        
             inputs.home-manager.darwinModules.home-manager

     

       26
       26
        
             {

     

       27
       27
        
               users.users.hauleth.home = "/Users/hauleth";

     

       28
       28
       -
               home-manager.useGlobalPkgs = true;

     

       29
       28
        
               home-manager.useUserPackages = true;

     

       30
       29
        
               home-manager.users.hauleth = import ../users/hauleth.nix;

     

       31
       30
        
               home-manager.extraSpecialArgs = {inherit inputs;};

+2 -3

modules/common.nix

···

       3
       3
        
         inputs,

     

       4
       4
        
         ...

     

       5
       5
        
       }: {

     

       6
       6
       -
         nixpkgs.config.allowUnfree = true;

     

       6
       6
       +
         # nixpkgs.config.allowUnfree = true;

     

       7
       7
        
       

     

       8
       8
       -
         nix.useDaemon = true;

     

       9
       9
       -
         services.nix-daemon.enable = true;

     

       8
       8
       +
         nix.enable = true;

     

       10
       9
        
       

     

       11
       10
        
         environment.systemPackages = [

     

       12
       11
        
           pkgs.cachix

+1 -1

modules/git.nix

···

       26
       26
        
           pkgs.git-branchless

     

       27
       27
        
           pkgs.git-gone

     

       28
       28
        
           pkgs.git-cliff

     

       29
       29
       -
           pkgs.git-revise

     

       29
       29
       +
           # pkgs.git-revise

     

       30
       30
        
           pkgs.gitAndTools.git-imerge

     

       31
       31
        
           # pkgs.prr

     

       32
       32
        
           inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.prr

+1 -1

modules/nvim.nix

···

       14
       14
        
               set runtimepath^=${./nvim}

     

       15
       15
        
               lua << EOF

     

       16
       16
        
               vim.g.lsp_paths = {

     

       17
       17
       -
                 ['lexical'] = "${pkgs.lexical}/bin/lexical",

     

       17
       17
       +
                 ['lexical'] = "${inputs.lexical.packages.${pkgs.stdenv.hostPlatform.system}.lexical}/bin/lexical",

     

       18
       18
        
                 ['typos_lsp'] = "${pkgs.typos-lsp}/bin/typos-lsp"

     

       19
       19
        
               }

     

       20
       20
        
               package.path = package.path .. ";${pkgs.luajitPackages.fennel}/share/lua/5.1/?.lua"

+4 -2

modules/nvim/init.fnl

···

       139
       139
        
           (swap ";" ":")

     

       140
       140
        
           (map :n "q;" "q:")))

     

       141
       141
        
       

     

       142
       142
       -
       (do ; Expand abbreviation when hitted <CR>

     

       142
       142
       +
       (do ; Expand abbreviation when hit <CR>

     

       143
       143
        
         (map :i :<CR> "<C-]><CR>"))

     

       144
       144
        
       

     

       145
       145
        
       (do ; Make Vim behaviour consistent

     
···

       185
       185
        
         (map :n :<C-q>v ":vert Start")

     

       186
       186
        
         (map :n :<C-q>t ":tab Start")

     

       187
       187
        
         (map :t :<C-q> "<C-\\><C-n>")

     

       188
       188
       -
         (map :i :<C-q><C-q> :<ESC>)

     

       188
       188
       +
         (map :n :<C-q>      :<ESC>)

     

       189
       189
       +
         (map :n :<C-q>q     :<ESC>)

     

       189
       190
        
         (map :n :<C-q><C-q> :<ESC>)

     

       191
       191
       +
         (map :i :<C-q><C-q> :<ESC>)

     

       190
       192
        
         (when (fun.executable :nvr)

     

       191
       193
        
           (set vim.env.EDITOR "nvr -cc split -c 'set bufhidden=delete' --remote-wait")))

     

       192
       194