diff --git a/flake.lock b/flake.lock index dc1a363..f116ae9 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "grasswren": { "flake": false, "locked": { - "lastModified": 1788394295, - "narHash": "sha256-Fg8PUA0tG5/N8fYWpsOHo0j1+Bnez8G0d8Xd3K63zb8=", + "lastModified": 1792808640, + "narHash": "sha256-hDfXN5OOguPw8cZBts7aliSWVS3yFpYd6Jm9X8UUWto=", "ref": "main", - "rev": "5123b8e9873b7f413c080ba97f01feb85be51808", - "revCount": 5, + "rev": "136f88b6c8f77cd30f014caa069222b32953975c", + "revCount": 6, "type": "git", "url": "https://code.grasswren.net/Lilac/Grasswren.git" }, diff --git a/hosts/desktop.nix b/hosts/desktop.nix index 978c334..483551c 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -3,7 +3,6 @@ { imports = [ ../modules/backup.nix - ../modules/blog.nix ../modules/code.nix ../modules/desktop.nix ../modules/mail.nix @@ -12,6 +11,7 @@ ../modules/secrets.nix ../modules/ssh.nix ../modules/vault.nix + ../modules/website.nix ../lilac.nix ]; @@ -20,6 +20,13 @@ restic ]; + services.caddy = { + enable = true; + virtualHosts."webhook.grasswren.net".extraConfig = '' + reverse_proxy 10.0.0.1:3000 + ''; + }; + networking = { hostName = "desktop"; diff --git a/hosts/laptop.nix b/hosts/laptop.nix index 04b573f..76e1689 100644 --- a/hosts/laptop.nix +++ b/hosts/laptop.nix @@ -10,7 +10,6 @@ discord mullvad-browser obsidian - protonmail-desktop signal-desktop steam thunderbird diff --git a/lilac.nix b/lilac.nix index c462538..722e046 100644 --- a/lilac.nix +++ b/lilac.nix @@ -4,7 +4,7 @@ users.users.lilac = { isNormalUser = true; group = "lilac"; - extraGroups = [ "wheel" "networkmanager" "render" "video" "input" "uinput" ]; + extraGroups = [ "input" "kvm" "networkmanager" "render" "uinput" "video" "wheel" ]; }; users.groups.lilac = {}; @@ -21,13 +21,24 @@ users.lilac = { home.username = "lilac"; home.homeDirectory = "/home/lilac"; - + home.packages = with pkgs; [ git - zsh helix + ripgrep + unzip + zip + zsh ]; - + + programs.helix = { + enable = true; + }; + + home.sessionVariables = { + EDITOR = "hx"; + }; + programs.git = { enable = true; settings = { @@ -37,7 +48,7 @@ init.defaultBranch = "main"; }; }; - + programs.ssh = { enable = true; settings = { @@ -60,7 +71,7 @@ }; }; }; - + programs.zsh = { enable = true; enableCompletion = true; @@ -71,18 +82,9 @@ ls = "ls -A"; }; }; - - programs.helix = { - enable = true; - }; - - home.sessionVariables = { - EDITOR = "hx"; - }; - + programs.home-manager.enable = true; home.stateVersion = "26.05"; - }; }; } diff --git a/modules/blog.nix b/modules/website.nix similarity index 100% rename from modules/blog.nix rename to modules/website.nix