From 202baf61b6d342fa7a31bca02828acf48db09313 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Thu, 18 Sep 2025 18:50:41 +0200 Subject: [PATCH 1/3] remove test setup from lpt2 --- nixosConfigurations/vinzenz-lpt2/default.nix | 1 - nixosConfigurations/vinzenz-lpt2/nginx.nix | 66 ------------------- .../vinzenz-lpt2/zerforschen-plus.nix | 38 ----------- 3 files changed, 105 deletions(-) delete mode 100644 nixosConfigurations/vinzenz-lpt2/nginx.nix delete mode 100644 nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix diff --git a/nixosConfigurations/vinzenz-lpt2/default.nix b/nixosConfigurations/vinzenz-lpt2/default.nix index 58eac82..255dd7a 100644 --- a/nixosConfigurations/vinzenz-lpt2/default.nix +++ b/nixosConfigurations/vinzenz-lpt2/default.nix @@ -1,7 +1,6 @@ { imports = [ ./hardware.nix - ./nginx.nix ]; config = { diff --git a/nixosConfigurations/vinzenz-lpt2/nginx.nix b/nixosConfigurations/vinzenz-lpt2/nginx.nix deleted file mode 100644 index d5fd6a4..0000000 --- a/nixosConfigurations/vinzenz-lpt2/nginx.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ pkgs, ... }: -let - blog-domain-socket = "/run/nginx/blog.sock"; - anubis-domain-socket = "/run/anubis/anubis-blog.sock"; -in -{ - users.groups = { - anubis.members = [ "nginx" ]; - nginx.members = [ "anubis" ]; - }; - services = { - nginx = { - enable = true; - - recommendedProxySettings = true; - recommendedTlsSettings = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - - virtualHosts = { - #"vinzenz-lpt2" = { - # locations."/" = { - # proxyPass = "http://127.0.0.1:3000/"; - # proxyWebsockets = true; - # }; - # - # serverAliases = [ "172.23.42.96" ]; - #}; - - "vinzenz-lpt2" = { - locations."/" = { - proxyPass = "http://unix:" + anubis-domain-socket; - }; - }; - - "vinzenz-lpt2-in-anubis" = { - root = pkgs.zerforschen-plus-content; - listen = [ - { - addr = "unix:" + blog-domain-socket; - } - ]; - }; - }; - }; - - #networking.firewall = { - # allowedTCPPorts = [ - # 80 - # 8001 - # 3000 - # ]; - # allowedUDPPorts = [ 2342 ]; - #}; - - anubis = { - instances.main = { - enable = true; - settings = { - BIND = anubis-domain-socket; - TARGET = "unix://" + blog-domain-socket; - }; - }; - }; - }; -} diff --git a/nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix b/nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix deleted file mode 100644 index d2b919d..0000000 --- a/nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - pkgs, - ... -}: -{ - security.acme = { - acceptTerms = true; - defaults.email = "acme@zerforschen.plus"; - }; - - security.pam.services.nginx.setEnvironment = false; - systemd.services.nginx.serviceConfig = { - SupplementaryGroups = [ "shadow" ]; - }; - - services.nginx = { - enable = true; - additionalModules = [ pkgs.nginxModules.pam ]; - - recommendedProxySettings = true; - recommendedTlsSettings = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - - virtualHosts = { - "zerforschen.plus" = { - #addSSL = true; - #enableACME = true; - root = pkgs.zerforschen-plus-content; - }; - }; - }; - - #networking.firewall.allowedTCPPorts = [ - # 80 - # 443 - #]; -} From ea35347a4a682efab34fcac258131dbb079a7a0c Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Tue, 23 Sep 2025 21:26:40 +0200 Subject: [PATCH 2/3] diable unused modules --- flake.nix | 2 -- homeConfigurations/vinzenz/default.nix | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 1fa787e..ea895a6 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,6 @@ self.nixosModules.gnome self.nixosModules.wine-gaming self.nixosModules.steam - self.nixosModules.printing self.nixosModules.podman self.nixosModules.vinzenz-desktop-settings self.nixosModules.intel-graphics @@ -76,7 +75,6 @@ self.nixosModules.gnome self.nixosModules.wine-gaming self.nixosModules.steam - self.nixosModules.printing self.nixosModules.podman self.nixosModules.vinzenz-desktop-settings self.nixosModules.amd-graphics diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix index a0b3e0e..d0990a7 100644 --- a/homeConfigurations/vinzenz/default.nix +++ b/homeConfigurations/vinzenz/default.nix @@ -5,12 +5,12 @@ ./fuzzel.nix ./git.nix ./gnome.nix - #./niri.nix ./ssh.nix - ./swaylock.nix ./vscode.nix - ./waybar.nix ./zsh.nix + #./niri.nix + #./swaylock.nix + #./waybar.nix ]; config = { From dc751016c01685399f26a71114261b48ec302004 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Thu, 25 Sep 2025 19:41:17 +0200 Subject: [PATCH 3/3] basic p10k module, remove omz --- flake.nix | 1 + homeConfigurations/vinzenz/zsh.nix | 18 +----------------- homeModules/zsh-powerlevel10k.nix | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 homeModules/zsh-powerlevel10k.nix diff --git a/flake.nix b/flake.nix index ea895a6..863a4c0 100644 --- a/flake.nix +++ b/flake.nix @@ -231,6 +231,7 @@ self.homeModules.zsh-basics self.homeModules.nano self.homeModules.gnome-extensions + self.homeModules.zsh-powerlevel10k ]; home-manager.users = home-manager-users; diff --git a/homeConfigurations/vinzenz/zsh.nix b/homeConfigurations/vinzenz/zsh.nix index 1278aca..e7dfcd9 100644 --- a/homeConfigurations/vinzenz/zsh.nix +++ b/homeConfigurations/vinzenz/zsh.nix @@ -2,11 +2,8 @@ { config.programs.zsh = { initContent = '' - # eval "$(direnv hook zsh)"; export PATH=$PATH:/home/vinzenz/.cargo/bin - source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme - source ${./.zsh/p10k.zsh} ''; enableCompletion = true; @@ -28,19 +25,6 @@ path = "${config.xdg.dataHome}/zsh/history"; expireDuplicatesFirst = true; }; - - oh-my-zsh = { - enable = true; - theme = "agnoster"; - plugins = [ - "git" - "sudo" - "systemadmin" - "battery" - "dotnet" - "rust" - "tailscale" - ]; - }; }; + config.programs.zsh-powerlevel10k.enable = true; } diff --git a/homeModules/zsh-powerlevel10k.nix b/homeModules/zsh-powerlevel10k.nix new file mode 100644 index 0000000..83701fc --- /dev/null +++ b/homeModules/zsh-powerlevel10k.nix @@ -0,0 +1,23 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + options.programs.zsh-powerlevel10k = { + enable = lib.mkEnableOption "powerlevel10k zsh theme"; + package = lib.mkPackageOption pkgs "zsh-powerlevel10k" { nullable = true; }; + }; + + config = + let + cfg = config.programs.zsh-powerlevel10k; + p10k = if (cfg.package != null) then cfg.package else pkgs.zsh-powerlevel10k; + in + lib.mkIf cfg.enable { + programs.zsh.initContent = '' + source ${p10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme + ''; + }; +}