comparing dd3b593eb009b6ba43adb035a88a327494672c77 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
        
                 ],

+53 -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
        
               ],

     
···

       13
       15
        
               "pre-commit-hooks": "pre-commit-hooks"

     

       14
       16
        
             },

     

       15
       17
        
             "locked": {

     

       16
       16
       -
               "lastModified": 1755848673,

     

       17
       17
       -
               "narHash": "sha256-DIqMRjWVJCNwAhNVWIncDpd6WhsPc5/6h/Q0NcuqXaM=",

     

       18
       18
       +
               "lastModified": 1758123851,

     

       19
       19
       +
               "narHash": "sha256-sbKwqBOLI423TvXvzlX2UGZR4pE1M8C7KXi0699ImmQ=",

     

       18
       20
        
               "owner": "yunfachi",

     

       19
       21
        
               "repo": "denix",

     

       20
       20
       -
               "rev": "e90b6708864578c6c39b67eb6c1858c7511b0be6",

     

       22
       22
       +
               "rev": "d90f816b7b93304e5d5e69d429de0052f64d5149",

     

       21
       23
        
               "type": "github"

     

       22
       24
        
             },

     

       23
       25
        
             "original": {

     
···

       78
       80
        
               "type": "github"

     

       79
       81
        
             }

     

       80
       82
        
           },

     

       81
       81
       -
           "flake-utils_3": {

     

       82
       82
       -
             "inputs": {

     

       83
       83
       -
               "systems": "systems_3"

     

       84
       84
       -
             },

     

       85
       85
       -
             "locked": {

     

       86
       86
       -
               "lastModified": 1731533236,

     

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

     

       88
       88
       -
               "owner": "numtide",

     

       89
       89
       -
               "repo": "flake-utils",

     

       90
       90
       -
               "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",

     

       91
       91
       -
               "type": "github"

     

       92
       92
       -
             },

     

       93
       93
       -
             "original": {

     

       94
       94
       -
               "owner": "numtide",

     

       95
       95
       -
               "repo": "flake-utils",

     

       96
       96
       -
               "type": "github"

     

       97
       97
       -
             }

     

       98
       98
       -
           },

     

       99
       83
        
           "flakey-profile": {

     

       100
       84
        
             "locked": {

     

       101
       85
        
               "lastModified": 1712898590,

     
···

       140
       124
        
               ]

     

       141
       125
        
             },

     

       142
       126
        
             "locked": {

     

       143
       143
       -
               "lastModified": 1755810213,

     

       144
       144
       -
               "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=",

     

       127
       127
       +
               "lastModified": 1765480374,

     

       128
       128
       +
               "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=",

     

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

     

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

     

       147
       147
       -
               "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa",

     

       131
       131
       +
               "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3",

     

       148
       132
        
               "type": "github"

     

       149
       133
        
             },

     

       150
       134
        
             "original": {

     
···

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

     

       222
       206
        
             },

     

       223
       207
        
             "locked": {

     

       224
       224
       -
               "lastModified": 1755882102,

     

       225
       225
       -
               "narHash": "sha256-K6+vEy7SmUoGgllnbAdP+gm4pHYwYgYdYPfBG5nLE14=",

     

       208
       208
       +
               "lastModified": 1765528203,

     

       209
       209
       +
               "narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=",

     

       226
       210
        
               "owner": "sodiboo",

     

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

     

       228
       228
       -
               "rev": "8f3d1a85544b7e8d1fe577c01e32398fb47841e1",

     

       212
       212
       +
               "rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3",

     

       229
       213
        
               "type": "github"

     

       230
       214
        
             },

     

       231
       215
        
             "original": {

     
···

       237
       221
        
           "niri-stable": {

     

       238
       222
        
             "flake": false,

     

       239
       223
        
             "locked": {

     

       240
       240
       -
               "lastModified": 1748151941,

     

       241
       241
       -
               "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",

     

       224
       224
       +
               "lastModified": 1756556321,

     

       225
       225
       +
               "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",

     

       242
       226
        
               "owner": "YaLTeR",

     

       243
       227
        
               "repo": "niri",

     

       244
       244
       -
               "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",

     

       228
       228
       +
               "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",

     

       245
       229
        
               "type": "github"

     

       246
       230
        
             },

     

       247
       231
        
             "original": {

     

       248
       232
        
               "owner": "YaLTeR",

     

       249
       249
       -
               "ref": "v25.05.1",

     

       233
       233
       +
               "ref": "v25.08",

     

       250
       234
        
               "repo": "niri",

     

       251
       235
        
               "type": "github"

     

       252
       236
        
             }

     
···

       254
       238
        
           "niri-unstable": {

     

       255
       239
        
             "flake": false,

     

       256
       240
        
             "locked": {

     

       257
       257
       -
               "lastModified": 1755879086,

     

       258
       258
       -
               "narHash": "sha256-fUQ1iuR2/7UrHQ7LXRJ8a2DahcyTard4WvL/wQ18SII=",

     

       241
       241
       +
               "lastModified": 1765524373,

     

       242
       242
       +
               "narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=",

     

       259
       243
        
               "owner": "YaLTeR",

     

       260
       244
        
               "repo": "niri",

     

       261
       261
       -
               "rev": "2865ec3e47fa0b170f82f4beeefa56a5ea49d133",

     

       245
       245
       +
               "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743",

     

       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=",

     

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

     

       261
       261
       +
               "lastModified": 1765065051,

     

       262
       262
       +
               "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=",

     

       263
       263
       +
               "owner": "LnL7",

     

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

     

       282
       282
       -
               "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",

     

       265
       265
       +
               "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79",

     

       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": 1755825449,

     

       299
       299
       -
               "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=",

     

       300
       300
       -
               "owner": "LnL7",

     

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

     

       302
       302
       -
               "rev": "8df64f819698c1fee0c2969696f54a843b2231e8",

     

       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": 1755404379,

     

       319
       319
       -
               "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=",

     

       281
       281
       +
               "lastModified": 1765267181,

     

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

     

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

     

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

     

       322
       322
       -
               "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3",

     

       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": 1755827962,

     

       338
       338
       -
               "narHash": "sha256-qY4UcgSy60Urcwp+fdWCasueERzZo5foMVMwIVEEzts=",

     

       299
       299
       +
               "lastModified": 1765505053,

     

       300
       300
       +
               "narHash": "sha256-nDMsy5cVXs4iShqoLt8gCz/s1LdVxsaUFsTuSY/22rg=",

     

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

     

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

     

       341
       341
       -
               "rev": "55b18afeadde679c876620d9dbc7e01a4f4dbb77",

     

       303
       303
       +
               "rev": "1778f178603ed65b4e4033c64f04ea51142ad6f6",

     

       342
       304
        
               "type": "github"

     

       343
       305
        
             },

     

       344
       306
        
             "original": {

     
···

       380
       342
        
           },

     

       381
       343
        
           "nixpkgs-stable": {

     

       382
       344
        
             "locked": {

     

       383
       383
       -
               "lastModified": 1755704039,

     

       384
       384
       -
               "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=",

     

       345
       345
       +
               "lastModified": 1765311797,

     

       346
       346
       +
               "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",

     

       385
       347
        
               "owner": "NixOS",

     

       386
       348
        
               "repo": "nixpkgs",

     

       387
       387
       -
               "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545",

     

       349
       349
       +
               "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",

     

       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",

     

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

     

       393
       356
        
               "repo": "nixpkgs",

     

       394
       357
        
               "type": "github"

     

       395
       358
        
             }

     

       396
       359
        
           },

     

       397
       360
        
           "nixpkgs_2": {

     

       398
       361
        
             "locked": {

     

       399
       399
       -
               "lastModified": 1744868846,

     

       400
       400
       -
               "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",

     

       401
       401
       -
               "owner": "NixOS",

     

       362
       362
       +
               "lastModified": 1759770925,

     

       363
       363
       +
               "narHash": "sha256-CZwkCtzTNclqlhuwDsVtGoRumTpqCUK0xSnFIMgd8ls=",

     

       364
       364
       +
               "owner": "nixos",

     

       402
       365
        
               "repo": "nixpkgs",

     

       403
       403
       -
               "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",

     

       366
       366
       +
               "rev": "674c2b09c59a220204350ced584cadaacee30038",

     

       404
       367
        
               "type": "github"

     

       405
       368
        
             },

     

       406
       369
        
             "original": {

     

       407
       407
       -
               "owner": "NixOS",

     

       370
       370
       +
               "owner": "nixos",

     

       408
       371
        
               "repo": "nixpkgs",

     

       409
       409
       -
               "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",

     

       372
       372
       +
               "rev": "674c2b09c59a220204350ced584cadaacee30038",

     

       410
       373
        
               "type": "github"

     

       411
       374
        
             }

     

       412
       375
        
           },

     

       413
       376
        
           "nixpkgs_3": {

     

       414
       377
        
             "locked": {

     

       415
       415
       -
               "lastModified": 1755615617,

     

       416
       416
       -
               "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",

     

       378
       378
       +
               "lastModified": 1765186076,

     

       379
       379
       +
               "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",

     

       417
       380
        
               "owner": "nixos",

     

       418
       381
        
               "repo": "nixpkgs",

     

       419
       419
       -
               "rev": "20075955deac2583bb12f07151c2df830ef346b4",

     

       382
       382
       +
               "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",

     

       420
       383
        
               "type": "github"

     

       421
       384
        
             },

     

       422
       385
        
             "original": {

     
···

       453
       416
        
               "iosevka-solai": "iosevka-solai",

     

       454
       417
        
               "lix-module": "lix-module",

     

       455
       418
        
               "niri-flake": "niri-flake",

     

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

     

       419
       419
       +
               "nix-darwin": "nix-darwin",

     

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

     

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

     

       459
       422
        
               "nixpkgs": "nixpkgs_3",

     
···

       490
       453
        
               "type": "github"

     

       491
       454
        
             }

     

       492
       455
        
           },

     

       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
       456
        
           "xwayland-satellite-stable": {

     

       509
       457
        
             "flake": false,

     

       510
       458
        
             "locked": {

     
···

       525
       473
        
           "xwayland-satellite-unstable": {

     

       526
       474
        
             "flake": false,

     

       527
       475
        
             "locked": {

     

       528
       528
       -
               "lastModified": 1755491097,

     

       529
       529
       -
               "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",

     

       476
       476
       +
               "lastModified": 1765343581,

     

       477
       477
       +
               "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=",

     

       530
       478
        
               "owner": "Supreeeme",

     

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

     

       532
       532
       -
               "rev": "388d291e82ffbc73be18169d39470f340707edaa",

     

       480
       480
       +
               "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95",

     

       533
       481
        
               "type": "github"

     

       534
       482
        
             },

     

       535
       483
        
             "original": {

     
···

       545
       493
        
               ]

     

       546
       494
        
             },

     

       547
       495
        
             "locked": {

     

       548
       548
       -
               "lastModified": 1754886070,

     

       549
       549
       -
               "narHash": "sha256-MZDmxOkVKL1HY72bliN8Gxh0SYkHUa3W/1fTU2ke36I=",

     

       496
       496
       +
               "lastModified": 1764648680,

     

       497
       497
       +
               "narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=",

     

       498
       498
       +
               "lastModified": 1764648680,

     

       499
       499
       +
               "narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=",

     

       550
       500
        
               "owner": "youwen5",

     

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

     

       552
       552
       -
               "rev": "e37d2b326311320c8571111b3ef89b29d26d4b64",

     

       502
       502
       +
               "rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20",

     

       503
       503
       +
               "rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20",

     

       553
       504
        
               "type": "github"

     

       554
       505
        
             },

     

       555
       506
        
             "original": {

+18 -28

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
        
       

     
···

       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 {};

     

       82
       82
       +
           });

     

       81
       83
        
       

     

       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
       -
           };

     

       89
       89
       -
       

     

       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;

+3 -1

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";

     
···

       16
       17
        
             nixpkgs.hostPlatform = platform;

     

       17
       18
        
             system.stateVersion = stateVersion;

     

       18
       19
        
       

     

       19
       19
       -
             hardware.enableRedistributableFirmware = true;

     

       20
       20
       +
             hardware.enableAllFirmware = true;

     

       20
       21
        
             hardware.cpu.amd.updateMicrocode = true;

     

       21
       22
        
       

     

       22
       23
        
             # Kernel

     
···

       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
        
           };

+10 -10

modules/bluetooth.nix

···

       11
       11
        
         nixos.ifEnabled = {

     

       12
       12
        
           hardware.bluetooth.enable = true;

     

       13
       13
        
           # TODO: determine if this actually affected me. Maybe should yeet.

     

       14
       14
       -
           hardware.bluetooth.settings = {

     

       15
       15
       -
             # Try and reduce latency from Xbox Series controllers

     

       16
       16
       -
             # https://atar-axis.github.io/xpadneo#high-latency-or-lost-button-events-with-bluetooth-le

     

       17
       17
       -
             LE = {

     

       18
       18
       -
               MinConnectionInterval = 7;

     

       19
       19
       -
               MaxConnectionInterval = 9;

     

       20
       20
       -
               ConnectionLatency = 0;

     

       21
       21
       -
             };

     

       22
       22
       -
           };

     

       23
       23
       -
           hardware.xpadneo.enable = true;

     

       14
       14
       +
           # hardware.bluetooth.settings = {

     

       15
       15
       +
           #   # Try and reduce latency from Xbox Series controllers

     

       16
       16
       +
           #   # https://atar-axis.github.io/xpadneo#high-latency-or-lost-button-events-with-bluetooth-le

     

       17
       17
       +
           #   LE = {

     

       18
       18
       +
           #     MinConnectionInterval = 7;

     

       19
       19
       +
           #     MaxConnectionInterval = 9;

     

       20
       20
       +
           #     ConnectionLatency = 0;

     

       21
       21
       +
           #   };

     

       22
       22
       +
           # };

     

       23
       23
       +
           # hardware.xpadneo.enable = true;

     

       24
       24
        
           environment.systemPackages = [pkgs.kdePackages.bluedevil];

     

       25
       25
        
         };

     

       26
       26
        
       }

+2 -1

modules/darwin/homebrew.nix

···

       38
       38
        
             # Actually searches symlinks for apps, compared to Alfred.

     

       39
       39
        
             "raycast"

     

       40
       40
        
             "swiftformat-for-xcode"

     

       41
       41
       +
             "tailscale-app"

     

       41
       42
        
             # "vorta"

     

       43
       43
       +
             "vesktop"

     

       42
       44
        
             "zen"

     

       43
       45
        
           ];

     

       44
       46
        
       

     
