comparing 0f0a5867279ea6af975cfcbbf376c778f534e732 and main on ovyerus.com/dotfiles

+4 -2

files/karabiner/keybind-helpers.json

···

       13
       13
        
                         "description": "MacBook internal keyboard",

     

       14
       14
        
                         "vendor_id": 1452,

     

       15
       15
        
                         "product_id": 641

     

       16
       16
       -
                       }

     

       16
       16
       +
                       },

     

       17
       17
       +
                       { "is_built_in_keyboard": true }

     

       17
       18
        
                     ]

     

       18
       19
        
                   }

     

       19
       20
        
                 ],

     
···

       50
       51
        
                         "description": "MacBook internal keyboard",

     

       51
       52
        
                         "vendor_id": 1452,

     

       52
       53
        
                         "product_id": 641

     

       53
       53
       -
                       }

     

       54
       54
       +
                       },

     

       55
       55
       +
                       { "is_built_in_keyboard": true }

     

       54
       56
        
                     ]

     

       55
       57
        
                   }

     

       56
       58
        
                 ],

+49 -102

flake.lock

···

       5
       5
        
               "home-manager": [

     

       6
       6
        
                 "home-manager"

     

       7
       7
        
               ],

     

       8
       8
       -
               "nix-darwin": "nix-darwin",

     

       8
       8
       +
               "nix-darwin": [

     

       9
       9
       +
                 "nix-darwin"

     

       10
       10
       +
               ],

     

       9
       11
        
               "nixpkgs": [

     

       10
       12
        
                 "nixpkgs"

     

       11
       13
        
               ],

     
