1
0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00

Compare commits

..

17 Commits

Author SHA1 Message Date
d8b941ce9a
Fix hash 2024-03-12 14:53:23 +01:00
eb3e4118d3
remove premium plugins at wordpress. add tex plugin 2024-03-12 14:51:51 +01:00
091a2c8dd0
fix hashes 2024-03-12 14:46:02 +01:00
0692f5d8eb
[wordpress] more plugins 2024-03-12 14:43:09 +01:00
40a50abc5e
[wordpress] fix wrong hash 2024-03-12 14:34:11 +01:00
2d2c50b707
[wordpress] actually inherit the plugin as well 2024-03-12 14:33:10 +01:00
43994bcd1d
[wordpress] add template patterns collection plugin 2024-03-12 14:32:03 +01:00
b43ba4bd0b
[wordpress] fix config for packages 2024-03-12 14:10:18 +01:00
328b727ffd
Newest version of wp 2024-03-12 14:08:16 +01:00
5fb6524c4b
[wordpress] Fix hashes 2024-03-12 14:01:04 +01:00
6592b5d212
New version antispam-bee (wordpress) 2024-03-12 13:57:29 +01:00
170c4908f7
Fix typo in virtualhosts 2024-03-12 13:54:58 +01:00
6c775d5e91
Add nginx config to wordpress 2024-03-12 13:53:55 +01:00
ef7aaacfc8
Add wordpress to server 2024-03-12 13:42:39 +01:00
a1306237f6
testing plasma yet again 2024-03-12 10:58:02 +01:00
f0202b17e0
remove rnix-lsp which has an outdated dependency 2024-03-12 10:48:46 +01:00
edfed3cb6d
flake.lock: Update
Flake lock file updates:

• Updated input 'comma':
    'github:nix-community/comma/9d8bcc369e4dc1787663bae5576add02009a7c5e' (2024-01-29)
  → 'github:nix-community/comma/91c3006149aa2743ca873efaa3d217a00bb7f292' (2024-03-11)
• Updated input 'comma/naersk':
    'github:nix-community/naersk/636a9b5dd7f2ad7d7c3af929ecf95e4d4fab9e97' (2023-10-18)
  → 'github:nix-community/naersk/aeb58d5e8faead8980a807c840232697982d47b9' (2023-10-27)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/88cb60b6c44861e422302371c0761a89377cf2c7' (2024-02-29)
  → 'github:nix-community/emacs-overlay/4f2b503c128466683e2beacf68310985d156d188' (2024-03-12)
• Updated input 'emacs-overlay/flake-utils':
    'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605' (2024-02-28)
  → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611' (2024-02-28)
  → 'github:NixOS/nixpkgs/ddcd7598b2184008c97e6c9c6a21c5f37590b8d2' (2024-03-11)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/33a97b5814d36ddd65ad678ad07ce43b1a67f159' (2024-02-28)
  → 'github:NixOS/nixos-hardware/ad2fd7b978d5e462048729a6c635c45d3d33c9ba' (2024-03-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611' (2024-02-28)
  → 'github:NixOS/nixpkgs/ddcd7598b2184008c97e6c9c6a21c5f37590b8d2' (2024-03-11)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/9099616b93301d5cf84274b184a3a5ec69e94e08' (2024-02-28)
  → 'github:NixOS/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34' (2024-03-09)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/a1c8de14f60924fafe13aea66b46157f0150f4cf' (2024-02-26)
  → 'github:Mic92/sops-nix/e52d8117b330f690382f1d16d81ae43daeb4b880' (2024-03-11)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea' (2024-02-25)
  → 'github:NixOS/nixpkgs/b17375d3bb7c79ffc52f3538028b2ec06eb79ef8' (2024-03-10)
2024-03-12 09:56:47 +01:00
6 changed files with 147 additions and 36 deletions

60
flake.lock generated
View File

@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706553580, "lastModified": 1710186624,
"narHash": "sha256-eNNKiQH3aBbYL1F26LK5YdvvUZLkFKVS8M86rC+AWe8=", "narHash": "sha256-2Rxxn4NShQBol7ajKws1+F4oF0vle0E3V0Rnigtv9d8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "comma", "repo": "comma",
"rev": "9d8bcc369e4dc1787663bae5576add02009a7c5e", "rev": "91c3006149aa2743ca873efaa3d217a00bb7f292",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1709197479, "lastModified": 1710233394,
"narHash": "sha256-2+Mu5f6sru7wfAXTo21EfYlTGEo4j8ddl4LrsBiv/6A=", "narHash": "sha256-V5gR8bDAm6I38nEXydesmuzwqoOvvwlEeR4ZVbGLRT0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "88cb60b6c44861e422302371c0761a89377cf2c7", "rev": "4f2b503c128466683e2beacf68310985d156d188",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,11 +139,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1710146030,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -256,11 +256,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697664192, "lastModified": 1698420672,
"narHash": "sha256-nRTG3rYEGFV2+putRiC96+kNXDyKaPJgT6K/1FWN7yo=", "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "636a9b5dd7f2ad7d7c3af929ecf95e4d4fab9e97", "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +291,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1709147990, "lastModified": 1710123225,
"narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,11 +369,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1709128929, "lastModified": 1710162809,
"narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=", "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611", "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +385,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1708819810, "lastModified": 1710033658,
"narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=", "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea", "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +401,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1709150264, "lastModified": 1709961763,
"narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +417,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709128929, "lastModified": 1710162809,
"narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=", "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611", "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -480,11 +480,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1708987867, "lastModified": 1710195194,
"narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "rev": "e52d8117b330f690382f1d16d81ae43daeb4b880",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -27,9 +27,9 @@
enable = true; enable = true;
sway.enable = false; sway.enable = false;
i3.enable = false; i3.enable = false;
plasma.enable = false; plasma.enable = true;
xmonad.enable = true; xmonad.enable = false;
xserver.autorandr.enable = true; xserver.autorandr.enable = false;
# set dpi if used in mobile applications # set dpi if used in mobile applications
dpi = 192; dpi = 192;
}; };