···

       46
       48
        
             Keka = 470158793;

     

       47
       49
        
             "Yubico Authenticator" = 1497506650;

     

       48
       50
        
             "System Color Picker" = 1545870783;

     

       49
       49
       -
             Tailscale = 1475387142;

     

       50
       51
        
           };

     

       51
       52
        
         };

     

       52
       53
        
       }

+8

modules/darwin/system.nix

···

       1
       1
       +
       {delib, ...}:

     

       2
       2
       +
       delib.module {

     

       3
       3
       +
         name = "darwin.system";

     

       4
       4
       +
       

     

       5
       5
       +
         darwin.always = {

     

       6
       6
       +
           system.primaryUser = "ovy";

     

       7
       7
       +
         };

     

       8
       8
       +
       }

+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

+5 -1

modules/graphics.nix

···

       15
       15
        
             enable = true;

     

       16
       16
        
             enable32Bit = true;

     

       17
       17
        
           };

     

       18
       18
       +
           hardware.amdgpu = {

     

       19
       19
       +
             initrd.enable = true;

     

       20
       20
       +
             opencl.enable = true;

     

       21
       21
       +
           };

     

       18
       22
        
       

     

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

     

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

     

       20
       24
        
       

     

       21
       25
        
           systemd.services.lactd = {

     

       22
       26
        
             description = "AMDGPU Control Daemon";

-11

modules/logitech.nix

···

       1
       1
       -
       {delib, ...}:

     

       2
       2
       -
       delib.module {

     

       3
       3
       -
         name = "logitech";

     

       4
       4
       -
       

     

       5
       5
       -
         options = delib.singleEnableOption true;

     

       6
       6
       -
       

     

       7
       7
       -
         nixos.ifEnabled = {

     

       8
       8
       -
           hardware.logitech.wireless.enable = true;

     

       9
       9
       -
           hardware.new-lg4ff.enable = true;

     

       10
       10
       -
         };

     

       11
       11
       -
       }

-6

modules/networking.nix

···

       39
       39
        
             # dnsovertls = "trues";

     

       40
       40
        
           };

     

       41
       41
        
       

     

       42
       42
       -
           services.tailscale = {

     

       43
       43
       -
             enable = true;

     

       44
       44
       -
             openFirewall = true;

     

       45
       45
       -
             useRoutingFeatures = "client";

     

       46
       46
       -
           };

     

       47
       47
       -
       

     

       48
       42
        
           # services.mullvad-vpn.enable = true;

     

       49
       43
        
           # services.mullvad-vpn.package = pkgs.mullvad-vpn;

     

       50
       44

