diff --git a/flake.lock b/flake.lock index 428b2339976093d33ed763321eb7268c58e1afca..8a8f5ebd79e882d6aacd0f7ef9f14e0d9afc0a45 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "actual": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719973663, - "narHash": "sha256-SybjMpCVUWG998EkvcwjHH3fTbG05FUSbB/Gqjz63tE=", - "ref": "refs/heads/main", - "rev": "7567e89e80834dfa65ca5af987a8db0afe01099d", - "revCount": 11, - "type": "git", - "url": "https://git.xeno.science/xenofem/actual-nix.git" - }, - "original": { - "type": "git", - "url": "https://git.xeno.science/xenofem/actual-nix.git" - } - }, "agenix": { "inputs": { "darwin": [], @@ -540,8 +520,6 @@ }, "root": { "inputs": { { - "gist": { -{ "lastModified": 1702606669, "bennet": "bennet", "blog": "blog", @@ -563,7 +541,6 @@ "resume": "resume", "tclip": "tclip", "templ": "templ", "tmpl": "tmpl", - "tsnet-serve": "tsnet-serve", "ugit": "ugit", "website": "website", "wsl": "wsl" @@ -778,26 +755,6 @@ }, "original": { "type": "git", "url": "https://git.jolheiser.com/tmpl.git" - } - }, - "tsnet-serve": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721516004, - "narHash": "sha256-+ayExpklAHdRfrCmPdFDIstiYFFeoBncpyvffcdkugU=", - "ref": "refs/heads/main", - "rev": "016b9666734733ea0ca7df54335ef44b9dd03573", - "revCount": 8, - "type": "git", - "url": "https://git.jolheiser.com/tsnet-serve-nix.git" - }, - "original": { - "type": "git", - "url": "https://git.jolheiser.com/tsnet-serve-nix.git" } }, "ugit": { diff --git a/flake.nix b/flake.nix index 954a098574e9fb4b2314f9627e8f452e9c8c02ef..d7a74e85f1c54a449b77615817f36de794f4437a 100644 --- a/flake.nix +++ b/flake.nix @@ -108,14 +108,6 @@ dagger = { url = "github:dagger/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - actual = { - url = "git+https://git.xeno.science/xenofem/actual-nix.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - tsnet-serve = { - url = "git+https://git.jolheiser.com/tsnet-serve-nix.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; # WSL wsl = { url = "github:nix-community/NixOS-WSL"; @@ -245,8 +237,6 @@ inputs.agenix.nixosModules.default inputs.golink.nixosModules.default inputs.ugit.nixosModules.default inputs.git-pr.nixosModules.default - inputs.actual.nixosModules.default - inputs.tsnet-serve.nixosModules.default ./machines/dragonwell ]; }; diff --git a/machines/dragonwell/actual.nix b/machines/dragonwell/actual.nix deleted file mode 100644 index 0b607bdd24a61748d17f4d89d62fd70a51cdc9f7..0000000000000000000000000000000000000000 --- a/machines/dragonwell/actual.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - services = { - actual = { - enable = true; - hostname = "127.0.0.1"; - port = 5006; - }; - tsnet-serve.instances.actualbudget = { - enable = true; - backend = "http://127.0.0.1:5006"; - authKey = "tskey-auth-kujWFyP73s11CNTRL-XaS9zY7cGH2WbFMGYURaH2bRNRgXrwj9T"; # One-time key - }; - }; -} diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 91429c7501bb73afee40d7e07baf8406e3e76810..7c738a490fb3df6f30c409265b4d539870cc5994 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -2,7 +2,7 @@ let username = "jolheiser"; key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser''; in { - imports = [./actual.nix ./caddy.nix ./dex.nix ./git-pr.nix ./golink.nix ./gotosocial.nix ./restic.nix ./soju.nix ./tandoor.nix ./ugit.nix ./vikunja.nix ./hardware.nix]; + imports = [./caddy.nix ./dex.nix ./git-pr.nix ./golink.nix ./gotosocial.nix ./restic.nix ./soju.nix ./tandoor.nix ./ugit.nix ./vikunja.nix ./hardware.nix]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; @@ -16,10 +16,7 @@ allowedTCPPorts = [80 443 6697]; }; }; - services = { - openssh.enable = true; - tailscale.enable = true; - }; + services.openssh.enable = true; users.users = { "${username}" = {