comparing 0418355af12ae10675ef12095d51efa6faf363ae 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
        
                 ],

+40 -55

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

     
···

       122
       124
        
               ]

     

       123
       125
        
             },

     

       124
       126
        
             "locked": {

     

       125
       125
       -
               "lastModified": 1762087455,

     

       126
       126
       -
               "narHash": "sha256-hpbPma1eUKwLAmiVRoMgIHbHiIKFkcACobJLbDt6ABw=",

     

       127
       127
       +
               "lastModified": 1765480374,

     

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

     

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

     

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

     

       129
       129
       -
               "rev": "43e205606aeb253bfcee15fd8a4a01d8ce8384ca",

     

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

     

       130
       132
        
               "type": "github"

     

       131
       133
        
             },

     

       132
       134
        
             "original": {

     
···

       203
       205
        
               "xwayland-satellite-unstable": "xwayland-satellite-unstable"

     

       204
       206
        
             },

     

       205
       207
        
             "locked": {

     

       206
       206
       -
               "lastModified": 1762112996,

     

       207
       207
       -
               "narHash": "sha256-hDYJWcxcYrpCJ9Lxva9B+pAlhGJgwbr2e0guoQQfMoc=",

     

       208
       208
       +
               "lastModified": 1765528203,

     

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

     

       208
       210
        
               "owner": "sodiboo",

     

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

     

       210
       210
       -
               "rev": "bf4782cf43600a4bf14269ee28a7daae962b054b",

     

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

     

       211
       213
        
               "type": "github"

     

       212
       214
        
             },

     

       213
       215
        
             "original": {

     
···

       236
       238
        
           "niri-unstable": {

     

       237
       239
        
             "flake": false,

     

       238
       240
        
             "locked": {

     

       239
       239
       -
               "lastModified": 1761888958,

     

       240
       240
       -
               "narHash": "sha256-YgArUHI81Esn6fOCwVSrMI2G4RI3f3BPbRbPWsJubAc=",

     

       241
       241
       +
               "lastModified": 1765524373,

     

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

     

       241
       243
        
               "owner": "YaLTeR",

     

       242
       244
        
               "repo": "niri",

     

       243
       243
       -
               "rev": "e2576879216a39e5c45b9d2906531bc2065e724c",

     

       245
       245
       +
               "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743",

     

       244
       246
        
               "type": "github"

     

       245
       247
        
             },

     

       246
       248
        
             "original": {

     
···

       252
       254
        
           "nix-darwin": {

     

       253
       255
        
             "inputs": {

     

       254
       256
        
               "nixpkgs": [

     

       255
       255
       -
                 "denix",

     

       256
       257
        
                 "nixpkgs"

     

       257
       258
        
               ]

     

       258
       259
        
             },

     

       259
       260
        
             "locked": {

     

       260
       260
       -
               "lastModified": 1751313918,

     

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

     

       262
       262
       -
               "owner": "nix-darwin",

     

       261
       261
       +
               "lastModified": 1765065051,

     

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

     

       263
       263
       +
               "owner": "LnL7",

     

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

     

       264
       264
       -
               "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",

     

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

     

       265
       266
        
               "type": "github"

     

       266
       267
        
             },

     

       267
       268
        
             "original": {

     
···

       270
       271
        
               "type": "github"

     

       271
       272
        
             }

     

       272
       273
        
           },

     

       273
       273
       -
           "nix-darwin_2": {

     

       274
       274
       -
             "inputs": {

     

       275
       275
       -
               "nixpkgs": [

     

       276
       276
       -
                 "nixpkgs"

     

       277
       277
       -
               ]

     

       278
       278
       -
             },

     

       279
       279
       -
             "locked": {

     

       280
       280
       -
               "lastModified": 1762039661,

     

       281
       281
       -
               "narHash": "sha256-oM5BwAGE78IBLZn+AqxwH/saqwq3e926rNq5HmOulkc=",

     

       282
       282
       -
               "owner": "LnL7",

     

       283
       283
       -
               "repo": "nix-darwin",

     

       284
       284
       -
               "rev": "c3c8c9f2a5ed43175ac4dc030308756620e6e4e4",

     

       285
       285
       -
               "type": "github"

     

       286
       286
       -
             },

     

       287
       287
       -
             "original": {

     

       288
       288
       -
               "owner": "LnL7",

     

       289
       289
       -
               "repo": "nix-darwin",

     

       290
       290
       -
               "type": "github"

     

       291
       291
       -
             }

     

       292
       292
       -
           },

     

       293
       274
        
           "nix-index-database": {

     

       294
       275
        
             "inputs": {

     

       295
       276
        
               "nixpkgs": [

     
···

       297
       278
        
               ]

     

       298
       279
        
             },

     

       299
       280
        
             "locked": {

     

       300
       300
       -
               "lastModified": 1762055842,

     

       301
       301
       -
               "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=",

     

       281
       281
       +
               "lastModified": 1765267181,

     

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

     

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

     

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

     

       304
       304
       -
               "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f",

     

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

     

       305
       286
        
               "type": "github"

     

       306
       287
        
             },

     

       307
       288
        
             "original": {

     
···

       315
       296
        
               "nixpkgs": "nixpkgs_2"

     

       316
       297
        
             },

     

       317
       298
        
             "locked": {

     

       318
       318
       -
               "lastModified": 1762048816,

     

       319
       319
       -
               "narHash": "sha256-gAGed5eYA6WTVQSMELyi+168A9N2UNEjwXn5xm0czsk=",

     

       299
       299
       +
               "lastModified": 1765505053,

     

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

     

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

     

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

     

       322
       322
       -
               "rev": "c8261cd60b0623635b4b88ae0f75ac3bfeddf260",

     

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

     

       323
       304
        
               "type": "github"

     

       324
       305
        
             },

     

       325
       306
        
             "original": {

     
···

       361
       342
        
           },

     

       362
       343
        
           "nixpkgs-stable": {

     

       363
       344
        
             "locked": {

     

       364
       364
       -
               "lastModified": 1761999846,

     

       365
       365
       -
               "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=",

     

       345
       345
       +
               "lastModified": 1765311797,

     

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

     

       366
       347
        
               "owner": "NixOS",

     

       367
       348
        
               "repo": "nixpkgs",

     

       368
       368
       -
               "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31",

     

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

     

       369
       350
        
               "type": "github"

     

       370
       351
        
             },

     

       371
       352
        
             "original": {

     

       372
       353
        
               "owner": "NixOS",

     

       373
       373
       -
               "ref": "nixos-25.05",

     

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

     

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

     

       374
       356
        
               "repo": "nixpkgs",

     

       375
       357
        
               "type": "github"

     

       376
       358
        
             }

     
···

       393
       375
        
           },

     

       394
       376
        
           "nixpkgs_3": {

     

       395
       377
        
             "locked": {

     

       396
       396
       -
               "lastModified": 1761907660,

     

       397
       397
       -
               "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",

     

       378
       378
       +
               "lastModified": 1765186076,

     

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

     

       398
       380
        
               "owner": "nixos",

     

       399
       381
        
               "repo": "nixpkgs",

     

       400
       400
       -
               "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",

     

       382
       382
       +
               "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",

     

       401
       383
        
               "type": "github"

     

       402
       384
        
             },

     

       403
       385
        
             "original": {

     
···

       434
       416
        
               "iosevka-solai": "iosevka-solai",

     

       435
       417
        
               "lix-module": "lix-module",

     

       436
       418
        
               "niri-flake": "niri-flake",

     

       437
       437
       -
               "nix-darwin": "nix-darwin_2",

     

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

     

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

     

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

     

       440
       422
        
               "nixpkgs": "nixpkgs_3",

     
···

       491
       473
        
           "xwayland-satellite-unstable": {

     

       492
       474
        
             "flake": false,

     

       493
       475
        
             "locked": {

     

       494
       494
       -
               "lastModified": 1761622056,

     

       495
       495
       -
               "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=",

     

       476
       476
       +
               "lastModified": 1765343581,

     

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

     

       496
       478
        
               "owner": "Supreeeme",

     

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

     

       498
       498
       -
               "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756",

     

       480
       480
       +
               "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95",

     

       499
       481
        
               "type": "github"

     

       500
       482
        
             },

     

       501
       483
        
             "original": {

     
···

       511
       493
        
               ]

     

       512
       494
        
             },

     

       513
       495
        
             "locked": {

     

       514
       514
       -
               "lastModified": 1761883599,

     

       515
       515
       -
               "narHash": "sha256-ntnfAAqSuXI/+uqXAWUjbY5arB7sRK9cpgFbHbCZgK8=",

     

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

     

       516
       500
        
               "owner": "youwen5",

     

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

     

       518
       518
       -
               "rev": "5355c0dc6857a2aa34b126fb4a93a454ed702f52",

     

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

     

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

     

       519
       504
        
               "type": "github"

     

       520
       505
        
             },

     

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

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

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

modules/darwin/homebrew.nix

···

       40
       40
        
             "swiftformat-for-xcode"

     

       41
       41
        
             "tailscale-app"

     

       42
       42
        
             # "vorta"

     

       43
       43
       +
             "vesktop"

     

       43
       44
        
             "zen"

     

       44
       45
        
           ];

     

       45
       46

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

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

+24 -3

modules/programs/desktop-apps.nix

···

       1
       1
        
       {

     

       2
       2
        
         delib,

     

       3
       3
        
         pkgs,

     

       4
       4
       +
         homeConfig,

     

       4
       5
        
         ...

     

       5
       6
        
       }:

     

       6
       7
        
       delib.module {

     
···

       16
       17
        
             btop # TODO: module & options

     

       17
       18
        
             bruno

     

       18
       19
        
             davinci-resolve

     

       19
       19
       -
             # distrobox

     

       20
       20
       +
             (discord.override {

     

       21
       21
       +
               withOpenASAR = true;

     

       22
       22
       +
               withVencord = true;

     

       23
       23
       +
             })

     

       20
       24
        
             gajim

     

       21
       25
        
             glaxnimate

     

       22
       26
        
             # godot_4

     
···

       29
       33
        
             lutris

     

       30
       34
        
             # mixxx

     

       31
       35
        
             obsidian

     

       36
       36
       +
             opencloud-desktop

     

       32
       37
        
             oversteer

     

       33
       38
        
             p7zip

     

       34
       39
        
             picard

     
···

       43
       48
        
                 temurin-bin-17

     

       44
       49
        
               ];

     

       45
       50
        
             })

     

       51
       51
       +
             protonup-qt

     

       46
       52
        
             qbittorrent

     

       47
       53
        
             qimgv

     

       48
       54
        
             slack

     

       49
       49
       -
             vesktop

     

       55
       55
       +
             # vesktop

     

       50
       56
        
             vlc

     

       51
       57
        
             vorta

     

       52
       58
        
             winetricks

     
···

       54
       60
        
             yubioath-flutter

     

       55
       61
        
           ];

     

       56
       62
        
       

     

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

     

       58
       79
        
         };

     

       59
       80
        
       }

+20 -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
       -
           claude-code

     

       16
       16
       -
           claude-code-router

     

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

     

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

     

       30
       31
        
       

     

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

     

       32
       33
        
           programs.nh = {

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

+2 -1

modules/programs/git.nix

···

       121
       121
        
       

     

       122
       122
        
               git = {

     

       123
       123
        
                 sign-on-push = true;

     

       124
       124
       -
                 push-new-bookmarks = true;

     

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

     

       126
       125
        
               };

     

       127
       126
        
       

     
···

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

     

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

     

       133
       132
        
               };

     

       133
       133
       +
       

     

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

     

       134
       135
        
             };

     

       135
       136
        
           };

     

       136
       137

Compare changes