+67 -66

modules/nix.nix

···

       2
       2
        
         delib,

     

       3
       3
        
         inputs,

     

       4
       4
        
         ...

     

       5
       5
       -
       }: let

     

       6
       6
       -
         shared = {

     

       5
       5
       +
       }:

     

       6
       6
       +
       delib.module {

     

       7
       7
       +
         name = "nix";

     

       8
       8
       +
       

     

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

     

       10
       10
       +
         home.always = {

     

       7
       11
        
           nixpkgs.config = import ../files/nixpkgs-config.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
       -
           };

     

       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
       25
       -
           nixos.always =

     

       26
       26
       -
             shared

     

       27
       27
       -
             // {

     

       28
       28
       -
               nix = {

     

       29
       29
       -
                 gc = {

     

       30
       30
       -
                   automatic = true;

     

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

     

       32
       32
       -
                   dates = "weekly";

     

       33
       33
       -
                 };

     

       34
       24
        
       

     

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

     

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

     

       36
       26
        
       

     

       37
       37
       -
                 registry.nixpkgs.to = {

     

       38
       38
       -
                   type = "path";

     

       39
       39
       -
                   path = inputs.nixpkgs;

     

       40
       40
       -
                   narHash = inputs.nixpkgs.narHash;

     

       41
       41
       -
                 };

     

       42
       42
       -
               };

     

       27
       27
       +
             registry.nixpkgs.to = {

     

       28
       28
       +
               type = "path";

     

       29
       29
       +
               path = inputs.nixpkgs;

     

       30
       30
       +
               narHash = inputs.nixpkgs.narHash;

     

       31
       31
       +
             };

     

       43
       32
        
       

     

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

     

       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;

     

       45
       38
        
             };

     

       39
       39
       +
           };

     

       46
       40
        
       

     

       47
       47
       -
           darwin.always = {

     

       48
       48
       -
             nix = {

     

       49
       49
       -
               buildMachines = [

     

       50
       50
       -
                 {

     

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

     

       52
       52
       -
                   sshUser = "colmena-deploy";

     

       53
       53
       -
                   system = "x86_64-linux";

     

       54
       54
       -
                   speedFactor = 2;

     

       55
       55
       -
                   maxJobs = 6;

     

       56
       56
       -
                   protocol = "ssh-ng";

     

       57
       57
       -
                 }

     

       58
       58
       -
                 {

     

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

     

       60
       60
       -
                   sshUser = "colmena-deploy";

     

       61
       61
       -
                   system = "aarch64-linux";

     

       62
       62
       -
                   speedFactor = 1;

     

       63
       63
       -
                   maxJobs = 2;

     

       64
       64
       -
                   protocol = "ssh-ng";

     

       65
       65
       -
                 }

     

       66
       66
       -
               ];

     

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

     

       42
       42
       +
         };

     

       43
       43
       +
       

     

       44
       44
       +
         darwin.always = {

     

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

     

       46
       46
       +
       

     

       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
       +
             ];

     

       67
       66
        
       

     

       68
       68
       -
               distributedBuilds = true;

     

       67
       67
       +
             distributedBuilds = true;

     

       69
       68
        
       

     

       70
       70
       -
               gc = {

     

       71
       71
       -
                 automatic = true;

     

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

     

       73
       73
       -
                 interval.Weekday = 6;

     

       74
       74
       -
               };

     

       69
       69
       +
             gc = {

     

       70
       70
       +
               automatic = true;

     

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

     

       72
       72
       +
               interval.Weekday = 6;

     

       73
       73
       +
             };

     

       75
       74
        
       

     

       76
       76
       -
               optimise.automatic = true;

     

       75
       75
       +
             optimise.automatic = true;

     

       77
       76
        
       

     

       78
       78
       -
               settings = {

     

       79
       79
       -
                 builders-use-substitutes = true;

     

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

     

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

     

       82
       82
       -
               };

     

       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;

     

       83
       83
        
             };

     

       84
       84
        
           };

     

       85
       85
       -
         }

     

       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 -2