···

       65
       67
        
               "systems": "systems_2"

     

       66
       68
        
             },

     

       67
       69
        
             "locked": {

     

       68
       68
       -
               "lastModified": 1726560853,

     

       69
       69
       -
               "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",

     

       70
       70
       -
               "owner": "numtide",

     

       71
       71
       -
               "repo": "flake-utils",

     

       72
       72
       -
               "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",

     

       73
       73
       -
               "type": "github"

     

       74
       74
       -
             },

     

       75
       75
       -
             "original": {

     

       76
       76
       -
               "owner": "numtide",

     

       77
       77
       -
               "repo": "flake-utils",

     

       78
       78
       -
               "type": "github"

     

       79
       79
       -
             }

     

       80
       80
       -
           },

     

       81
       81
       -
           "flake-utils_3": {

     

       82
       82
       -
             "inputs": {

     

       83
       83
       -
               "systems": "systems_3"

     

       84
       84
       -
             },

     

       85
       85
       -
             "locked": {

     

       86
       70
        
               "lastModified": 1731533236,

     

       87
       71
        
               "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",

     

       88
       72
        
               "owner": "numtide",

     
···

       140
       124
        
               ]

     

       141
       125
        
             },

     

       142
       126
        
             "locked": {

     

       143
       143
       -
               "lastModified": 1760479847,

     

       144
       144
       -
               "narHash": "sha256-xOwdvpPSHw767aXyeo3GG8DjFbZ9YyRIVSr4TXADQ48=",

     

       127
       127
       +
               "lastModified": 1767391542,

     

       128
       128
       +
               "narHash": "sha256-qHXxJuFkQhggyeao/kQb6KcOjgz0Ky+ArfowRX1MHaE=",

     

       145
       129
        
               "owner": "nix-community",

     

       146
       130
        
               "repo": "home-manager",

     

       147
       147
       -
               "rev": "ed1eb4cfddba1be85cb16702d7a42803d1ff55e8",

     

       131
       131
       +
               "rev": "2f06b726061b7e1aa69f718e943da9ffcecd6397",

     

       148
       132
        
               "type": "github"

     

       149
       133
        
             },

     

       150
       134
        
             "original": {

     
···

       177
       161
        
           "lix": {

     

       178
       162
        
             "flake": false,

     

       179
       163
        
             "locked": {

     

       180
       180
       -
               "lastModified": 1729298361,

     

       181
       181
       -
               "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",

     

       182
       182
       -
               "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",

     

       164
       164
       +
               "lastModified": 1751234633,

     

       165
       165
       +
               "narHash": "sha256-b5d+HnPcyHz0ZJW1+LZl4qm4LGTB/TiaDFQVlVL2xpE=",

     

       166
       166
       +
               "rev": "7c8c7562be432f1f40b98c24f528696b1ae20263",

     

       183
       167
        
               "type": "tarball",

     

       184
       184
       -
               "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"

     

       168
       168
       +
               "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7c8c7562be432f1f40b98c24f528696b1ae20263.tar.gz?rev=7c8c7562be432f1f40b98c24f528696b1ae20263"

     

       185
       169
        
             },

     

       186
       170
        
             "original": {

     

       187
       171
        
               "type": "tarball",

     

       188
       188
       -
               "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"

     

       172
       172
       +
               "url": "https://git.lix.systems/lix-project/lix/archive/2.91.3.tar.gz"

     

       189
       173
        
             }

     

       190
       174
        
           },

     

       191
       175
        
           "lix-module": {

     
···

       198
       182
        
               ]

     

       199
       183
        
             },

     

       200
       184
        
             "locked": {

     

       201
       201
       -
               "lastModified": 1732605668,

     

       202
       202
       -
               "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",

     

       203
       203
       -
               "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",

     

       185
       185
       +
               "lastModified": 1756128651,

     

       186
       186
       +
               "narHash": "sha256-Bacu3Ek38AtlL+pSsbdUW4V5Waat0FnhyzLoQjPUxWE=",

     

       187
       187
       +
               "rev": "96fc11f1b68f0138de71205122670ef736cdb0d9",

     

       204
       188
        
               "type": "tarball",

     

       205
       205
       -
               "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz"

     

       189
       189
       +
               "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/96fc11f1b68f0138de71205122670ef736cdb0d9.tar.gz"

     

       206
       190
        
             },

     

       207
       191
        
             "original": {

     

       208
       192
        
               "type": "tarball",

     

       209
       209
       -
               "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"

     

       193
       193
       +
               "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.3-2.tar.gz"

     

       210
       194
        
             }

     

       211
       195
        
           },

     

       212
       196
        
           "niri-flake": {

     
···

       221
       205
        
               "xwayland-satellite-unstable": "xwayland-satellite-unstable"

     

       222
       206
        
             },

     

       223
       207
        
             "locked": {

     

       224
       224
       -
               "lastModified": 1760432014,

     

       225
       225
       -
               "narHash": "sha256-shqc+38nKs/XS2scgJV8KP5/D0PWAXYYgf5nT6BfHNE=",

     

       208
       208
       +
               "lastModified": 1767377696,

     

       209
       209
       +
               "narHash": "sha256-OShXLsMyF9hxmiID1p4QF+ekqreViHM9105ej05S2uI=",

     

       226
       210
        
               "owner": "sodiboo",

     

       227
       211
        
               "repo": "niri-flake",

     

       228
       228
       -
               "rev": "f2aa74f5d28fed7fca48cd4bea4c0803699c0f6c",

     

       212
       212
       +
               "rev": "ba6ea712dc2da0b01c6a8d02dd9e86973663e4de",

     

       229
       213
        
               "type": "github"

     

       230
       214
        
             },

     

       231
       215
        
             "original": {

     
···

       254
       238
        
           "niri-unstable": {

     

       255
       239
        
             "flake": false,

     

       256
       240
        
             "locked": {

     

       257
       257
       -
               "lastModified": 1760426302,

     

       258
       258
       -
               "narHash": "sha256-HEeX0wTT2DTRAgADnOmcyk7k/J8KlFosBpFp0yIVfm0=",

     

       241
       241
       +
               "lastModified": 1767160009,

     

       242
       242
       +
               "narHash": "sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI=",

     

       259
       243
        
               "owner": "YaLTeR",

     

       260
       244
        
               "repo": "niri",

     

       261
       261
       -
               "rev": "87dc96fa69738b5d57562a0a556efa7def138539",

     

       245
       245
       +
               "rev": "cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3",

     

       262
       246
        
               "type": "github"

     

       263
       247
        
             },

     

       264
       248
        
             "original": {

     
···

       270
       254
        
           "nix-darwin": {

     

       271
       255
        
             "inputs": {

     

       272
       256
        
               "nixpkgs": [

     

       273
       273
       -
                 "denix",

     

       274
       257
        
                 "nixpkgs"

     

       275
       258
        
               ]

     

       276
       259
        
             },

     

       277
       260
        
             "locked": {

     

       278
       278
       -
               "lastModified": 1751313918,

     

       279
       279
       -
               "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",

     

       261
       261
       +
               "lastModified": 1767028240,

     

       262
       262
       +
               "narHash": "sha256-0/fLUqwJ4Z774muguUyn5t8AQ6wyxlNbHexpje+5hRo=",

     

       280
       263
        
               "owner": "nix-darwin",

     

       281
       264
        
               "repo": "nix-darwin",

     

       282
       282
       -
               "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",

     

       265
       265
       +
               "rev": "c31afa6e76da9bbc7c9295e39c7de9fca1071ea1",

     

       283
       266
        
               "type": "github"

     

       284
       267
        
             },

     

       285
       268
        
             "original": {

     
···

       288
       271
        
               "type": "github"

     

       289
       272
        
             }

     

       290
       273
        
           },

     

       291
       291
       -
           "nix-darwin_2": {

     

       292
       292
       -
             "inputs": {

     

       293
       293
       -
               "nixpkgs": [

     

       294
       294
       -
                 "nixpkgs"

     

       295
       295
       -
               ]

     

       296
       296
       -
             },

     

       297
       297
       -
             "locked": {

     

       298
       298
       -
               "lastModified": 1760338583,

     

       299
       299
       -
               "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=",

     

       300
       300
       -
               "owner": "LnL7",

     

       301
       301
       -
               "repo": "nix-darwin",

     

       302
       302
       -
               "rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf",

     

       303
       303
       -
               "type": "github"

     

       304
       304
       -
             },

     

       305
       305
       -
             "original": {

     

       306
       306
       -
               "owner": "LnL7",

     

       307
       307
       -
               "repo": "nix-darwin",

     

       308
       308
       -
               "type": "github"

     

       309
       309
       -
             }

     

       310
       310
       -
           },

     

       311
       274
        
           "nix-index-database": {

     

       312
       275
        
             "inputs": {

     

       313
       276
        
               "nixpkgs": [

     
···

       315
       278
        
               ]

     

       316
       279
        
             },

     

       317
       280
        
             "locked": {

     

       318
       318
       -
               "lastModified": 1760241904,

     

       319
       319
       -
               "narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=",

     

       281
       281
       +
               "lastModified": 1765267181,

     

       282
       282
       +
               "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",

     

       320
       283
        
               "owner": "nix-community",

     

       321
       284
        
               "repo": "nix-index-database",

     

       322
       322
       -
               "rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa",

     

       285
       285
       +
               "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",

     

       323
       286
        
               "type": "github"

     

       324
       287
        
             },

     

       325
       288
        
             "original": {

     
···

       330
       293
        
           },

     

       331
       294
        
           "nix-vscode-extensions": {

     

       332
       295
        
             "inputs": {

     

       333
       333
       -
               "flake-utils": "flake-utils_3",

     

       334
       296
        
               "nixpkgs": "nixpkgs_2"

     

       335
       297
        
             },

     

       336
       298
        
             "locked": {

     

       337
       337
       -
               "lastModified": 1760406799,

     

       338
       338
       -
               "narHash": "sha256-vK61Z2DhBMp3Y+FcqRqf1ZYkmcePXOQGJ0NGBzN7ys8=",

     

       299
       299
       +
               "lastModified": 1767405959,

     

       300
       300
       +
               "narHash": "sha256-K9P7J2W/deP9d1aZOlIvmK+sWCQrk6kcX3T21y3Marc=",

     

       339
       301
        
               "owner": "nix-community",

     

       340
       302
        
               "repo": "nix-vscode-extensions",

     

       341
       341
       -
               "rev": "979e203b85cb5f15228c7fe3dfaf1964d6e50b9d",

     

       303
       303
       +
               "rev": "c84c57fb183f7b2318187927d3a82641e6796933",

     

       342
       304
        
               "type": "github"

     

       343
       305
        
             },

     

       344
       306
        
             "original": {

     
···

       380
       342
        
           },

     

       381
       343
        
           "nixpkgs-stable": {

     

       382
       344
        
             "locked": {

     

       383
       383
       -
               "lastModified": 1760139962,

     

       384
       384
       -
               "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=",

     

       345
       345
       +
               "lastModified": 1767325753,

     

       346
       346
       +
               "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",

     

       385
       347
        
               "owner": "NixOS",

     

       386
       348
        
               "repo": "nixpkgs",

     

       387
       387
       -
               "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4",

     

       349
       349
       +
               "rev": "64049ca74d63e971b627b5f3178d95642e61cedd",

     

       388
       350
        
               "type": "github"

     

       389
       351
        
             },

     

       390
       352
        
             "original": {

     

       391
       353
        
               "owner": "NixOS",

     

       392
       392
       -
               "ref": "nixos-25.05",

     

       354
       354
       +
               "ref": "nixos-25.11",

     

       393
       355
        
               "repo": "nixpkgs",

     

       394
       356
        
               "type": "github"

     

       395
       357
        
             }

     

       396
       358
        
           },

     

       397
       359
        
           "nixpkgs_2": {

     

       398
       360
        
             "locked": {

     

       399
       399
       -
               "lastModified": 1759770925,

     

       400
       400
       -
               "narHash": "sha256-CZwkCtzTNclqlhuwDsVtGoRumTpqCUK0xSnFIMgd8ls=",

     

       361
       361
       +
               "lastModified": 1766025857,

     

       362
       362
       +
               "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=",

     

       401
       363
        
               "owner": "nixos",

     

       402
       364
        
               "repo": "nixpkgs",

     

       403
       403
       -
               "rev": "674c2b09c59a220204350ced584cadaacee30038",

     

       365
       365
       +
               "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce",

     

       404
       366
        
               "type": "github"

     

       405
       367
        
             },

     

       406
       368
        
             "original": {

     

       407
       369
        
               "owner": "nixos",

     

       408
       370
        
               "repo": "nixpkgs",

     

       409
       409
       -
               "rev": "674c2b09c59a220204350ced584cadaacee30038",

     

       371
       371
       +
               "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce",

     

       410
       372
        
               "type": "github"

     

       411
       373
        
             }

     

       412
       374
        
           },

     

       413
       375
        
           "nixpkgs_3": {

     

       414
       376
        
             "locked": {

     

       415
       415
       -
               "lastModified": 1760284886,

     

       416
       416
       -
               "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",

     

       377
       377
       +
               "lastModified": 1767116409,

     

       378
       378
       +
               "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=",

     

       417
       379
        
               "owner": "nixos",

     

       418
       380
        
               "repo": "nixpkgs",

     

       419
       419
       -
               "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",

     

       381
       381
       +
               "rev": "cad22e7d996aea55ecab064e84834289143e44a0",

     

       420
       382
        
               "type": "github"

     

       421
       383
        
             },

     

       422
       384
        
             "original": {

     
···

       453
       415
        
               "iosevka-solai": "iosevka-solai",

     

       454
       416
        
               "lix-module": "lix-module",

     

       455
       417
        
               "niri-flake": "niri-flake",

     

       456
       456
       -
               "nix-darwin": "nix-darwin_2",

     

       418
       418
       +
               "nix-darwin": "nix-darwin",

     

       457
       419
        
               "nix-index-database": "nix-index-database",

     

       458
       420
        
               "nix-vscode-extensions": "nix-vscode-extensions",

     

       459
       421
        
               "nixpkgs": "nixpkgs_3",

     
···

       490
       452
        
               "type": "github"

     

       491
       453
        
             }

     

       492
       454
        
           },

     

       493
       493
       -
           "systems_3": {

     

       494
       494
       -
             "locked": {

     

       495
       495
       -
               "lastModified": 1681028828,

     

       496
       496
       -
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       497
       497
       -
               "owner": "nix-systems",

     

       498
       498
       -
               "repo": "default",

     

       499
       499
       -
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       500
       500
       -
               "type": "github"

     

       501
       501
       -
             },

     

       502
       502
       -
             "original": {

     

       503
       503
       -
               "owner": "nix-systems",

     

       504
       504
       -
               "repo": "default",

     

       505
       505
       -
               "type": "github"

     

       506
       506
       -
             }

     

       507
       507
       -
           },

     

       508
       455
        
           "xwayland-satellite-stable": {

     

       509
       456
        
             "flake": false,

     

       510
       457
        
             "locked": {

     
···

       525
       472
        
           "xwayland-satellite-unstable": {

     

       526
       473
        
             "flake": false,

     

       527
       474
        
             "locked": {

     

       528
       528
       -
               "lastModified": 1759707084,

     

       529
       529
       -
               "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=",

     

       475
       475
       +
               "lastModified": 1766429945,

     

       476
       476
       +
               "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=",

     

       530
       477
        
               "owner": "Supreeeme",

     

       531
       478
        
               "repo": "xwayland-satellite",

     

       532
       532
       -
               "rev": "a9188e70bd748118b4d56a529871b9de5adb9988",

     

       479
       479
       +
               "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e",

     

       533
       480
        
               "type": "github"

     

       534
       481
        
             },

     

       535
       482
        
             "original": {

     
···

       545
       492
        
               ]

     

       546
       493
        
             },

     

       547
       494
        
             "locked": {

     

       548
       548
       -
               "lastModified": 1759982773,

     

       549
       549
       -
               "narHash": "sha256-HlTQoXRytul3jjek7vRV0Qk7voDB3Fy8RSIzDSvHIAQ=",

     

       495
       495
       +
               "lastModified": 1767307876,

     

       496
       496
       +
               "narHash": "sha256-d5EKvUnfr6tdhymIThz0WGG0JHT2cCZzbZK4t2CwYuc=",

     

       550
       497
        
               "owner": "youwen5",

     

       551
       498
        
               "repo": "zen-browser-flake",

     

       552
       552
       -
               "rev": "f2f8aff94529e763665b807bad23396aed9d1fe8",

     

       499
       499
       +
               "rev": "c5bffaf433e6137fe80cd1930584836f11119b26",

     

       553
       500
        
               "type": "github"

     

       554
       501
        
             },

     

       555
       502
        
             "original": {

+19 -29

flake.nix

···

       5
       5
        
           # nur.url = "github:nix-community/NUR";

     

       6
       6
        
       

     

       7
       7
        
           nix-darwin = {

     

       8
       8
       -
             url = "github:LnL7/nix-darwin";

     

       8
       8
       +
             url = "github:nix-darwin/nix-darwin";

     

       9
       9
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       10
       10
        
           };

     

       11
       11
        
       

     
···

       30
       30
        
           };

     

       31
       31
        
       

     

       32
       32
        
           lix-module = {

     

       33
       33
       -
             url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";

     

       33
       33
       +
             url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.3-2.tar.gz";

     

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

     

       35
       35
        
           };

     

       36
       36
        
       

     

       37
       37
        
           denix = {

     

       38
       38
        
             url = "github:yunfachi/denix";

     

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

     

       40
       40
       +
             inputs.nix-darwin.follows = "nix-darwin";

     

       40
       41
        
             inputs.home-manager.follows = "home-manager";

     

       41
       42
        
           };

     

       42
       43
        
       

     
···

       44
       45
        
             url = "github:youwen5/zen-browser-flake";

     

       45
       46
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       46
       47
        
           };

     

       47
       47
       -
       

     

       48
       48
       -
           # ags = {

     

       49
       49
       -
           #   url = "github:Aylur/ags";

     

       50
       50
       -
           #   inputs.nixpkgs.follows = "nixpkgs";

     

       51
       51
       -
           # };

     

       52
       48
        
         };

     

       53
       49
        
       

     

       54
       50
        
         outputs = {

     

       55
       55
       -
           # ags,

     

       56
       51
        
           denix,

     

       57
       52
        
           home-manager,

     

       58
       53
        
           lix-module,

     
···

       63
       58
        
           self,

     

       64
       59
        
           ...

     

       65
       60
        
         } @ inputs: let

     

       66
       66
       -
           system = "x86_64-linux";

     

       67
       67
       -
           pkgs = nixpkgs.legacyPackages.${system};

     

       68
       68
       -
           # agsPkgs = ags.packages.${system};

     

       61
       61
       +
           forSystems = fn:

     

       62
       62
       +
             nixpkgs.lib.genAttrs [

     

       63
       63
       +
               "aarch64-linux"

     

       64
       64
       +
               "aarch64-darwin"

     

       65
       65
       +
               "x86_64-darwin"

     

       66
       66
       +
               "x86_64-linux"

     

       67
       67
       +
             ] (system: fn nixpkgs.legacyPackages.${system});

     

       68
       68
       +
           defaultForSystems = fn: forSystems (pkgs: {default = fn pkgs;});

     

       69
       69
       +
       

     

       69
       70
        
           mkConfigurations = moduleSystem:

     

       70
       71
        
             denix.lib.configurations (let

     

       71
       72
        
               homeManagerUser = "ovy";

     
···

       76
       77
        
               specialArgs = {inherit inputs moduleSystem homeManagerUser;};

     

       77
       78
        
             });

     

       78
       79
        
         in {

     

       79
       79
       -
           packages.${system} = {

     

       80
       80
       +
           packages = forSystems (pkgs: {

     

       80
       81
        
             iconifydl = pkgs.callPackage ./pkgs/iconifydl.nix {};

     

       81
       81
       -
       

     

       82
       82
       -
             # default = ags.lib.bundle {

     

       83
       83
       -
             #   inherit pkgs;

     

       84
       84
       -
             #   src = ./files/astal;

     

       85
       85
       -
             #   name = "ovy-shell";

     

       86
       86
       -
             #   entry = "app.ts";

     

       87
       87
       -
             # };

     

       88
       88
       -
           };

     

       82
       82
       +
           });

     

       89
       83
        
       

     

       90
       90
       -
           # devShells.x86_64-linux.default = pkgs.mkShell {

     

       91
       91
       -
           #   buildInputs = [agsPkgs.agsFull agsPkgs.io agsPkgs.apps agsPkgs.tray self.packages.${system}.iconifydl];

     

       92
       92
       -
           # };

     

       84
       84
       +
           devShells = defaultForSystems (pkgs:

     

       85
       85
       +
             pkgs.mkShell {

     

       86
       86
       +
               buildInputs = [pkgs.just];

     

       87
       87
       +
             });

     

       93
       88
        
       

     

       94
       89
        
           nixosConfigurations = mkConfigurations "nixos";

     

       95
       90
        
           darwinConfigurations = mkConfigurations "darwin";

     
···

       106
       101
        
           #   };

     

       107
       102
        
           # };

     

       108
       103
        
       

     

       109
       109
       -
           formatter = {

     

       110
       110
       -
             aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra;

     

       111
       111
       -
             aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.alejandra;

     

       112
       112
       -
             x86_64-darwin = nixpkgs.legacyPackages.x86_64-darwin.alejandra;

     

       113
       113
       -
             x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;

     

       114
       114
       -
           };

     

       104
       104
       +
           formatter = forSystems (pkgs: pkgs.alejandra);

     

       115
       105
        
         };

     

       116
       106
        
       }

+15

hosts/setsuna/default.nix

···

       1
       1
       +
       {delib, ...}:

     

       2
       2
       +
       delib.host {

     

       3
       3
       +
         name = "setsuna";

     

       4
       4
       +
       

     

       5
       5
       +
         myconfig._1password.enable = false;

     

       6
       6
       +
         myconfig.gaming.enable = false;

     

       7
       7
       +
         myconfig.tray.enable = false;

     

       8
       8
       +
         myconfig.virtualisation.enable = false;

     

       9
       9
       +
       

     

       10
       10
       +
         myconfig.programs.chromium.enable = false;

     

       11
       11
       +
         myconfig.programs.desktop-apps.enable = false;

     

       12
       12
       +
         myconfig.programs.espanso.enable = false;

     

       13
       13
       +
         myconfig.programs.kitty.enable = false;

     

       14
       14
       +
         myconfig.programs.syncthing.enable = false;

     

       15
       15
       +
       }

+19

hosts/setsuna/hardware.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         delib,

     

       3
       3
       +
         inputs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       delib.host {

     

       7
       7
       +
         name = "setsuna";

     

       8
       8
       +
       

     

       9
       9
       +
         homeManagerSystem = "aarch64-darwin";

     

       10
       10
       +
         home.home.stateVersion = "26.05";

     

       11
       11
       +
       

     

       12
       12
       +
         darwin = {

     

       13
       13
       +
           nixpkgs.hostPlatform = "aarch64-darwin";

     

       14
       14
       +
           # TODO: `darwin-rebuild changelog` to see what changed, latest is 6

     

       15
       15
       +
           system.stateVersion = 6;

     

       16
       16
       +
           # TODO: see what this does, i forgor

     

       17
       17
       +
           system.configurationRevision = inputs.self.rev or inputs.self.dirtyRev or null;

     

       18
       18
       +
         };

     

       19
       19
       +
       }

-1

hosts/shimmer/default.nix

···

       7
       7
        
         myconfig.tray.enable = false;

     

       8
       8
        
         myconfig.virtualisation.enable = false;

     

       9
       9
        
       

     

       10
       10
       -
         myconfig.programs.firefox.enable = false;

     

       11
       10
        
         myconfig.programs.chromium.enable = false;

     

       12
       11
        
         myconfig.programs.desktop-apps.enable = false;

     

       13
       12
        
         myconfig.programs.espanso.enable = false;

+2

hosts/wallsocket/hardware.nix

···

       1
       1
        
       {

     

       2
       2
        
         delib,

     

       3
       3
        
         lib,

     

       4
       4
       +
         pkgs,

     

       4
       5
        
         ...

     

       5
       6
        
       }: let

     

       6
       7
        
         platform = "x86_64-linux";

     
···

       24
       25
        
             boot.initrd.kernelModules = [];

     

       25
       26
        
             boot.kernelModules = ["kvm-amd"];

     

       26
       27
        
             boot.extraModulePackages = [];

     

       28
       28
       +
             boot.kernelPackages = pkgs.linuxPackages_latest;

     

       27
       29
        
       

     

       28
       30
        
             # Bootloader

     

       29
       31
        
             boot.loader.systemd-boot.enable = true;

+15

justfile

···

       1
       1
       +
       [private]

     

       2
       2
       +
       default:

     

       3
       3
       +
         just --list

     

       4
       4
       +
       

     

       5
       5
       +
       [linux]

     

       6
       6
       +
       boot:

     

       7
       7
       +
         sudo nixos-rebuild boot -L

     

       8
       8
       +
       

     

       9
       9
       +
       [linux]

     

       10
       10
       +
       switch:

     

       11
       11
       +
         sudo nixos-rebuild switch -L

     

       12
       12
       +
       

     

       13
       13
       +
       [macos]

     

       14
       14
       +
       switch:

     

       15
       15
       +
         sudo darwin-rebuild switch --flake . -L

+1

modules/1password.nix

···

       20
       20
        
             text = ''

     

       21
       21
        
               vivaldi-bin

     

       22
       22
        
               zen

     

       23
       23
       +
               zen-bin

     

       23
       24
        
             '';

     

       24
       25
        
             mode = "0755";

     

       25
       26
        
           };

+2

modules/darwin/homebrew.nix

···

       27
       27
        
       

     

       28
       28
        
           casks = [

     

       29
       29
        
             "1password"

     

       30
       30
       +
             "blender"

     

       30
       31
        
             "discord"

     

       31
       32
        
             "figma"

     

       32
       33
        
             "httpie"

     
···

       40
       41
        
             "swiftformat-for-xcode"

     

       41
       42
        
             "tailscale-app"

     

       42
       43
        
             # "vorta"

     

       44
       44
       +
             "vesktop"

     

       43
       45
        
             "zen"

     

       44
       46
        
           ];

     

       45
       47

+5 -3

modules/fonts.nix

···

       10
       10
        
         nixos.always = {

     

       11
       11
        
           fonts = {

     

       12
       12
        
             packages = [

     

       13
       13
       -
               pkgs.ubuntu_font_family

     

       13
       13
       +
               pkgs.ubuntu-classic

     

       14
       14
       +
               pkgs.ubuntu-sans

     

       14
       15
        
               pkgs.inter

     

       15
       15
       -
               pkgs.corefonts

     

       16
       16
       -
               pkgs.vista-fonts

     

       16
       16
       +
               # Only needed for one specific thing and now can't download from sourceforge for some reason

     

       17
       17
       +
               # pkgs.corefonts

     

       18
       18
       +
               # pkgs.vista-fonts

     

       17
       19
        
               inputs.iosevka-solai.packages.x86_64-linux.bin

     

       18
       20
        
             ];

     

       19
       21

+1 -1

modules/graphics.nix

···

       20
       20
        
             opencl.enable = true;

     

       21
       21
        
           };

     

       22
       22
        
       

     

       23
       23
       -
           environment.systemPackages = with pkgs; [amdgpu_top lact nvtopPackages.full];

     

       23
       23
       +
           environment.systemPackages = with pkgs; [amdgpu_top lact];

     

       24
       24
        
       

     

       25
       25
        
           systemd.services.lactd = {

     

       26
       26
        
             description = "AMDGPU Control Daemon";

+66 -72

modules/nix.nix

···

       2
       2
        
         delib,

     

       3
       3
        
         inputs,

     

       4
       4
        
         ...

     

       5
       5
       -
       }: let

     

       6
       6
       -
         shared = {

     

       7
       7
       -
           nixpkgs.config = import ../files/nixpkgs-config.nix;

     

       5
       5
       +
       }:

     

       6
       6
       +
       delib.module {

     

       7
       7
       +
         name = "nix";

     

       8
       8
        
       

     

       9
       9
       -
           nix.settings = {

     

       10
       10
       -
             auto-optimise-store = true;

     

       11
       11
       -
             experimental-features = ["nix-command" "flakes"];

     

       12
       12
       -
             trusted-users = ["root" "@wheel" "ovy"];

     

       13
       13
       -
           };

     

       9
       9
       +
         # TODO: double check home-manager options

     

       10
       10
       +
         home.always = {

     

       11
       11
       +
           nixpkgs.config = import ../files/nixpkgs-config.nix;

     

       12
       12
       +
           xdg.configFile."nixpkgs/config.nix".source = ../files/nixpkgs-config.nix;

     

       14
       13
        
         };

     

       15
       15
       -
       in

     

       16
       16
       -
         delib.module {

     

       17
       17
       -
           name = "nix";

     

       14
       14
       +
       

     

       15
       15
       +
         nixos.always = {

     

       16
       16
       +
           nixpkgs.config = import ../files/nixpkgs-config.nix;

     

       18
       17
        
       

     

       19
       19
       -
           # TODO: double check home-manager options

     

       20
       20
       -
           home.always =

     

       21
       21
       -
             shared

     

       22
       22
       -
             // {

     

       23
       23
       -
               xdg.configFile."nixpkgs/config.nix".source = ../files/nixpkgs-config.nix;

     

       18
       18
       +
           nix = {

     

       19
       19
       +
             gc = {

     

       20
       20
       +
               automatic = true;

     

       21
       21
       +
               options = "--delete-older-than 10d";

     

       22
       22
       +
               dates = "weekly";

     

       24
       23
        
             };

     

       25
       24
        
       

     

       26
       26
       -
           nixos.always =

     

       27
       27
       -
             shared

     

       28
       28
       -
             // {

     

       29
       29
       -
               nix = {

     

       30
       30
       -
                 gc = {

     

       31
       31
       -
                   automatic = true;

     

       32
       32
       -
                   options = "--delete-older-than 10d";

     

       33
       33
       -
                   dates = "weekly";

     

       34
       34
       -
                 };

     

       25
       25
       +
             nixPath = ["nixpkgs=${inputs.nixpkgs}"];

     

       35
       26
        
       

     

       36
       36
       -
                 nixPath = ["nixpkgs=${inputs.nixpkgs}"];

     

       27
       27
       +
             registry.nixpkgs.to = {

     

       28
       28
       +
               type = "path";

     

       29
       29
       +
               path = inputs.nixpkgs;

     

       30
       30
       +
               narHash = inputs.nixpkgs.narHash;

     

       31
       31
       +
             };

     

       37
       32
        
       

     

       38
       38
       -
                 registry.nixpkgs.to = {

     

       39
       39
       -
                   type = "path";

     

       40
       40
       -
                   path = inputs.nixpkgs;

     

       41
       41
       -
                   narHash = inputs.nixpkgs.narHash;

     

       42
       42
       -
                 };

     

       33
       33
       +
             settings = {

     

       34
       34
       +
               auto-optimise-store = true;

     

       35
       35
       +
               experimental-features = ["nix-command" "flakes"];

     

       36
       36
       +
               trusted-users = ["root" "@wheel" "ovy"];

     

       37
       37
       +
               warn-dirty = false;

     

       38
       38
       +
             };

     

       39
       39
       +
           };

     

       43
       40
        
       

     

       44
       44
       -
                 settings = {

     

       45
       45
       -
                   auto-optimise-store = true;

     

       46
       46
       -
                   experimental-features = ["nix-command" "flakes"];

     

       47
       47
       -
                   trusted-users = ["root" "@wheel" "ovy"];

     

       48
       48
       -
                 };

     

       49
       49
       -
               };

     

       41
       41
       +
           system.tools.nixos-option.enable = false;

     

       42
       42
       +
         };

     

       50
       43
        
       

     

       51
       51
       -
               system.tools.nixos-option.enable = false;

     

       52
       52
       -
             };

     

       44
       44
       +
         darwin.always = {

     

       45
       45
       +
           nixpkgs.config = import ../files/nixpkgs-config.nix;

     

       53
       46
        
       

     

       54
       54
       -
           darwin.always = {

     

       55
       55
       -
             nix = {

     

       56
       56
       -
               buildMachines = [

     

       57
       57
       -
                 {

     

       58
       58
       -
                   hostName = "rushing.axolotl-map.ts.net";

     

       59
       59
       -
                   sshUser = "colmena-deploy";

     

       60
       60
       -
                   system = "x86_64-linux";

     

       61
       61
       -
                   speedFactor = 2;

     

       62
       62
       -
                   maxJobs = 6;

     

       63
       63
       -
                   protocol = "ssh-ng";

     

       64
       64
       -
                 }

     

       65
       65
       -
                 {

     

       66
       66
       -
                   hostName = "skyline.axolotl-map.ts.net";

     

       67
       67
       -
                   sshUser = "colmena-deploy";

     

       68
       68
       -
                   system = "aarch64-linux";

     

       69
       69
       -
                   speedFactor = 1;

     

       70
       70
       -
                   maxJobs = 2;

     

       71
       71
       -
                   protocol = "ssh-ng";

     

       72
       72
       -
                 }

     

       73
       73
       -
               ];

     

       47
       47
       +
           nix = {

     

       48
       48
       +
             buildMachines = [

     

       49
       49
       +
               {

     

       50
       50
       +
                 hostName = "rushing.axolotl-map.ts.net";

     

       51
       51
       +
                 sshUser = "colmena-deploy";

     

       52
       52
       +
                 system = "x86_64-linux";

     

       53
       53
       +
                 speedFactor = 2;

     

       54
       54
       +
                 maxJobs = 6;

     

       55
       55
       +
                 protocol = "ssh-ng";

     

       56
       56
       +
               }

     

       57
       57
       +
               {

     

       58
       58
       +
                 hostName = "skyline.axolotl-map.ts.net";

     

       59
       59
       +
                 sshUser = "colmena-deploy";

     

       60
       60
       +
                 system = "aarch64-linux";

     

       61
       61
       +
                 speedFactor = 1;

     

       62
       62
       +
                 maxJobs = 2;

     

       63
       63
       +
                 protocol = "ssh-ng";

     

       64
       64
       +
               }

     

       65
       65
       +
             ];

     

       74
       66
        
       

     

       75
       75
       -
               distributedBuilds = true;

     

       67
       67
       +
             distributedBuilds = true;

     

       76
       68
        
       

     

       77
       77
       -
               gc = {

     

       78
       78
       -
                 automatic = true;

     

       79
       79
       -
                 options = "--delete-older-than 7d";

     

       80
       80
       -
                 interval.Weekday = 6;

     

       81
       81
       -
               };

     

       69
       69
       +
             gc = {

     

       70
       70
       +
               automatic = true;

     

       71
       71
       +
               options = "--delete-older-than 7d";

     

       72
       72
       +
               interval.Weekday = 6;

     

       73
       73
       +
             };

     

       82
       74
        
       

     

       83
       83
       -
               optimise.automatic = true;

     

       75
       75
       +
             optimise.automatic = true;

     

       84
       76
        
       

     

       85
       85
       -
               settings = {

     

       86
       86
       -
                 builders-use-substitutes = true;

     

       87
       87
       -
                 experimental-features = "nix-command flakes";

     

       88
       88
       -
                 trusted-users = ["root" "ovy"];

     

       89
       89
       -
               };

     

       77
       77
       +
             settings = {

     

       78
       78
       +
               builders-use-substitutes = true;

     

       79
       79
       +
               experimental-features = "nix-command flakes";

     

       80
       80
       +
               trusted-users = ["root" "ovy"];

     

       81
       81
       +
               sandbox = true;

     

       82
       82
       +
               warn-dirty = false;

     

       90
       83
        
             };

     

       91
       84
        
           };

     

       92
       92
       -
         }

     

       85
       85
       +
         };

     

       86
       86
       +
       }

-10

modules/ollama.nix

···

       1
       1
       -
       {delib, ...}:

     

       2
       2
       -
       delib.module {

     

       3
       3
       -
         name = "ollama";

     

       4
       4
       -
       

     

       5
       5
       -
         # nixos.always.services.ollama = {

     

       6
       6
       -
         #   enable = true;

     

       7
       7
       -
         #   acceleration = "rocm";

     

       8
       8
       -
         #   rocmOverrideGfx = "11.0.0";

     

       9
       9
       -
         # };

     

       10
       10
       -
       }

+9 -1

modules/plasma.nix

···

       27
       27
        
           environment.plasma6.excludePackages = with pkgs.kdePackages; [

     

       28
       28
        
             elisa

     

       29
       29
        
             gwenview

     

       30
       30
       +
             kate

     

       30
       31
        
             konsole

     

       32
       32
       +
             krunner

     

       31
       33
        
           ];

     

       32
       34
        
       

     

       33
       35
        
           qt = {

     
···

       38
       40
        
       

     

       39
       41
        
           # environment.sessionVariables."NIXOS_OZONE_WL" = 1;

     

       40
       42
        
           environment.sessionVariables."MOZ_ENABLE_WAYLAND" = 0;

     

       41
       41
       -
           environment.systemPackages = with pkgs; [adwaita-icon-theme kdePackages.kcalc kdePackages.partitionmanager kdePackages.kcolorchooser];

     

       43
       43
       +
           environment.systemPackages = with pkgs; [

     

       44
       44
       +
             adwaita-icon-theme

     

       45
       45
       +
             kdePackages.kcalc

     

       46
       46
       +
             kdePackages.partitionmanager

     

       47
       47
       +
             kdePackages.kcolorchooser

     

       48
       48
       +
             kdePackages.kdenlive

     

       49
       49
       +
           ];

     

       42
       50
        
       

     

       43
       51
        
           # TODO: move

     

       44
       52
        
           boot.plymouth = {

+1 -1

modules/programs/core-cli.nix

···

       65
       65
        
         home.always = {

     

       66
       66
        
           home.packages = with pkgs; [

     

       67
       67
        
             curlie

     

       68
       68
       -
             du-dust

     

       68
       68
       +
             dust

     

       69
       69
        
             duf

     

       70
       70
        
             fd

     

       71
       71
        
             jq

+8 -8

modules/programs/desktop-apps.nix

···

       12
       12
        
           home.packages = with pkgs; [

     

       13
       13
        
             alejandra

     

       14
       14
        
             audacity

     

       15
       15
       -
             blender

     

       15
       15
       +
             blender-hip

     

       16
       16
        
             btop # TODO: module & options

     

       17
       17
       -
             bruno

     

       18
       18
       -
             # davinci-resolve

     

       19
       19
       -
             # distrobox

     

       17
       17
       +
             # bruno

     

       18
       18
       +
             davinci-resolve

     

       19
       19
       +
             (discord.override {

     

       20
       20
       +
               withOpenASAR = true;

     

       21
       21
       +
               withVencord = true;

     

       22
       22
       +
             })

     

       20
       23
        
             gajim

     

       21
       24
        
             glaxnimate

     

       22
       25
        
             # godot_4

     
···

       28
       31
        
             lunacy

     

       29
       32
        
             lutris

     

       30
       33
        
             # mixxx

     

       31
       31
       -
             obs-studio

     

       32
       34
        
             obsidian

     

       33
       35
        
             oversteer

     

       34
       36
        
             p7zip

     
···

       44
       46
        
                 temurin-bin-17

     

       45
       47
        
               ];

     

       46
       48
        
             })

     

       49
       49
       +
             protonup-qt

     

       47
       50
        
             qbittorrent

     

       48
       51
        
             qimgv

     

       49
       52
        
             slack

     

       50
       50
       -
             vesktop

     

       51
       53
        
             vlc

     

       52
       54
        
             vorta

     

       53
       55
        
             winetricks

     

       54
       56
        
             yt-dlp

     

       55
       57
        
             yubioath-flutter

     

       56
       58
        
           ];

     

       57
       57
       -
       

     

       58
       58
       -
           services.owncloud-client.enable = true;

     

       59
       59
        
         };

     

       60
       60
        
       }

+12 -1

modules/programs/desktop-cli.nix

···

       1
       1
        
       {

     

       2
       2
        
         delib,

     

       3
       3
       +
         lib,

     

       3
       4
        
         pkgs,

     

       4
       5
        
         ...

     

       5
       6
        
       }:

     
···

       21
       22
        
           minisign

     

       22
       23
        
           mtr

     

       23
       24
        
           nix-output-monitor

     

       25
       25
       +
           opencode

     

       24
       26
        
           pgcli

     

       25
       27
        
           rage

     

       26
       28
        
           systemctl-tui

     
···

       31
       33
        
             enable = true;

     

       32
       34
        
             flake = "/etc/nixos";

     

       33
       35
        
           };

     

       36
       36
       +
       

     

       37
       37
       +
           environment.systemPackages = with pkgs.gst_all_1; [

     

       38
       38
       +
             gstreamer

     

       39
       39
       +
             gst-vaapi

     

       40
       40
       +
             gst-libav

     

       41
       41
       +
             gst-plugins-good

     

       42
       42
       +
             gst-plugins-ugly

     

       43
       43
       +
             gst-plugins-bad

     

       44
       44
       +
           ];

     

       34
       45
        
         };

     

       35
       46
        
       

     

       36
       47
        
         darwin.ifEnabled = {myconfig, ...}: {

     

       37
       37
       -
           environment.systemPackages = [pkgs.nh];

     

       48
       48
       +
           environment.systemPackages = with pkgs; [nh];

     

       38
       49
        
           environment.variables.NH_FLAKE = "/Users/${myconfig.constants.username}/.config/nix-darwin";

     

       39
       50
        
         };

     

       40
       51
        
       }