View File

@ -59,7 +59,7 @@ with lib; {
nixpkgs-fmt nixpkgs-fmt
procs procs
ripgrep ripgrep
rnix-lsp #rnix-lsp # do not use due to nix 2.15.3 dependency
sysstat sysstat
tcpdump tcpdump
unzip unzip

View File

@ -19,8 +19,8 @@ with lib; {
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager = { displayManager = {
sddm.enable = true; sddm.wayland.enable = true;
#defaultSession = "plasmawayland"; defaultSession = "plasmawayland";
}; };
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
}; };

View File

@ -16,6 +16,12 @@ with lib; {
unbound.enable = mkEnableOption "Set unbound dns up"; unbound.enable = mkEnableOption "Set unbound dns up";
grocy.enable = mkEnableOption "Set up grocy"; grocy.enable = mkEnableOption "Set up grocy";
gitea.enable = mkEnableOption "Set up gitea"; gitea.enable = mkEnableOption "Set up gitea";
wordpress.enable = mkEnableOption "Set up wordpress";
wordpress.domain = mkOption {
type = types.str;
description = "domain for which it shall be set up";
default = "wp.ellmauthaler.net";
};
}; };
imports = [ imports = [
@ -28,6 +34,7 @@ with lib; {
./smailserver.nix ./smailserver.nix
./sql.nix ./sql.nix
./unbound.nix ./unbound.nix
./wordpress.nix
]; ];
config = let config = let
@ -42,6 +49,7 @@ with lib; {
unbound.enable = mkDefault true; unbound.enable = mkDefault true;
grocy.enable = mkDefault true; grocy.enable = mkDefault true;
gitea.enable = mkDefault true; gitea.enable = mkDefault true;
wordpress.enable = mkDefault true;
}; };
}; };
} }

View File

@ -0,0 +1,103 @@
{
config,
pkgs,
lib,
...
}:
with lib; {
config = let
cfg = config.elss.server.wordpress;
fetchPackage = {
name,
version,
hash,
isTheme,
}:
pkgs.stdenv.mkDerivation rec {
inherit name version hash;
src = let
type =
if isTheme
then "theme"
else "plugin";
in
pkgs.fetchzip {
inherit name version hash;
url = "https://downloads.wordpress.org/${type}/${name}.${version}.zip";
};
installPhase = "mkdir -p $out; cp -R * $out/";
};
fetchPlugin = {
name,
version,
hash,
}: (fetchPackage {
name = name;
version = version;
hash = hash;
isTheme = false;
});
fetchTheme = {
name,
version,
hash,
}: (fetchPackage {
name = name;
version = version;
hash = hash;
isTheme = true;
});
neve = fetchTheme {
name = "neve";
version = "3.8.3";
hash = "sha256-JsW1dpSF7ZyZzFscK/YoLD1emgd7toYPlXzTpPhhBLY=";
};
antispam-bee = fetchPlugin {
name = "antispam-bee";
version = "2.11.5";
hash = "sha256-LTF7kDGJ36JuQ7ZGWl2wRCrQBmo9uD30/OlPDpl7cd0=";
};
wordpress-seo = fetchPlugin {
name = "wordpress-seo";
version = "22.2";
hash = "sha256-pqVY82MfDQp2BuawETyeORLxRzfXdEbmkUU9JESeQxA=";
};
templates-patterns-collection = fetchPlugin {
name = "templates-patterns-collection";
version = "1.2.7";
hash = "sha256-r4jwy2bS5u8E+JSXn8k73qIcWJYjFy2McdV1YlbPQQk=";
};
code-block-pro = fetchPlugin {
name = "code-block-pro";
version = "1.26.1";
hash = "sha256-Ble+LCZ68QIRbxiyg7X0Zoq9WTQxqiVnS5HWvsES+E8=";
};
teachpress = fetchPlugin {
name = "teachpress";
version = "9.0.6";
hash = "sha256-GwH2fgopgsNBsR27V1Gp7eba9uDYi0AJqdGjQCZU4hM=";
};
in
mkIf cfg.enable {
services.nginx.virtualHosts."${cfg.domain}" = {
enableACME = true;
forceSSL = true;
};
services.wordpress = {
webserver = "nginx";
sites."${cfg.domain}" = {
package = pkgs.wordpress6_4;
plugins = {inherit antispam-bee wordpress-seo templates-patterns-collection code-block-pro teachpress;};
themes = {inherit neve;};
settings = {WP_DEFAULT_THEME = "neve";};
virtualHost = {
enableACME = true;
forceSSL = true;
};
};
};
};
}