modules/programs/core-cli.nix

···

       18
       18
        
             openssh

     

       19
       19
        
             p7zip

     

       20
       20
        
             pciutils

     

       21
       21
       -
             solaar

     

       22
       21
        
             sysstat

     

       23
       22
        
             unar

     

       24
       23
        
             wget

     
···

       66
       65
        
         home.always = {

     

       67
       66
        
           home.packages = with pkgs; [

     

       68
       67
        
             curlie

     

       69
       69
       -
             du-dust

     

       68
       68
       +
             dust

     

       70
       69
        
             duf

     

       71
       70
        
             fd

     

       72
       71
        
             jq

+25 -5

modules/programs/desktop-apps.nix

···

       1
       1
        
       {

     

       2
       2
        
         delib,

     

       3
       3
        
         pkgs,

     

       4
       4
       +
         homeConfig,

     

       4
       5
        
         ...

     

       5
       6
        
       }:

     

       6
       7
        
       delib.module {

     
···

       15
       16
        
             blender

     

       16
       17
        
             btop # TODO: module & options

     

       17
       18
        
             bruno

     

       18
       18
       -
             # davinci-resolve

     

       19
       19
       -
             # distrobox

     

       19
       19
       +
             davinci-resolve

     

       20
       20
       +
             (discord.override {

     

       21
       21
       +
               withOpenASAR = true;

     

       22
       22
       +
               withVencord = true;

     

       23
       23
       +
             })

     

       20
       24
        
             gajim

     

       21
       25
        
             glaxnimate

     

       22
       26
        
             # godot_4

     
···

       28
       32
        
             lunacy

     

       29
       33
        
             lutris

     

       30
       34
        
             # mixxx

     

       31
       31
       -
             obs-studio

     

       32
       35
        
             obsidian

     

       36
       36
       +
             opencloud-desktop

     

       33
       37
        
             oversteer

     

       34
       38
        
             p7zip

     

       35
       39
        
             picard

     
···

       44
       48
        
                 temurin-bin-17

     

       45
       49
        
               ];

     

       46
       50
        
             })

     

       51
       51
       +
             protonup-qt

     

       47
       52
        
             qbittorrent

     

       48
       53
        
             qimgv

     

       49
       54
        
             slack

     

       50
       50
       -
             vesktop

     

       55
       55
       +
             # vesktop

     

       51
       56
        
             vlc

     

       52
       57
        
             vorta

     

       53
       58
        
             winetricks

     