+3 -1

modules/programs/direnv.nix

···

       11
       11
        
           nix-direnv.enable = true;

     

       12
       12
        
           config.whitelist.prefix = [

     

       13
       13
        
             "${homeConfig.home.homeDirectory}/Projects/bots-gg"

     

       14
       14
       -
             "${homeConfig.home.homeDirectory}/Projects/dijit"

     

       15
       14
        
             "${homeConfig.home.homeDirectory}/Projects/personal"

     

       16
       15
        
             "${homeConfig.home.homeDirectory}/Projects/work"

     

       16
       16
       +
             "/Volumes/Developer/bots-gg"

     

       17
       17
       +
             "/Volumes/Developer/personal"

     

       18
       18
       +
             "/Volumes/Developer/work"

     

       17
       19
        
           ];

     

       18
       20
        
         };

     

       19
       21
        
       }

-16

modules/programs/firefox.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         delib,

     

       3
       3
       -
         pkgs,

     

       4
       4
       -
         inputs,

     

       5
       5
       -
         ...

     

       6
       6
       -
       }:

     

       7
       7
       -
       delib.module {

     

       8
       8
       -
         name = "programs.firefox";

     

       9
       9
       -
       

     

       10
       10
       -
         options = delib.singleEnableOption true;

     

       11
       11
       -
       

     

       12
       12
       -
         home.ifEnabled.programs.firefox = {

     

       13
       13
       -
           enable = true;

     

       14
       14
       -
           package = inputs.zen-browser.packages.${pkgs.system}.default;

     

       15
       15
       -
         };

     

       16
       16
       -
       }

