ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

remove wordpress (#42)

Browse Source
This commit is contained in:
Dennis 2024-01-26 23:13:06 +01:00 committed by GitHub
parent 2305974694
commit e4f39f57ee
2 changed files with 29 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
flake.lock generated
View File

@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1705309234,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704498488, "lastModified": 1706221476,
"narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", "narHash": "sha256-T4b8YafVjHXvtDY8ARec1WrXO8uyyNZOpNgv9yoQy2M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", "rev": "c7ce343d9bf1a329056a4dd5b32ea8cc43b55e15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,10 +79,10 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-22_11": [ "nixpkgs-23_05": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-23_05": [ "nixpkgs-23_11": [
"nixpkgs" "nixpkgs"
], ],
"utils": [ "utils": [
@ -90,11 +90,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703666786, "lastModified": 1706219574,
"narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -128,11 +128,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1704632650, "lastModified": 1706182238,
"narHash": "sha256-83J/nd/NoLqo3vj0S0Ppqe8L+ijIFiGL6HNDfCCUD/Q=", "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c478b3d56969006e015e55aaece4931f3600c1b2", "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704707982, "lastModified": 1705314364,
"narHash": "sha256-47KSsVXNxZiCbLLUxM50+1I9gBicxWgn5O2AmVNBSOg=", "narHash": "sha256-MtYY3Labc/Sc1UtULrum3GKJ1H5ClrY9GyvNeVSxkEA=",
"owner": "SuperSandro2000", "owner": "SuperSandro2000",
"repo": "nixos-modules", "repo": "nixos-modules",
"rev": "56404b6bd28565c8b042520a46e0a1ce2150d584", "rev": "03ebaa1bcbac8daa6709beccb43312806e9173fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +167,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1704538339, "lastModified": 1705856552,
"narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,22 +181,6 @@
"type": "github" "type": "github"
} }
}, },
"patch-bitwarden-directory-connector": {
"locked": {
"lastModified": 1704626551,
"narHash": "sha256-wrJB9vPro3sn760rN+579k2a6t3dshzWAfrUlY/Wy9o=",
"owner": "Silver-Golden",
"repo": "nixpkgs",
"rev": "f7c25138ea7d9019f0a34a19cfcfe05a1dac5ac2",
"type": "github"
},
"original": {
"owner": "Silver-Golden",
"ref": "bitwarden-directory-connector_pkgs",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -206,7 +190,6 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-modules": "nixos-modules", "nixos-modules": "nixos-modules",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"patch-bitwarden-directory-connector": "patch-bitwarden-directory-connector",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems" "systems": "systems"
} }
@ -221,11 +204,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704596510, "lastModified": 1706130372,
"narHash": "sha256-tupdwwg1WeX2hNMOQrvtyafTaTVty0QC/gQp7yaYJic=", "narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f5fbcc0f50e7fc60c4f806fa7a09abccf0826d8a", "rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68",
"type": "github" "type": "github"
}, },
"original": { "original": {

21
flake.nix
View File

@ -4,8 +4,6 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
patch-bitwarden-directory-connector.url = "github:Silver-Golden/nixpkgs/bitwarden-directory-connector_pkgs";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
flake-utils = { flake-utils = {
@ -29,8 +27,8 @@
url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
nixpkgs-22_11.follows = "nixpkgs";
nixpkgs-23_05.follows = "nixpkgs"; nixpkgs-23_05.follows = "nixpkgs";
nixpkgs-23_11.follows = "nixpkgs";
utils.follows = "flake-utils"; utils.follows = "flake-utils";
}; };
}; };
@ -57,19 +55,18 @@
}; };
}; };
outputs = { nixpkgs, nixos-modules, home-manager, sops-nix, mailserver, nix-pre-commit, ... }@inputs: outputs = { nixpkgs, nixos-modules, home-manager, sops-nix, mailserver, nix-pre-commit, ... }:
let let
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
src = builtins.filterSource (path: type: type == "directory" || lib.hasSuffix ".nix" (baseNameOf path)) ./.; src = builtins.filterSource (path: type: type == "directory" || lib.hasSuffix ".nix" (baseNameOf path)) ./.;
ls = dir: lib.attrNames (builtins.readDir (src + "/${dir}")); ls = dir: lib.attrNames (builtins.readDir (src + "/${dir}"));
fileList = dir: map (file: ./. + "/${dir}/${file}") (ls dir); fileList = dir: map (file: ./. + "/${dir}/${file}") (ls dir);
config = { config = {
repos = [ repos = [
{ {
repo = "https://gitlab.com/vojko.pribudic/pre-commit-update"; repo = "https://gitlab.com/vojko.pribudic/pre-commit-update";
rev = "89c51188f5fb88a346d0e17773605857fce4aa42"; rev = "f4886322eb7fc53c49e28cc1991674deb1f790bd";
hooks = [ hooks = [
{ {
id = "pre-commit-update"; id = "pre-commit-update";
@ -110,21 +107,13 @@
, users ? [ "dennis" ] , users ? [ "dennis" ]
, ,
}: lib.nixosSystem { }: lib.nixosSystem {
inherit system lib; inherit system;
modules = [ modules = [
{
nixpkgs.overlays = [
(_self: super: {
bitwarden-directory-connector-cli = inputs.patch-bitwarden-directory-connector.legacyPackages.${system}.bitwarden-directory-connector-cli;
})
];
}
mailserver.nixosModules.mailserver mailserver.nixosModules.mailserver
nixos-modules.nixosModule nixos-modules.nixosModule
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
"${inputs.patch-bitwarden-directory-connector}/nixos/modules/services/security/bitwarden-directory-connector-cli.nix"
./systems/programs.nix ./systems/programs.nix
./systems/configuration.nix ./systems/configuration.nix
./systems/${hostname}/hardware.nix ./systems/${hostname}/hardware.nix
@ -174,6 +163,7 @@
]; ];
}; };
}; };
devShell = lib.mapAttrs devShell = lib.mapAttrs
(system: sopsPkgs: (system: sopsPkgs:
with nixpkgs.legacyPackages.${system}; with nixpkgs.legacyPackages.${system};
@ -183,6 +173,7 @@
apacheHttpd apacheHttpd
sopsPkgs.sops-import-keys-hook sopsPkgs.sops-import-keys-hook
]; ];
shellHook = (nix-pre-commit.lib.${system}.mkConfig { shellHook = (nix-pre-commit.lib.${system}.mkConfig {
inherit pkgs config; inherit pkgs config;
}).shellHook; }).shellHook;