commit 271260119f33c6ec14fb8fe7ad46cb467109766e · kitten.sh/system

+17 -34

flake.lock

···

       66
       66
        
           "darwin_2": {

     

       67
       67
        
             "inputs": {

     

       68
       68
        
               "nixpkgs": [

     

       69
       69
       -
                 "nixpkgs-darwin"

     

       69
       69
       +
                 "nixpkgs"

     

       70
       70
        
               ]

     

       71
       71
        
             },

     

       72
       72
        
             "locked": {

     

       73
       73
       -
               "lastModified": 1699867978,

     

       74
       74
       -
               "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=",

     

       73
       73
       +
               "lastModified": 1700795494,

     

       74
       74
       +
               "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",

     

       75
       75
        
               "owner": "lnl7",

     

       76
       76
        
               "repo": "nix-darwin",

     

       77
       77
       -
               "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f",

     

       77
       77
       +
               "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",

     

       78
       78
        
               "type": "github"

     

       79
       79
        
             },

     

       80
       80
        
             "original": {

     
···

       255
       255
        
               ]

     

       256
       256
        
             },

     

       257
       257
        
             "locked": {

     

       258
       258
       -
               "lastModified": 1699748081,

     

       259
       259
       -
               "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=",

     

       258
       258
       +
               "lastModified": 1700392168,

     

       259
       259
       +
               "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",

     

       260
       260
        
               "owner": "nix-community",

     

       261
       261
        
               "repo": "home-manager",

     

       262
       262
       -
               "rev": "04bac349d585c9df38d78e0285b780a140dc74a4",

     

       262
       262
       +
               "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",

     

       263
       263
        
               "type": "github"

     

       264
       264
        
             },

     

       265
       265
        
             "original": {

     
···

       305
       305
        
               "rust-overlay": "rust-overlay"

     

       306
       306
        
             },

     

       307
       307
        
             "locked": {

     

       308
       308
       -
               "lastModified": 1699854300,

     

       309
       309
       -
               "narHash": "sha256-+vtwI57MvMKoPuLe1yxi9abkA3EbhK+NodVxxkrv3rg=",

     

       308
       308
       +
               "lastModified": 1700811440,

     

       309
       309
       +
               "narHash": "sha256-wrJpW3JCJ9egZpYUMne4c3PFEp+vmkTj5VFpPAT4xdY=",

     

       310
       310
        
               "owner": "nix-community",

     

       311
       311
        
               "repo": "lanzaboote",

     

       312
       312
       -
               "rev": "f8d26384363b3b1ed17de4f2d87aaa553e70b466",

     

       312
       312
       +
               "rev": "cbafc8f8fe388fba6f2c27224276f5f984f9ae47",

     

       313
       313
        
               "type": "github"

     

       314
       314
        
             },

     

       315
       315
        
             "original": {

     
···

       352
       352
        
           },

     

       353
       353
        
           "nixos-hardware": {

     

       354
       354
        
             "locked": {

     

       355
       355
       -
               "lastModified": 1699701045,

     

       356
       356
       -
               "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=",

     

       355
       355
       +
               "lastModified": 1701020860,

     

       356
       356
       +
               "narHash": "sha256-NwnRn04C8s+hH+KdVtGmVB1FFNIG7DtPJmQSCBDaET4=",

     

       357
       357
        
               "owner": "NixOS",

     

       358
       358
        
               "repo": "nixos-hardware",

     

       359
       359
       -
               "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad",

     

       359
       359
       +
               "rev": "b006ec52fce23b1d57f6ab4a42d7400732e9a0a2",

     

       360
       360
        
               "type": "github"

     

       361
       361
        
             },

     

       362
       362
        
             "original": {

     
···

       382
       382
        
               "type": "github"

     

       383
       383
        
             }

     

       384
       384
        
           },

     

       385
       385
       -
           "nixpkgs-darwin": {

     

       386
       386
       -
             "locked": {

     

       387
       387
       -
               "lastModified": 1699785518,

     

       388
       388
       -
               "narHash": "sha256-QywAQ3A4dMHt1NTbHIFMXZ+bknza+JJpjxbDi5ud2+Y=",

     

       389
       389
       -
               "owner": "nixos",

     

       390
       390
       -
               "repo": "nixpkgs",

     

       391
       391
       -
               "rev": "971ac8319468c5cfa05653f6b95d7174614720f9",

     

       392
       392
       -
               "type": "github"

     

       393
       393
       -
             },

     

       394
       394
       -
             "original": {

     

       395
       395
       -
               "owner": "nixos",

     

       396
       396
       -
               "ref": "nixpkgs-23.05-darwin",

     

       397
       397
       -
               "repo": "nixpkgs",

     

       398
       398
       -
               "type": "github"

     

       399
       399
       -
             }

     

       400
       400
       -
           },

     

       401
       385
        
           "nixpkgs-stable": {

     

       402
       386
        
             "locked": {

     

       403
       387
        
               "lastModified": 1685801374,

     
···

       416
       400
        
           },

     

       417
       401
        
           "nixpkgs_2": {

     

       418
       402
        
             "locked": {

     

       419
       419
       -
               "lastModified": 1699099776,

     

       420
       420
       -
               "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",

     

       403
       403
       +
               "lastModified": 1701040486,

     

       404
       404
       +
               "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=",

     

       421
       405
        
               "owner": "nixos",

     

       422
       406
        
               "repo": "nixpkgs",

     

       423
       423
       -
               "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",

     

       407
       407
       +
               "rev": "45827faa2132b8eade424f6bdd48d8828754341a",

     

       424
       408
        
               "type": "github"

     

       425
       409
        
             },

     

       426
       410
        
             "original": {

     

       427
       411
        
               "owner": "nixos",

     

       428
       428
       -
               "ref": "nixos-unstable",

     

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

     

       429
       413
        
               "repo": "nixpkgs",

     

       430
       414
        
               "type": "github"

     

       431
       415
        
             }

     
···

       846
       830
        
               "lanzaboote": "lanzaboote",

     

       847
       831
        
               "nixos-hardware": "nixos-hardware",

     

       848
       832
        
               "nixpkgs": "nixpkgs_2",

     

       849
       849
       -
               "nixpkgs-darwin": "nixpkgs-darwin",

     

       850
       833
        
               "nvim-plugins": "nvim-plugins"

     

       851
       834
        
             }

     

       852
       835
        
           },

