Personal Nix setup

Update flakes

Changed files
+22 -43
lib
modules
+17 -34
flake.lock
···
"darwin_2": {
"inputs": {
"nixpkgs": [
-
"nixpkgs-darwin"
]
},
"locked": {
-
"lastModified": 1699867978,
-
"narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=",
"owner": "lnl7",
"repo": "nix-darwin",
-
"rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f",
"type": "github"
},
"original": {
···
]
},
"locked": {
-
"lastModified": 1699748081,
-
"narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=",
"owner": "nix-community",
"repo": "home-manager",
-
"rev": "04bac349d585c9df38d78e0285b780a140dc74a4",
"type": "github"
},
"original": {
···
"rust-overlay": "rust-overlay"
},
"locked": {
-
"lastModified": 1699854300,
-
"narHash": "sha256-+vtwI57MvMKoPuLe1yxi9abkA3EbhK+NodVxxkrv3rg=",
"owner": "nix-community",
"repo": "lanzaboote",
-
"rev": "f8d26384363b3b1ed17de4f2d87aaa553e70b466",
"type": "github"
},
"original": {
···
},
"nixos-hardware": {
"locked": {
-
"lastModified": 1699701045,
-
"narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=",
"owner": "NixOS",
"repo": "nixos-hardware",
-
"rev": "b689465d0c5d88e158e7d76094fca08cc0223aad",
"type": "github"
},
"original": {
···
"type": "github"
}
},
-
"nixpkgs-darwin": {
-
"locked": {
-
"lastModified": 1699785518,
-
"narHash": "sha256-QywAQ3A4dMHt1NTbHIFMXZ+bknza+JJpjxbDi5ud2+Y=",
-
"owner": "nixos",
-
"repo": "nixpkgs",
-
"rev": "971ac8319468c5cfa05653f6b95d7174614720f9",
-
"type": "github"
-
},
-
"original": {
-
"owner": "nixos",
-
"ref": "nixpkgs-23.05-darwin",
-
"repo": "nixpkgs",
-
"type": "github"
-
}
-
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1685801374,
···
},
"nixpkgs_2": {
"locked": {
-
"lastModified": 1699099776,
-
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "nixos",
"repo": "nixpkgs",
-
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github"
},
"original": {
"owner": "nixos",
-
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
···
"lanzaboote": "lanzaboote",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
-
"nixpkgs-darwin": "nixpkgs-darwin",
"nvim-plugins": "nvim-plugins"
}
},
···
"darwin_2": {
"inputs": {
"nixpkgs": [
+
"nixpkgs"
]
},
"locked": {
+
"lastModified": 1700795494,
+
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
+
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
···
]
},
"locked": {
+
"lastModified": 1700392168,
+
"narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
"owner": "nix-community",
"repo": "home-manager",
+
"rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
"type": "github"
},
"original": {
···
"rust-overlay": "rust-overlay"
},
"locked": {
+
"lastModified": 1700811440,
+
"narHash": "sha256-wrJpW3JCJ9egZpYUMne4c3PFEp+vmkTj5VFpPAT4xdY=",
"owner": "nix-community",
"repo": "lanzaboote",
+
"rev": "cbafc8f8fe388fba6f2c27224276f5f984f9ae47",
"type": "github"
},
"original": {
···
},
"nixos-hardware": {
"locked": {
+
"lastModified": 1701020860,
+
"narHash": "sha256-NwnRn04C8s+hH+KdVtGmVB1FFNIG7DtPJmQSCBDaET4=",
"owner": "NixOS",
"repo": "nixos-hardware",
+
"rev": "b006ec52fce23b1d57f6ab4a42d7400732e9a0a2",
"type": "github"
},
"original": {
···
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1685801374,
···
},
"nixpkgs_2": {
"locked": {
+
"lastModified": 1701040486,
+
"narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=",
"owner": "nixos",
"repo": "nixpkgs",
+
"rev": "45827faa2132b8eade424f6bdd48d8828754341a",
"type": "github"
},
"original": {
"owner": "nixos",
+
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
···
"lanzaboote": "lanzaboote",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
"nvim-plugins": "nvim-plugins"
}
},
+2 -4
flake.nix
···
};
inputs = {
-
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.05-darwin";
-
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
lanzaboote = {
···
darwin = {
url = "github:lnl7/nix-darwin";
-
inputs.nixpkgs.follows = "nixpkgs-darwin";
};
language-servers = {
···
};
inputs = {
+
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
lanzaboote = {
···
darwin = {
url = "github:lnl7/nix-darwin";
+
inputs.nixpkgs.follows = "nixpkgs";
};
language-servers = {
+1 -3
lib/system.nix
···
{ agenix, nixpkgs, darwin, home-manager, ... } @ inputs:
-
let
-
inherit (nixpkgs) lib;
-
in {
mkSystem = { system, hostname, user ? "phil", modules ? [], overlays ? [] }: let
inherit (lib.systems.elaborate { inherit system; }) isDarwin isLinux;
···
{ agenix, nixpkgs, darwin, home-manager, ... } @ inputs:
+
{
mkSystem = { system, hostname, user ? "phil", modules ? [], overlays ? [] }: let
inherit (lib.systems.elaborate { inherit system; }) isDarwin isLinux;
+2 -2
modules/mysql.nix
···
{
services.mysql = {
-
enable = helpers.isDarwin;
-
package = pkgs.mariadb_1010;
dataDir = "/var/lib/mysql";
settings.mysqld = {
bind-address = "127.0.0.1";
···
{
services.mysql = {
+
enable = false;
+
package = pkgs.mariadb_1011;
dataDir = "/var/lib/mysql";
settings.mysqld = {
bind-address = "127.0.0.1";