···

       55
       60
        
             yubioath-flutter

     

       56
       61
        
           ];

     

       57
       62
        
       

     

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

     

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

     

       64
       64
       +
             Unit = {

     

       65
       65
       +
               Description = "OpenCloud Client";

     

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

     

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

     

       68
       68
       +
             };

     

       69
       69
       +
       

     

       70
       70
       +
             Service = {

     

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

     

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

     

       73
       73
       +
             };

     

       74
       74
       +
       

     

       75
       75
       +
             Install = {

     

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

     

       77
       77
       +
             };

     

       78
       78
       +
           };

     

       59
       79
        
         };

     

       60
       80
        
       }

+31 -19

modules/programs/desktop-cli.nix

···

       1
       1
        
       {

     

       2
       2
        
         delib,

     

       3
       3
       +
         lib,

     

       3
       4
        
         pkgs,

     

       4
       5
        
         ...

     

       5
       6
        
       }:

     
···

       8
       9
        
       

     

       9
       10
        
         options = delib.singleEnableOption true;

     

       10
       11
        
       

     

       11
       11
       -
         home.ifEnabled.home.packages = with pkgs; [

     

       12
       12
       -
           age-plugin-yubikey

     

       13
       13
       -
           alejandra

     

       14
       14
       -
           cachix

     

       15
       15
       -
           fastfetch

     

       16
       16
       -
           hexyl

     

       17
       17
       -
           lazydocker

     

       18
       18
       -
           macchina

     

       19
       19
       -
           minio-client

     

       20
       20
       -
           mix2nix

     

       21
       21
       -
           minisign

     

       22
       22
       -
           mtr

     

       23
       23
       -
           nix-output-monitor

     

       24
       24
       -
           pgcli

     

       25
       25
       -
           rage

     

       26
       26
       -
           systemctl-tui

     

       27
       27
       -
         ];

     

       12
       12
       +
         home.ifEnabled.home.packages = with pkgs;

     

       13
       13
       +
           [

     

       14
       14
       +
             age-plugin-yubikey

     

       15
       15
       +
             alejandra

     

       16
       16
       +
             cachix

     

       17
       17
       +
             fastfetch

     

       18
       18
       +
             hexyl

     

       19
       19
       +
             lazydocker

     

       20
       20
       +
             macchina

     

       21
       21
       +
             minio-client

     

       22
       22
       +
             mix2nix

     

       23
       23
       +
             minisign

     

       24
       24
       +
             mtr

     

       25
       25
       +
             nix-output-monitor

     

       26
       26
       +
             pgcli

     

       27
       27
       +
             rage

     

       28
       28
       +
             systemctl-tui

     

       29
       29
       +
           ]

     

       30
       30
       +
           ++ (lib.optional pkgs.stdenv.isLinux [pkgs.claude-code pkgs.claude-code-router]);

     

       28
       31
        
       

     

       29
       32
        
         nixos.ifEnabled = {myconfig, ...}: {

     

       30
       33
        
           programs.nh = {

     

       31
       34
        
             enable = true;

     

       32
       32
       -
             flake = "/home/${myconfig.constants.username}/.config/nixos";

     

       35
       35
       +
             flake = "/etc/nixos";

     

       33
       36
        
           };

     

       37
       37
       +
       

     

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

     

       39
       39
       +
             gstreamer

     

       40
       40
       +
             gst-vaapi

     

       41
       41
       +
             gst-libav

     

       42
       42
       +
             gst-plugins-good

     

       43
       43
       +
             gst-plugins-ugly

     

       44
       44
       +
             gst-plugins-bad

     

       45
       45
       +
           ];

     

       34
       46
        
         };

     

       35
       47
        
       

     

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

     

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

     

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

     

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

     

       39
       51
        
         };

     

       40
       52
        
       }