+2 -4

flake.nix

···

       4
       4
        
         };

     

       5
       5
        
       

     

       6
       6
        
         inputs = {

     

       7
       7
       -
           nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

     

       8
       8
       -
           nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.05-darwin";

     

       9
       9
       -
       

     

       7
       7
       +
           nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";

     

       10
       8
        
           nixos-hardware.url = "github:NixOS/nixos-hardware/master";

     

       11
       9
        
       

     

       12
       10
        
           lanzaboote = {

     
···

       25
       23
        
       

     

       26
       24
        
           darwin = {

     

       27
       25
        
             url = "github:lnl7/nix-darwin";

     

       28
       28
       -
             inputs.nixpkgs.follows = "nixpkgs-darwin";

     

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

     

       29
       27
        
           };

     

       30
       28
        
       

     

       31
       29
        
           language-servers = {

+1 -3

lib/system.nix

···

       1
       1
        
       { agenix, nixpkgs, darwin, home-manager, ... } @ inputs:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         inherit (nixpkgs) lib;

     

       5
       5
       -
       in {

     

       3
       3
       +
       {

     

       6
       4
        
         mkSystem = { system, hostname, user ? "phil", modules ? [], overlays ? [] }: let

     

       7
       5
        
           inherit (lib.systems.elaborate { inherit system; }) isDarwin isLinux;

     

       8
       6

+2 -2

modules/mysql.nix

···

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         services.mysql = {

     

       5
       5
       -
           enable = helpers.isDarwin;

     

       6
       6
       -
           package = pkgs.mariadb_1010;

     

       5
       5
       +
           enable = false;

     

       6
       6
       +
           package = pkgs.mariadb_1011;

     

       7
       7
        
           dataDir = "/var/lib/mysql";

     

       8
       8
        
           settings.mysqld = {

     

       9
       9
        
             bind-address = "127.0.0.1";