ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: ellmau:d8b941ce9a646a5ddb7eddbfde7e9c84565c4bdf
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake
..
compare: ellmau:0ba6521775f5b050e0131d38b9bf352763a8cfa2
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake

No commits in common. "d8b941ce9a646a5ddb7eddbfde7e9c84565c4bdf" and "0ba6521775f5b050e0131d38b9bf352763a8cfa2" have entirely different histories.
d8b941ce9a ... 0ba6521775

6 changed files with 36 additions and 147 deletions
Show Stats Expand all files Collapse all files

60
flake.lock generated
View File

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

6
machines/stel-xps/default.nix
View File

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

2
modules/base.nix
View File

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

4
modules/plasma.nix
View File

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

8
modules/server/default.nix
View File

@ -16,12 +16,6 @@ with lib; {
unbound.enable = mkEnableOption "Set unbound dns up";
grocy.enable = mkEnableOption "Set up grocy";
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 = [
@ -34,7 +28,6 @@ with lib; {
./smailserver.nix
./sql.nix
./unbound.nix
./wordpress.nix
];
config = let
@ -49,7 +42,6 @@ with lib; {
unbound.enable = mkDefault true;
grocy.enable = mkDefault true;
gitea.enable = mkDefault true;
wordpress.enable = mkDefault true;
};
};
}

103
modules/server/wordpress.nix
View File

@ -1,103 +0,0 @@
{
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;
};
};
};
};
}