-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
        
             {

+25 -7

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";

     

       95
       95
       +
                 editor = "codium -w";

     

       96
       96
       +
                 merge-editor = "vscodium";

     

       93
       97
        
               };

     

       94
       98
        
       

     

       95
       99
        
               revset-aliases = {

     

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

     

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

     

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

     

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

     

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

     

       99
       105
        
               };

     

       100
       106
        
       

     

       101
       107
        
               aliases = {

     

       102
       102
       -
                 tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];

     

       103
       108
        
                 e = ["edit"];

     

       104
       109
        
                 n = ["new"];

     

       110
       110
       +
                 tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];

     

       111
       111
       +
                 tug-here = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "@"];

     

       112
       112
       +
                 solve = ["resolve" "--tool" "mergiraf"];

     

       105
       113
        
               };

     

       106
       114
        
       

     

       107
       115
        
               merge-tools.mergiraf = {

     

       108
       116
        
                 program = "mergiraf";

     

       109
       117
        
                 merge-args = ["merge" "$base" "$left" "$right" "-o" "$output"];

     

       118
       118
       +
                 merge-conflict-exit-codes = [1];

     

       119
       119
       +
                 conflict-marker-style = "git";

     

       110
       120
        
               };

     

       111
       121
        
       

     

       112
       122
        
               git = {

     

       113
       123
        
                 sign-on-push = true;

     

       114
       114
       -
                 push-new-bookmarks = true;

     

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

     

       115
       125
        
               };

     

       116
       126
        
       

     

       117
       127
        
               signing = {

     
···

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

     

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

     

       122
       132
        
               };

     

       133
       133
       +
       

     

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

     

       123
       135
        
             };

     

       136
       136
       +
           };

     

       137
       137
       +
       

     

       138
       138
       +
           programs.delta = {

     

       139
       139
       +
             enable = true;

     

       140
       140
       +
             enableGitIntegration = true;

     

       141
       141
       +
             enableJujutsuIntegration = true;

     

       124
       142
        
           };

     

       125
       143
        
       

     

       126
       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
       +
       }