+2 -2

modules/programs/fish.nix

···

       84
       84
        
                 owner = "PatrickF1";

     

       85
       85
        
                 repo = "fzf.fish";

     

       86
       86
        
                 rev = "8920367cf85eee5218cc25a11e209d46e2591e7a";

     

       87
       87
       -
                 hash = "sha256-lxQZo6APemNjt2c21IL7+uY3YVs81nuaRUL7NDMcB6s=";

     

       87
       87
       +
                 hash = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM=";

     

       88
       88
        
               };

     

       89
       89
        
             }

     

       90
       90
        
             {

     
···

       93
       93
        
                 owner = "gazorby";

     

       94
       94
        
                 repo = "fifc";

     

       95
       95
        
                 rev = "a01650cd432becdc6e36feeff5e8d657bd7ee84a";

     

       96
       96
       -
                 hash = "sha256-Nrart7WAh2VQhsDDe0EFI59TqvBO56US2MraqencxgE";

     

       96
       96
       +
                 hash = "sha256-Ynb0Yd5EMoz7tXwqF8NNKqCGbzTZn/CwLsZRQXIAVp4=";

     

       97
       97
        
               };

     

       98
       98
        
             }

     

       99
       99
        
             {

+17 -6

modules/programs/git.nix

···

       15
       15
        
       

     

       16
       16
        
           programs.git = {

     

       17
       17
        
             enable = true;

     

       18
       18
       -
             userName = userfullname;

     

       19
       19
       -
             userEmail = useremail;

     

       20
       20
       -
             delta.enable = true;

     

       21
       18
        
       

     

       22
       19
        
             signing = {

     

       23
       20
        
               signByDefault = true;

     
···

       25
       22
        
               key = "~/.ssh/id_ed25519_sk_rk";

     

       26
       23
        
             };

     

       27
       24
        
       

     

       28
       28
       -
             extraConfig = {

     

       25
       25
       +
             settings = {

     

       26
       26
       +
               user = {

     

       27
       27
       +
                 name = userfullname;

     

       28
       28
       +
                 email = useremail;

     

       29
       29
       +
               };

     

       30
       30
       +
       

     

       29
       31
        
               # TODO: custom pretty stuff?

     

       30
       32
        
               blame.showEmail = true;

     

       31
       33
        
               init.defaultBranch = "main";

     
···

       89
       91
        
                 default-command = "log";

     

       90
       92
        
                 show-cryptographic-signatures = true;

     

       91
       93
        
                 conflict-marker-style = "git";

     

       92
       92
       -
                 diff-formatter = "delta";

     

       94
       94
       +
                 # diff-formatter = "delta";

     

       93
       95
        
                 editor = "codium -w";

     

       94
       96
        
                 merge-editor = "vscodium";

     

       95
       97
        
               };

     
···

       98
       100
        
                 "closest_bookmark(to)" = "heads(::to & bookmarks())";

     

       99
       101
        
                 "p(n)" = "p(@, n)";

     

       100
       102
        
                 "p(r, n)" = "roots(r | ancestors(r-, n))";

     

       103
       103
       +
                 "tail()" = "tail(@)";

     

       104
       104
       +
                 "tail(h)" = "roots(trunk()..h)";

     

       101
       105
        
               };

     

       102
       106
        
       

     

       103
       107
        
               aliases = {

     
···

       117
       121
        
       

     

       118
       122
        
               git = {

     

       119
       123
        
                 sign-on-push = true;

     

       120
       120
       -
                 push-new-bookmarks = true;

     

       121
       124
        
                 write-change-id-header = true;

     

       122
       125
        
               };

     

       123
       126
        
       

     
···

       127
       130
        
                 key = "~/.ssh/id_ed25519_sk_rk.pub";

     

       128
       131
        
                 backends.ssh.allowed-signers = "~/.config/git/allowed_signers";

     

       129
       132
        
               };

     

       133
       133
       +
       

     

       134
       134
       +
               remotes.origin.auto-track-bookmarks = "glob:*";

     

       130
       135
        
             };

     

       136
       136
       +
           };

     

       137
       137
       +
       

     

       138
       138
       +
           programs.delta = {

     

       139
       139
       +
             enable = true;

     

       140
       140
       +
             enableGitIntegration = true;

     

       141
       141
       +
             enableJujutsuIntegration = true;

     

       131
       142
        
           };

     

       132
       143
        
       

     

       133
       144
        
           programs.mergiraf.enable = true;

