From d2574636d6da1796551f3298dd71c97ff91952ad Mon Sep 17 00:00:00 2001 From: Satria Date: Wed, 25 Mar 2026 16:24:04 +0700 Subject: [PATCH 1/4] small cleanup --- modules/system/homelab/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/homelab/git.nix b/modules/system/homelab/git.nix index 3d436ca..72c6050 100644 --- a/modules/system/homelab/git.nix +++ b/modules/system/homelab/git.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, homelab, ... }: { +{ pkgs, homelab, ... }: { services = { forgejo = { enable = true; From 1cfee15d258791bb03295b954ec565be7952aa60 Mon Sep 17 00:00:00 2001 From: Satria Date: Wed, 25 Mar 2026 16:36:02 +0700 Subject: [PATCH 2/4] remove unused services --- modules/system/homelab/dash.nix | 1 - modules/system/homelab/proxy.nix | 1 - modules/system/homelab/remote.nix | 19 ----------------- modules/system/homelab/share.nix | 34 ------------------------------- modules/system/server.nix | 1 - 5 files changed, 56 deletions(-) delete mode 100644 modules/system/homelab/remote.nix delete mode 100644 modules/system/homelab/share.nix diff --git a/modules/system/homelab/dash.nix b/modules/system/homelab/dash.nix index 97ddade..727faf4 100644 --- a/modules/system/homelab/dash.nix +++ b/modules/system/homelab/dash.nix @@ -78,7 +78,6 @@ [ "Ntfy" "ntfy" "https://notify.proxy.${homelab.domain}" "http://localhost:8067/" ] [ "SearXNG" "searxng" "https://search.proxy.${homelab.domain}" "http://localhost:8091/" ] [ "Dockge" "docker" "https://containers.proxy.${homelab.domain}" "http://localhost:5001/" ] - [ "Guacamole" "apacheguacamole" "https://remote.proxy.${homelab.domain}/guacamole" "http://localhost:8085/guacamole/" ] ]; bookmarks = [ [ "Tailscale" "tailscale" "https://login.tailscale.com/" ] diff --git a/modules/system/homelab/proxy.nix b/modules/system/homelab/proxy.nix index 10a6a32..f831f17 100644 --- a/modules/system/homelab/proxy.nix +++ b/modules/system/homelab/proxy.nix @@ -13,7 +13,6 @@ "gallery" = d "http://localhost:2283"; "dynamic" = d "http://localhost:8082"; - "remote" = d "http://localhost:8085"; "search" = d "http://localhost:8091"; "notify" = d "http://localhost:8067"; "media" = d "http://localhost:8096"; diff --git a/modules/system/homelab/remote.nix b/modules/system/homelab/remote.nix deleted file mode 100644 index c8b6671..0000000 --- a/modules/system/homelab/remote.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ ... }: { - services = { - guacamole-server = { - enable = true; - host = "127.0.0.1"; - port = 4822; - }; - guacamole-client = { - enable = true; - enableWebserver = true; - userMappingXml = "/mnt/data/guacamole/user-mapping.xml"; - settings = { - guacd-hostname = "127.0.0.1"; - guacd-port = 4822; - }; - }; - tomcat.port = 8085; - }; -} \ No newline at end of file diff --git a/modules/system/homelab/share.nix b/modules/system/homelab/share.nix deleted file mode 100644 index 6a01a39..0000000 --- a/modules/system/homelab/share.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ ... }: { - services = { - httpd = { - enable = true; - virtualHosts."cdn" = { - listen = [{ ip = "127.0.0.1"; port = 3000; }]; - documentRoot = "/mnt/share"; - }; - }; - - samba = { - enable = true; - settings = { - global = { - workgroup = "WORKGROUP"; - "disable netbios" = "yes"; - "allow insecure wide links" = "yes"; - "server min protocol" = "SMB2_02"; - }; - "NAS" = { - path = "/mnt/share"; - browseable = "yes"; - "read only" = "no"; - "create mask" = "0664"; - "force create mode" = "0664"; - "directory mask" = "0775"; - "force directory mode" = "0775"; - "follow symlinks" = "yes"; - "wide links" = "yes"; - }; - }; - }; - }; -} \ No newline at end of file diff --git a/modules/system/server.nix b/modules/system/server.nix index fd10d22..daa3747 100644 --- a/modules/system/server.nix +++ b/modules/system/server.nix @@ -11,7 +11,6 @@ in { ./homelab/containers.nix ./homelab/gallery.nix ./homelab/tunnels.nix - ./homelab/remote.nix ./homelab/notify.nix ./homelab/search.nix ./homelab/media.nix From 78444c3b83b0bedfb16a1a255b9a67919d1b1799 Mon Sep 17 00:00:00 2001 From: Satria Date: Wed, 25 Mar 2026 16:36:14 +0700 Subject: [PATCH 3/4] add credits and hosts --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 76cad4e..1c27513 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,11 @@ rewrite of my nixos flake with hopefully better structuring and modularity > [!WARNING] -> this flake is ment for personal use. code is not well documented and is not ment to be used by others. use at your own risk. \ No newline at end of file +> this flake is ment for personal use. code is not well documented and is not ment to be used by others. use at your own risk. + +## hosts +- `thinkpad` - my thinkpad t480 with an i5 8350u, 16gb of ram, and 256gb nvme ssd (140 allocated for nixos, rest for windows 11) +- `homelab` - my homelab server in a vm on a proxmox host with an i7 8700t, 32gb of ram, and 512gb boot drive (with hotplug enabled for cpu and ram) + +## credits +- [orangc's flake](https://git.orangc.net/c/dots) \ No newline at end of file From c71da4411975e06e1643cdff0c6329845e5f642a Mon Sep 17 00:00:00 2001 From: Satria Date: Wed, 25 Mar 2026 16:38:00 +0700 Subject: [PATCH 4/4] remove unused sops --- flake.lock | 37 +------------------------------------ flake.nix | 3 --- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index cc8baa0..c00515b 100644 --- a/flake.lock +++ b/flake.lock @@ -123,47 +123,12 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1772736753, - "narHash": "sha256-au/m3+EuBLoSzWUCb64a/MZq6QUtOV8oC0D9tY2scPQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "917fec990948658ef1ccd07cef2a1ef060786846", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "ctp": "ctp", "gl": "gl", "hm": "hm", - "nixpkgs": "nixpkgs_3", - "sops": "sops" - } - }, - "sops": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1773096132, - "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" + "nixpkgs": "nixpkgs_3" } }, "systems": { diff --git a/flake.nix b/flake.nix index 692ca4d..8130e57 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - sops.url = "github:Mic92/sops-nix"; gl.url = "github:nix-community/nixGL"; ctp.url = "github:catppuccin/nix"; }; @@ -31,7 +30,6 @@ modules = [ ./hosts/${host}/config.nix inputs.ctp.nixosModules.catppuccin - inputs.sops.nixosModules.sops ]; }; @@ -41,7 +39,6 @@ modules = [ ./hosts/${host}/config.nix inputs.ctp.nixosModules.catppuccin - inputs.sops.nixosModules.sops inputs.hm.nixosModules.home-manager { home-manager = {