+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

···

       47
       47
        
                   bmalehorn.vscode-fish

     

       48
       48
        
                   github.vscode-github-actions

     

       49
       49
        
                   eamodio.gitlens

     

       50
       50
       -
                   # TODO: terraform (use opentofu instead)

     

       51
       50
        
                   ms-vscode.hexeditor

     

       52
       51
        
                   lokalise.i18n-ally

     

       53
       52
        
                   kisstkondoros.vscode-gutter-preview

     
···

       59
       58
        
                   vunguyentuan.vscode-postcss

     

       60
       59
        
                   esbenp.prettier-vscode

     

       61
       60
        
                   prisma.prisma

     

       61
       61
       +
                   gleam.gleam

     

       62
       62
        
                   # TODO: use jedi instead of pylance

     

       63
       63
        
                   ms-python.python

     

       64
       64
        
                   ms-python.debugpy

     
···

       80
       80
        
                   wakatime.vscode-wakatime

     

       81
       81
        
                   redhat.vscode-yaml

     

       82
       82
        
                   arcanis.vscode-zipfs

     

       83
       83
       +
                   golang.go

     

       83
       84
        
                   vscode-marketplace.wraith13.background-phi-colors

     

       84
       85
        
                   vscode-marketplace.be5invis.theme-dolch

     

       85
       86
        
                   vscode-marketplace.fabiospampinato.vscode-diff

     
