From c5b4ea0e92b4767f2ceed20087b4be7ce0be4b41 Mon Sep 17 00:00:00 2001 From: Andre Date: Thu, 19 Dec 2024 15:57:35 -0500 Subject: [PATCH 1/6] Apps: hacky fix for group error --- modules/nixos/apps/recording/default.nix | 5 ----- modules/nixos/users/aires/default.nix | 5 +++-- modules/nixos/users/gremlin/default.nix | 1 + 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/nixos/apps/recording/default.nix b/modules/nixos/apps/recording/default.nix index 2e54f67..149660e 100644 --- a/modules/nixos/apps/recording/default.nix +++ b/modules/nixos/apps/recording/default.nix @@ -34,11 +34,6 @@ in # For details, see https://github.com/Genymobile/scrcpy/blob/master/doc/v4l2.md programs.adb.enable = true; - users.users = { - aires.extraGroups = lib.mkIf config.${namespace}.users.aires.enable [ "adbusers" ]; - gremlin.extraGroups = lib.mkIf config.${namespace}.users.gremlin.enable [ "adbusers" ]; - }; - # Add a virtual camera to use with Droidcam boot = { extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback.out ]; diff --git a/modules/nixos/users/aires/default.nix b/modules/nixos/users/aires/default.nix index 1109625..5e40ef9 100644 --- a/modules/nixos/users/aires/default.nix +++ b/modules/nixos/users/aires/default.nix @@ -29,10 +29,11 @@ in "input" "networkmanager" "plugdev" - "tss" + "tss" # For access to TPM devices "wheel" "users" - ]; # tss group has access to TPM devices + (lib.mkIf config.programs.adb.enable "adbusers") + ]; # Allow systemd services to run even while aires is logged out linger = true; diff --git a/modules/nixos/users/gremlin/default.nix b/modules/nixos/users/gremlin/default.nix index d0e8d3d..b7bfe09 100644 --- a/modules/nixos/users/gremlin/default.nix +++ b/modules/nixos/users/gremlin/default.nix @@ -29,6 +29,7 @@ in "networkmanager" "input" "users" + (lib.mkIf config.programs.adb.enable "adbusers") ]; # Allow systemd services to keep running even while gremlin is logged out From 633b14d8d88bd0b7d534161545ed156275ef59bb Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 21 Dec 2024 00:12:26 +0000 Subject: [PATCH 2/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/394571358ce82dff7411395829aa6a3aad45b907' (2024-12-16) → 'github:nixos/nixpkgs/b47fd6fa00c6afca88b8ee46cfdb00e104f50bca' (2024-12-19) • Updated input 'treefmt': 'github:numtide/treefmt-nix/76159fc74eeac0599c3618e3601ac2b980a29263' (2024-12-18) → 'github:numtide/treefmt-nix/65712f5af67234dad91a5a4baee986a8b62dbf8f' (2024-12-20) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2247204..b7fa774 100644 --- a/flake.lock +++ b/flake.lock @@ -325,11 +325,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", "type": "github" }, "original": { @@ -459,11 +459,11 @@ ] }, "locked": { - "lastModified": 1734543842, - "narHash": "sha256-/QceWozrNg915Db9x/Ie5k67n9wKgGdTFng+Z1Qw0kE=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "76159fc74eeac0599c3618e3601ac2b980a29263", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { From 0692d675ac599098ddb794349254c2960092dcf5 Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 21 Dec 2024 13:22:39 -0500 Subject: [PATCH 3/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/b47fd6fa00c6afca88b8ee46cfdb00e104f50bca' (2024-12-19) → 'github:nixos/nixpkgs/1c6e20d41d6a9c1d737945962160e8571df55daa' (2024-12-20) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b7fa774..b38b2dd 100644 --- a/flake.lock +++ b/flake.lock @@ -325,11 +325,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734600368, - "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", + "lastModified": 1734737257, + "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", "type": "github" }, "original": { From 1d25f7443c0180fa7a1551f8a42bc81b2bfddb71 Mon Sep 17 00:00:00 2001 From: Andre Date: Sun, 22 Dec 2024 00:14:33 +0000 Subject: [PATCH 4/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'lanzaboote': 'github:nix-community/lanzaboote/2f48272f34174fd2a5ab3df4d8a46919247be879' (2024-11-18) → 'github:nix-community/lanzaboote/26a59c1b037e43f82b0fada2a218aeb128bc5d21' (2024-12-21) • Updated input 'lanzaboote/crane': 'github:ipetkov/crane/a4ca93905455c07cb7e3aca95d4faf7601cba458' (2024-11-03) → 'github:ipetkov/crane/ef80ead953c1b28316cc3f8613904edc2eb90c28' (2024-11-08) • Updated input 'lanzaboote/nixpkgs': 'github:NixOS/nixpkgs/650fe87347086b30a6dbcc32b55987ce5a23c6ae' (2024-11-03) → 'github:NixOS/nixpkgs/04386ac325a813047fc314d4b4d838a5b1e3c7fe' (2024-11-18) • Updated input 'lanzaboote/pre-commit-hooks-nix': 'github:cachix/pre-commit-hooks.nix/af8a16fe5c264f5e9e18bcee2859b40a656876cf' (2024-10-30) → 'github:cachix/pre-commit-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0' (2024-11-11) • Updated input 'lanzaboote/pre-commit-hooks-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/194846768975b7ad2c4988bdb82572c00222c0d7' (2024-07-07) → 'github:NixOS/nixpkgs/d063c1dd113c91ab27959ba540c0d9753409edf3' (2024-11-04) • Updated input 'lanzaboote/rust-overlay': 'github:oxalica/rust-overlay/8d1b40f8dfd7539aaa3de56e207e22b3cc451825' (2024-11-03) → 'github:oxalica/rust-overlay/0be641045af6d8666c11c2c40e45ffc9667839b5' (2024-11-18) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index b38b2dd..93285d1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1730652660, - "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -207,11 +207,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731941836, - "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=", + "lastModified": 1734820165, + "narHash": "sha256-qkPmnVYb6w2KdipyigI9ipNR7A8dsFStBRH5sZ+rmqA=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879", + "rev": "26a59c1b037e43f82b0fada2a218aeb128bc5d21", "type": "github" }, "original": { @@ -277,11 +277,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730642263, - "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=", + "lastModified": 1731919951, + "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae", + "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", "type": "github" }, "original": { @@ -293,11 +293,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -353,11 +353,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1730601085, - "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { From a4620703b37e8511642620255592d72d8da3762d Mon Sep 17 00:00:00 2001 From: Andre Date: Sun, 22 Dec 2024 14:58:05 -0500 Subject: [PATCH 5/6] Apps: add Floorp browser --- modules/nixos/ui/flatpak/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nixos/ui/flatpak/default.nix b/modules/nixos/ui/flatpak/default.nix index cf73ddf..6bc6ed7 100644 --- a/modules/nixos/ui/flatpak/default.nix +++ b/modules/nixos/ui/flatpak/default.nix @@ -19,8 +19,9 @@ in type = lib.types.listOf lib.types.str; default = [ "com.github.tchx84.Flatseal" - "org.mozilla.firefox" "io.github.ungoogled_software.ungoogled_chromium" + "org.mozilla.firefox" + "one.ablaze.floorp" ]; example = lib.literalExpression "[ \"com.valvesoftware.Steam\" ]"; }; From 4a583d60b8435b585eb610fd2d3cbb63037d01d0 Mon Sep 17 00:00:00 2001 From: Andre Date: Mon, 23 Dec 2024 00:18:55 +0000 Subject: [PATCH 6/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/b12e314726a4226298fe82776b4baeaa7bcf3dcd' (2024-12-16) → 'github:NixOS/nixos-hardware/e8516a23524cc9083f5a02a8d64d14770e4c7c09' (2024-12-22) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/d3c42f187194c26d9f0309a8ecc469d6c878ce33' (2024-12-17) → 'github:nixos/nixpkgs/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507' (2024-12-19) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 93285d1..b747ad5 100644 --- a/flake.lock +++ b/flake.lock @@ -261,11 +261,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1734862644, + "narHash": "sha256-04xesW7HITdF5WUmNM39WD4tkEERk3Ez2W1nNvdIvIw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "e8516a23524cc9083f5a02a8d64d14770e4c7c09", "type": "github" }, "original": { @@ -309,11 +309,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": {