From de1879b9a0b9a412068785d81cc17bbf947d0eef Mon Sep 17 00:00:00 2001 From: andromeda Date: Sat, 21 Feb 2026 15:59:08 +0100 Subject: [PATCH] idk prolly smt ig --- .gitignore | 2 + deploy.sh | 6 +- flake.lock | 449 ++++-------------- flake.nix | 32 +- machines.nix | 2 +- modules/nix-on-droid/home.nix | 165 ------- modules/nix-on-droid/nix-on-droid.nix | 5 - .../networking/networks/109-199-104-83.nix | 32 +- modules/nixos/phoenix.nix | 45 -- overlays/phoenix.nix | 21 - patches/0001-autoDisableScopes-unlocked.patch | 25 - robotnix/payton.nix | 13 - users.nix | 10 +- users/andromeda/home.nix | 10 + 14 files changed, 151 insertions(+), 666 deletions(-) create mode 100644 .gitignore delete mode 100644 modules/nix-on-droid/home.nix delete mode 100644 modules/nix-on-droid/nix-on-droid.nix delete mode 100644 modules/nixos/phoenix.nix delete mode 100644 overlays/phoenix.nix delete mode 100644 patches/0001-autoDisableScopes-unlocked.patch delete mode 100644 robotnix/payton.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..56a5795 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +result* +.gcroots diff --git a/deploy.sh b/deploy.sh index 86a6c40..387c3ee 100755 --- a/deploy.sh +++ b/deploy.sh @@ -2,4 +2,8 @@ # $ ./deploy.sh # example usage: # $ ./deply.sh 109-199-104-83 109.199.104.83 -nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-generate-config ./hardware-configuration.nix --flake .?ref=411ee0c#$1 --target-host root@$2 +nix run github:nix-community/nixos-anywhere -- \ + --extra-files ~/.ssh/remote_secrets/$2 \ + --generate-hardware-config nixos-generate-config ./hardware-configuration.nix \ + --flake .#$1 \ + --target-host root@$2 diff --git a/flake.lock b/flake.lock index 5c57f18..e6b8f99 100644 --- a/flake.lock +++ b/flake.lock @@ -23,27 +23,6 @@ "type": "github" } }, - "androidPkgs": { - "inputs": { - "devshell": "devshell", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1750710155, - "narHash": "sha256-2lBEwXgclOrSsrhubSfifU91+sXqikC8qbiZ6yFeaEY=", - "owner": "tadfisher", - "repo": "android-nixpkgs", - "rev": "0846fab1f060f646e1017053077ad38dedc5207b", - "type": "github" - }, - "original": { - "owner": "tadfisher", - "ref": "stable", - "repo": "android-nixpkgs", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -150,28 +129,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "robotnix", - "androidPkgs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", - "owner": "numtide", - "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -179,11 +136,11 @@ ] }, "locked": { - "lastModified": 1746728054, - "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=", + "lastModified": 1768920986, + "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=", "owner": "nix-community", "repo": "disko", - "rev": "ff442f5d1425feb86344c028298548024f21256d", + "rev": "de5708739256238fb912c62f03988815db89ec9a", "type": "github" }, "original": { @@ -196,11 +153,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -241,21 +198,6 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, - "flake-compat_3": { - "locked": { - "lastModified": 1746162366, - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -285,11 +227,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -306,11 +248,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -319,24 +261,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -405,11 +329,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -448,11 +372,11 @@ ] }, "locked": { - "lastModified": 1766980997, - "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=", + "lastModified": 1769872935, + "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "owner": "nix-community", "repo": "home-manager", - "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b", + "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "type": "github" }, "original": { @@ -464,16 +388,16 @@ "home-manager_3": { "inputs": { "nixpkgs": [ - "nix-on-droid", + "impermanence", "nixpkgs" ] }, "locked": { - "lastModified": 1709445365, - "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", + "lastModified": 1768598210, + "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", "owner": "nix-community", "repo": "home-manager", - "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", + "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", "type": "github" }, "original": { @@ -483,12 +407,16 @@ } }, "impermanence": { + "inputs": { + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1769548169, + "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "type": "github" }, "original": { @@ -499,11 +427,11 @@ }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1768701608, + "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "20d63a8a1ae400557c770052a46a9840e768926b", "type": "github" }, "original": { @@ -514,81 +442,34 @@ }, "ndg": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nvf", + "nixpkgs" + ] }, "locked": { - "lastModified": 1765720983, - "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "owner": "feel-co", "repo": "ndg", - "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { "owner": "feel-co", + "ref": "refs/tags/v2.6.0", "repo": "ndg", "type": "github" } }, - "nix-formatter-pack": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs" - ], - "nmd": [ - "nix-on-droid", - "nmd" - ], - "nmt": "nmt" - }, - "locked": { - "lastModified": 1705252799, - "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", - "type": "github" - }, - "original": { - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "type": "github" - } - }, - "nix-on-droid": { - "inputs": { - "home-manager": "home-manager_3", - "nix-formatter-pack": "nix-formatter-pack", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-docs": "nixpkgs-docs", - "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", - "nmd": "nmd" - }, - "locked": { - "lastModified": 1765031149, - "narHash": "sha256-4ZtlnCp4blhsjGnQIxAXDAj7nCJKy7tozoBRtklmwcU=", - "owner": "nix-community", - "repo": "nix-on-droid", - "rev": "55b6449b4582a4ba3ce712543c973360a026db7d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-on-droid", - "type": "github" - } - }, "nix-zulip": { "flake": false, "locked": { - "lastModified": 1764583012, - "narHash": "sha256-6ht4dtI1TBDAaB/Tatq+FcPexaZTBWuRiJGnioCDx5c=", + "lastModified": 1767099571, + "narHash": "sha256-NmwGCghLjFlJp7Hoi2fxlRPz3GaTxJVr8o2uBDQlr3Y=", "ref": "refs/heads/main", - "rev": "a9dd0f80d775745f1d88055f24d944562db97c5e", - "revCount": 67, + "rev": "1625c0ae0ef9db45c2817d60c0af7f06c74bc4eb", + "revCount": 74, "type": "git", "url": "https://git.afnix.fr/nix-zulip/nix-zulip" }, @@ -622,11 +503,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768305791, - "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -636,124 +517,22 @@ "type": "github" } }, - "nixpkgs-docs": { - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-for-bootstrap": { - "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "NixOS", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nmd": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs-docs" - ], - "scss-reset": "scss-reset" - }, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1648075362, - "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", - "owner": "rycee", - "repo": "nmt", - "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmt", - "type": "gitlab" - } - }, "noshell": { "inputs": { "nixpkgs": [ @@ -782,11 +561,11 @@ ] }, "locked": { - "lastModified": 1767026366, - "narHash": "sha256-TqJXPpEPYfeFCbraquNdrB1dJYuEqV474Npv8UcNxrs=", + "lastModified": 1769892826, + "narHash": "sha256-mTC9+cA3wqe0dDqMR5ptRgZyjMeS2810acbceGgWTWA=", "owner": "nix-community", "repo": "NUR", - "rev": "1f8c02a96c58c0dd90f2de45440b9ef01571abc3", + "rev": "66daaa88dd2252ed0f2b6786413a301b8419f89b", "type": "github" }, "original": { @@ -807,11 +586,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -832,11 +611,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1766596669, - "narHash": "sha256-9C72hpMDa99n4MbqZqsBkrBQZe+HEN9lnu7Sme67nmU=", + "lastModified": 1769786801, + "narHash": "sha256-i5130O0JEAgZZ/d3mksGbXriNPZiXrvDOh9JWMQZh3w=", "owner": "notashelf", "repo": "nvf", - "rev": "ef1f22efaf4aa37ba9382a7d1807fa8ac9c097fd", + "rev": "fde1338793aeb88810122030cf0badd3297936b0", "type": "github" }, "original": { @@ -845,24 +624,23 @@ "type": "github" } }, - "robotnix": { + "phoenix": { "inputs": { - "androidPkgs": "androidPkgs", - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_4", - "treefmt-nix": "treefmt-nix" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1768481330, - "narHash": "sha256-hYKnwFBPI0IyH8YbW3kqci8AS6ZtV7QSEa0E5Wt401M=", - "owner": "nix-community", - "repo": "robotnix", - "rev": "4ee0f9c86c3ae076bcbc41cbeebff054fe3d11a8", + "lastModified": 1769718478, + "narHash": "sha256-4DAylwVllb0c/HPj6T9Y3qel8b77yhVL5LMo+vlstKo=", + "owner": "celenityy", + "repo": "Phoenix", + "rev": "13ba31e67cb0589eb3f70a135a19bdb99d77862f", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "robotnix", + "owner": "celenityy", + "repo": "Phoenix", "type": "github" } }, @@ -872,33 +650,16 @@ "disko": "disko", "home-manager": "home-manager_2", "impermanence": "impermanence", - "nix-on-droid": "nix-on-droid", "nix-zulip": "nix-zulip", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "noshell": "noshell", "nur": "nur", "nvf": "nvf", - "robotnix": "robotnix", + "phoenix": "phoenix", "stylix": "stylix" } }, - "scss-reset": { - "flake": false, - "locked": { - "lastModified": 1631450058, - "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", - "owner": "andreymatin", - "repo": "scss-reset", - "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", - "type": "github" - }, - "original": { - "owner": "andreymatin", - "repo": "scss-reset", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -912,7 +673,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_4", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -920,11 +681,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1766603026, - "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", + "lastModified": 1769888473, + "narHash": "sha256-4KWbaJwaYnZ60bFyTudZYAKskjr7Sa17R3/yh+oXS7w=", "owner": "nix-community", "repo": "stylix", - "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", + "rev": "ae5c0239ae4f82a8c7e33ad8a456535d5a9ba813", "type": "github" }, "original": { @@ -978,21 +739,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1029,11 +775,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -1045,11 +791,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -1061,11 +807,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -1073,27 +819,6 @@ "repo": "base16-zed", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "robotnix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1766000401, - "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 90c1ebd..ac3c041 100644 --- a/flake.nix +++ b/flake.nix @@ -18,10 +18,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nix-on-droid = { - url = "github:nix-community/nix-on-droid"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nix-zulip = { url = "git+https://git.afnix.fr/nix-zulip/nix-zulip"; flake = false; @@ -38,7 +34,10 @@ url = "github:notashelf/nvf"; inputs.nixpkgs.follows = "nixpkgs"; }; - robotnix.url = "github:nix-community/robotnix"; + phoenix = { + url = "github:celenityy/Phoenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; stylix = { url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -51,12 +50,11 @@ impermanence, nixos-mailserver, nixpkgs, - nix-on-droid, nix-zulip, noshell, nur, nvf, - robotnix, + phoenix, stylix, ... }: let @@ -78,13 +76,14 @@ nixos-mailserver.nixosModule noshell.nixosModules.default nix-zulip'.nixosModules.zulip - { + phoenix.nixosModules.default + ({pkgs, ...}: { nixpkgs.overlays = [ agenix.overlays.default nur.overlays.default nix-zulip'.overlays.default ]; - } + }) ] ++ machine.modules; }; @@ -119,20 +118,5 @@ builtins.mapAttrs (hostname: value: configurationWithHomeManager value) machines; - robotnixConfigurations.payton = robotnix.lib.robotnixSystem ./robotnix/payton.nix; - nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { - pkgs = import nixpkgs {system = "aarch64-linux";}; - modules = [ - ./modules/nix-on-droid/nix-on-droid.nix - { - home-manager.useGlobalPkgs = true; - home-manager.users."andromeda" = { - imports = [ - ./modules/nix-on-droid/home.nix - ]; - }; - } - ]; - }; }; } diff --git a/machines.nix b/machines.nix index 7315d95..ca73b07 100644 --- a/machines.nix +++ b/machines.nix @@ -30,8 +30,8 @@ ./modules/nixos/sway.nix # apps + # UNFREE ./modules/nixos/steam.nix - ./modules/nixos/phoenix.nix # substitutors ./substitutors.nix diff --git a/modules/nix-on-droid/home.nix b/modules/nix-on-droid/home.nix deleted file mode 100644 index c545105..0000000 --- a/modules/nix-on-droid/home.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - home = { - username = "andromeda"; - homeDirectory = "/home/${config.home.username}"; - stateVersion = "26.05"; - packages = [ - pkgs.brush - pkgs.dust - pkgs.fzf - pkgs.glow - pkgs.nix-output-monitor - pkgs.ranger - pkgs.rip2 - pkgs.ripgrep - pkgs.tree - pkgs.zoxide - ]; - }; - programs = { - bash = { - enable = true; - shellAliases = { - neofetch = "fastfetch"; - ls = lib.mkForce "lsd"; - ll = lib.mkForce "lsd -l"; - l = "lsd -la"; - cd = "z"; - gg = "git log --oneline --abbrev-commit --all --graph --decorate --color"; - md = "glow"; - }; - bashrcExtra = '' - PS1="\u@\h:\w$" - eval "$(zoxide init bash)" - ''; - }; - btop = { - enable = true; - settings = { - theme_background = false; - vim_keys = true; - rounded_corners = false; - graph_symbol = "braille"; - update_ms = 150; - proc_sorting = "cpu lazy"; - proc_gradient = false; - proc_left = true; - cpu_single_graph = true; - cpu_bottom = true; - clock_format = "/user@/host:/uptime@%H:%M"; - background_update = true; - mem_graphs = false; - mem_below_net = true; - show_swap = false; - only_physical = true; - show_io_stat = true; - io_mode = false; - io_graph_combined = false; - }; - }; - fastfetch.enable = true; - git = { - enable = true; - settings = { - user = { - name = config.home.username; - email = "${config.home.username}@android"; - }; - init.defaultBranch = "master"; - }; - }; - home-manager.enable = true; - lsd.enable = true; - nvf = { - enable = true; - settings.vim = { - autocomplete.nvim-cmp.enable = false; - formatter.conform-nvim = { - enable = true; - setupOpts.format_on_save = { - lsp_format = "fallback"; - timeout_ms = 5000; - }; - }; - lsp.otter-nvim.enable = true; - git.enable = true; - keymaps = [ - { - key = ""; - mode = ["i" "n" "v" "c"]; - action = ""; - } - { - key = ""; - mode = ["i" "n" "v" "c"]; - action = ""; - } - { - key = ""; - mode = ["i" "n" "v" "c"]; - action = ""; - } - { - key = ""; - mode = ["i" "n" "v" "c"]; - action = ""; - } - { - key = "jj"; - mode = ["i"]; - action = ""; - } - { - key = "kk"; - mode = ["i"]; - action = ""; - } - { - key = "jk"; - mode = ["i"]; - action = ""; - } - { - key = "kj"; - mode = ["i"]; - action = ""; - } - { - key = ""; - mode = ["i"]; - action = ""; - } - ]; - languages = { - nix = { - enable = true; - format.enable = true; - lsp.enable = true; - }; - haskell = { - enable = true; - lsp.enable = true; - }; - }; - lineNumberMode = "relative"; - options = { - tabstop = 2; - shiftwidth = 2; - expandtab = true; - smarttab = true; - foldmethod = "indent"; - number = true; - colorcolumn = "80"; - }; - statusline.lualine.enable = true; - syntaxHighlighting = true; - }; - }; - ssh.enable = true; - }; -} diff --git a/modules/nix-on-droid/nix-on-droid.nix b/modules/nix-on-droid/nix-on-droid.nix deleted file mode 100644 index 5e1b9b1..0000000 --- a/modules/nix-on-droid/nix-on-droid.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - environment.packages = [pkgs.git]; - system.stateVersion = "26.05"; - nix.settings.experimentalFeatures = ["nix-command" "flakes"]; -} diff --git a/modules/nixos/networking/networks/109-199-104-83.nix b/modules/nixos/networking/networks/109-199-104-83.nix index ad599b1..9064e2f 100644 --- a/modules/nixos/networking/networks/109-199-104-83.nix +++ b/modules/nixos/networking/networks/109-199-104-83.nix @@ -1,6 +1,6 @@ { networking = { - useDHCP = false; + useNetworkd = true; hostName = "109-199-104-83"; firewall = { enable = true; @@ -8,6 +8,36 @@ allowedUDPPorts = [80 443]; }; }; + + # the following is from nixos-bite + + # netif=$(ip -6 route show default | sed -r 's|.*default.+?dev ([a-z0-9]+).*|\1|' | head -n1) + # netifx=enx$(ip link show dev "$netif" | grep link/ether | sed -r 's|.*link/ether ([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}).*|\1\2\3\4\5\6|') + # netip6=$(ip -6 address show dev "$netif" scope global | sed -z -r 's|.*inet6 ([0-9a-f:]+)/([0-9]+).*|"\1/\2"|') + # netgw6=$(ip -6 route show dev "$netif" default | sed -r 's|.*default.+?via ([0-9a-f:]+).*|"\1"|' | head -n1) + # netip4=$(ip -4 address show dev "$netif" scope global | sed -z -r 's|.*inet ([0-9.]+)/([0-9]+).*|"\1/\2"|') + # netgw4=$(ip -4 route show dev "$netif" default | sed -r 's|.*default.+?via ([0-9.]+).*|"\1"|' | head -n1) + + # route="" + # [[ -n "${netgw4}" ]] && route="$route { Gateway = $netgw4; GatewayOnLink = true; }" + # [[ -n "${netgw6}" ]] && route="$route { Gateway = $netgw6; }" + + # dns='"2620:fe::fe" "9.9.9.9"' + + # systemd.network = { + # enable = true; + # networks."40-wan" = { + # matchConfig.name = "enx0050565f4fff"; + # address = ["2a02:c207:2299:8419::1/64" "109.199.104.83/20"]; + # routes = [ + # { + # Gateway = ["109.199.96.1" "fe80::1"]; + # GatewayOnLink = true; + # } + # ]; + # dns = ["9.9.9.9" "2620:fe::fe"]; + # }; + # }; services.cloud-init = { enable = true; network.enable = true; diff --git a/modules/nixos/phoenix.nix b/modules/nixos/phoenix.nix deleted file mode 100644 index a656f7f..0000000 --- a/modules/nixos/phoenix.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: { - options.programs.firefox.phoenix = { - enable = - lib.mkEnableOption "Enable privacy & security hardening of Firefox using the Phoenix configs" - // { - default = true; - }; - firefoxPackages = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = ["firefox"]; - description = "The name of Firefox packages of current pkgs to patch with phoenix config and policy."; - }; - }; - config = let - cfg = config.programs.firefox.phoenix; - in - lib.mkIf cfg.enable { - assertions = [ - { - assertion = !pkgs.stdenv.isDarwin; - message = "Phoenix module has not been ported to nix-darwin yet. Contributions welcomed."; - } - ]; - environment.etc."firefox/defaults/pref/phoenix-desktop.js".source = "${pkgs.phoenix}/pref/phoenix-desktop.js"; - environment.etc."firefox/phoenix/userjs".source = "${pkgs.phoenix}/userjs"; - environment.etc."firefox/phoenix/configs".source = "${pkgs.phoenix}/configs"; - environment.etc."firefox/phoenix/assets".source = "${pkgs.phoenix}/assets"; - programs.firefox.policies = - (builtins.fromJSON (builtins.readFile "${pkgs.phoenix}/policies.json")).policies; - nixpkgs.overlays = [ - (import ../../overlays/phoenix.nix) - ( - final: prev: - builtins.listToAttrs ( - map (p: lib.nameValuePair p (final.withPhoenix prev.${p})) cfg.firefoxPackages - ) - ) - ]; - }; -} diff --git a/overlays/phoenix.nix b/overlays/phoenix.nix deleted file mode 100644 index ad9bab4..0000000 --- a/overlays/phoenix.nix +++ /dev/null @@ -1,21 +0,0 @@ -final: prev: let - phoenix-src = prev.fetchFromGitHub { - owner = "celenityy"; - repo = "Phoenix"; - rev = "07d9be8cbf938962f9847b0970274b885ff48792"; - hash = "sha256-I9pKhfhAz3JsGBLIqr9MNycTEQn0Bc3jzf0mKeWLlsE="; - }; -in { - phoenix = (final.callPackage (import "${phoenix-src}/nix/package.nix") - { - }).overrideAttrs { - patches = [ - ../patches/0001-autoDisableScopes-unlocked.patch - ]; - }; - withPhoenix = firefoxPackage: - firefoxPackage.override { - extraPoliciesFiles = ["${final.phoenix}/policies.json"]; - extraPrefsFiles = ["${final.phoenix}/phoenix.cfg"]; - }; -} diff --git a/patches/0001-autoDisableScopes-unlocked.patch b/patches/0001-autoDisableScopes-unlocked.patch deleted file mode 100644 index 3a1391b..0000000 --- a/patches/0001-autoDisableScopes-unlocked.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1eeab7cf3b5d41e3e10959ef2ff5298eac86c9fa Mon Sep 17 00:00:00 2001 -From: andromeda -Date: Sun, 25 Jan 2026 10:41:03 +0100 -Subject: [PATCH] autoDisableScopes unlocked - ---- - build/phoenix-unified.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/phoenix-unified.js b/build/phoenix-unified.js -index e183890e..fd58b176 100644 ---- a/build/phoenix-unified.js -+++ b/build/phoenix-unified.js -@@ -2204,7 +2204,7 @@ pref("xpinstall.whitelist.add.NoScript.PBM", "https://noscript.net^privateBrowsi - // https://archive.is/DYjAM - // https://support.mozilla.org/kb/deploying-firefox-with-extensions - // https://searchfox.org/firefox-main/rev/82e2435f/toolkit/mozapps/extensions/internal/AddonSettings.sys.mjs#125 --pref("extensions.autoDisableScopes", 15, locked); // [DEFAULT - non-Thunderbird] Defense in depth, ensures sideloaded extensions are always disabled by default... -+pref("extensions.autoDisableScopes", 15); // [DEFAULT - non-Thunderbird] Defense in depth, ensures sideloaded extensions are always disabled by default... - pref("extensions.enabledScopes", 5); // [HIDDEN] - pref("extensions.installDistroAddons", false); // [HIDDEN - non-Android] [DEFAULT - Android] - pref("extensions.sideloadScopes", 0); // [HIDDEN] --- -2.52.0 - diff --git a/robotnix/payton.nix b/robotnix/payton.nix deleted file mode 100644 index b0f7786..0000000 --- a/robotnix/payton.nix +++ /dev/null @@ -1,13 +0,0 @@ -{...}: { - flavor = "lineageos"; - - # motorola moto x4 (payton) - device = "payton"; - - # latest supported version: - # check https://download.lineageos.org/devices/payton/builds - flavorVersion = "22.2"; - - apps.fdroid.enable = true; - microg.enable = true; -} diff --git a/users.nix b/users.nix index d528ff0..f0876bd 100644 --- a/users.nix +++ b/users.nix @@ -3,9 +3,7 @@ lib, machine, ... -}: let - machines = import ./machines.nix; -in { +}: { users.users = builtins.mapAttrs (name: value: lib.mkIf (builtins.elem name machine.users) value) @@ -27,12 +25,18 @@ in { "andromeda" = { directories = [ ".backups" + ".gnupg" + ".local/share/AAAAXY" ".local/share/Anki2" ".local/share/chat.fluffy.fluffychat" + ".local/share/Mindustry" + ".local/share/Steam" ".local/share/zoxide" ".ssh" + ".steam" "conf" "Downloads" + "conf_v1" "pp" ]; files = [ diff --git a/users/andromeda/home.nix b/users/andromeda/home.nix index af9c361..0a8fe8f 100644 --- a/users/andromeda/home.nix +++ b/users/andromeda/home.nix @@ -26,6 +26,7 @@ in { homeDirectory = "/home/${config.home.username}"; stateVersion = "26.05"; packages = [ + pkgs.aaaaxy pkgs.acpi pkgs.agenix pkgs.alacritty @@ -35,9 +36,11 @@ in { pkgs.dust pkgs.fluffychat pkgs.fzf + pkgs.geeqie pkgs.glow pkgs.grim pkgs.jmtpfs + pkgs.mindustry-wayland pkgs.nix-output-monitor pkgs.npins pkgs.ranger @@ -127,6 +130,9 @@ in { }; }; gh.enable = true; + gpg = { + enable = true; + }; home-manager.enable = true; lsd.enable = true; nvf = { @@ -216,4 +222,8 @@ in { }; ssh.enable = true; }; + services.gpg-agent = { + enable = true; + pinentry.package = pkgs.pinentry-curses; + }; }