···

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

     

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

     

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

     

       104
       104
       +
                 "[go]"."editor.defaultFormatter" = "golang.go";

     

       103
       105
        
       

     

       104
       106
        
                 # Sane defaults

     

       105
       107
        
                 "editor.tabSize" = 2;

     
···

       148
       150
        
                 ];

     

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

     

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

     

       153
       153
       +
                 "chat.disableAIFeatures" = true;

     

       151
       154
        
       

     

       152
       155
        
                 # Pretties

     

       153
       156
        
                 "workbench.colorTheme" = "Dolch";

+8

modules/systemd.nix

···

       9
       9
        
               DefaultTimeoutStopSec=30s

     

       10
       10
        
             '';

     

       11
       11
        
           };

     

       12
       12
       +
       

     

       13
       13
       +
           services.udev.extraRules = ''

     

       14
       14
       +
             # USB device rules for both dongle and mouse (Lamzu Maya)

     

       15
       15
       +
             SUBSYSTEM=="usb", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50d", MODE="0666", GROUP="input", TAG+="uaccess"

     

       16
       16
       +
             SUBSYSTEM=="usb", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50f", MODE="0666", GROUP="input", TAG+="uaccess"

     

       17
       17
       +
             KERNEL=="hidraw*", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50d", MODE="0666", GROUP="input", TAG+="uaccess"

     

       18
       18
       +
             KERNEL=="hidraw*", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50f", MODE="0666", GROUP="input", TAG+="uaccess"

     

       19
       19
       +
           '';

     

       12
       20
        
         };

     

       13
       21
        
       }

+14

modules/tailscale.nix

···

       1
       1
       +
       {delib, ...}:

     

       2
       2
       +
       delib.module {

     

       3
       3
       +
         name = "tailscale";

     

       4
       4
       +
       

     

       5
       5
       +
         options = delib.singleEnableOption true;

     

       6
       6
       +
       

     

       7
       7
       +
         nixos.ifEnabled.services.tailscale = {

     

       8
       8
       +
           enable = true;

     

       9
       9
       +
           openFirewall = true;

     

       10
       10
       +
           useRoutingFeatures = "client";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         # home.ifEnabled.services.tailscale-systray.enable = true;

     

       14
       14
       +
       }

Compare changes