+1 -1

modules/programs/kitty.nix

···

       14
       14
        
             cursor_shape = "block";

     

       15
       15
        
             cursor_shape_unfocused = "hollow";

     

       16
       16
        
             scrollback_lines = 10000;

     

       17
       17
       -
             scrollback_pager = "moar +INPUT_LINE_NUMBER";

     

       17
       17
       +
             scrollback_pager = "moor +INPUT_LINE_NUMBER";

     

       18
       18
        
             scrollback_pager_history_size = 5;

     

       19
       19
        
             window_padding_width = 8;

     

       20
       20
        
             hide_window_decorations = true;

+20

modules/programs/obs-studio.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         delib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       delib.module {

     

       7
       7
       +
         name = "programs.obs-studio";

     

       8
       8
       +
       

     

       9
       9
       +
         options = delib.singleEnableOption true;

     

       10
       10
       +
       

     

       11
       11
       +
         nixos.ifEnabled.programs.obs-studio = {

     

       12
       12
       +
           enable = true;

     

       13
       13
       +
           plugins = with pkgs.obs-studio-plugins; [

     

       14
       14
       +
             obs-vaapi

     

       15
       15
       +
             obs-gstreamer

     

       16
       16
       +
             obs-vkcapture

     

       17
       17
       +
             obs-pipewire-audio-capture

     

       18
       18
       +
           ];

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+38

modules/programs/opencloud.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         delib,

     

       3
       3
       +
         homeConfig,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }: let

     

       7
       7
       +
         system = pkgs.stdenv.hostPlatform.system;

     

       8
       8
       +
       in

     

       9
       9
       +
         delib.module {

     

       10
       10
       +
           name = "programs.opencloud";

     

       11
       11
       +
       

     

       12
       12
       +
           options = delib.singleEnableOption true;

     

       13
       13
       +
       

     

       14
       14
       +
           home.ifEnabled = pkgs.lib.optionalAttrs (system == "x86_64-linux") {

     

       15
       15
       +
             home.packages = [pkgs.opencloud-desktop];

     

       16
       16
       +
       

     

       17
       17
       +
             systemd.user.services.opencloud-client = {

     

       18
       18
       +
               Unit = {

     

       19
       19
       +
                 Description = "OpenCloud Client";

     

       20
       20
       +
                 After = ["graphical-session.target"];

     

       21
       21
       +
                 PartOf = ["graphical-session.target"];

     

       22
       22
       +
               };

     

       23
       23
       +
       

     

       24
       24
       +
               Service = {

     

       25
       25
       +
                 Environment = ["PATH=${homeConfig.home.profileDirectory}/bin"];

     

       26
       26
       +
                 ExecStart = "${pkgs.opencloud-desktop}/bin/opencloud";

     

       27
       27
       +
               };

     

       28
       28
       +
       

     

       29
       29
       +
               Install = {

     

       30
       30
       +
                 WantedBy = ["graphical-session.target"];

     

       31
       31
       +
               };

     

       32
       32
       +
             };

     

       33
       33
       +
           };

     

       34
       34
       +
       

     

       35
       35
       +
           darwin.ifEnabled = {

     

       36
       36
       +
             homebrew.casks = ["opencloud"];

     

       37
       37
       +
           };

     

       38
       38
       +
         }

+3 -3

modules/programs/pager.nix

···

       8
       8
        
       

     

       9
       9
        
         # TODO: read docs and experiment

     

       10
       10
        
         home.always = {

     

       11
       11
       -
           home.packages = [pkgs.moar];

     

       11
       11
       +
           home.packages = [pkgs.moor];

     

       12
       12
        
           home.sessionVariables = {

     

       13
       13
       -
             PAGER = "moar";

     

       14
       14
       -
             MOAR = "--no-linenumbers";

     

       13
       13
       +
             PAGER = "moor";

     

       14
       14
       +
             MOOR = "--no-linenumbers";

     

       15
       15
        
             MANPAGER = "sh -c 'col -bx | bat -l man -p'";

     

       16
       16
        
             MANROFFOPT = "-c";

     

       17
       17
        
           };

+2

modules/programs/ssh.nix

···

       4
       4
        
       

     

       5
       5
        
         home.always.programs.ssh = {

     

       6
       6
        
           enable = true;

     

       7
       7
       +
           enableDefaultConfig = false;

     

       8
       8
       +
       

     

       7
       9
        
           matchBlocks = {

     

       8
       10
        
             "*" = {

     

       9
       11
        
               identitiesOnly = true;

+4 -1

modules/programs/vscode.nix

···

       22
       22
        
               enableExtensionUpdateCheck = false;

     

       23
       23
        
       

     

       24
       24
        
               extensions = let

     

       25
       25
       -
                 vscode-extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system};

     

       25
       25
       +
                 system = pkgs.stdenv.hostPlatform.system;

     

       26
       26
       +
                 vscode-extensions = inputs.nix-vscode-extensions.extensions.${system};

     

       26
       27
        
                 inherit (vscode-extensions) open-vsx vscode-marketplace;

     

       27
       28
        
               in

     

       28
       29
        
                 with open-vsx; [

     
···

       98
       99
        
                 "editor.defaultFormatter" = "esbenp.prettier-vscode";

     

       99
       100
        
                 "[elixir]"."editor.defaultFormatter" = "JakeBecker.elixir-ls";

     

       100
       101
        
                 "[nix]"."editor.defaultFormatter" = "kamadorueda.alejandra";

     

       102
       102
       +
                 "[phoenix-heex]"."editor.defaultFormatter" = "JakeBecker.elixir-ls";

     

       101
       103
        
                 "[prisma]"."editor.defaultFormatter" = "Prisma.prisma";

     

       102
       104
        
                 "[python]"."editor.defaultFormatter" = "ms-python.python";

     

       103
       105
        
                 "[rust]"."editor.defaultFormatter" = "rust-lang.rust-analyzer";

     
···

       150
       152
        
                 ];

     

       151
       153
        
                 # "prettier.prettierPath" = "prettierd";

     

       152
       154
        
                 "prettier.proseWrap" = "always";

     

       155
       155
       +
                 "chat.disableAIFeatures" = true;

     

       153
       156
        
       

     

       154
       157
        
                 # Pretties

     

       155
       158
        
                 "workbench.colorTheme" = "Dolch";

Compare changes