JustScreaMy/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: JustScreaMy:e61c0c8298996124c6d090a701ede2b788f9b33e
Branches Tags
JustScreaMy:master
..
compare: JustScreaMy:7cec1eede3c70dd372693f8b9d0cb1b5c2e4e270
Branches Tags
JustScreaMy:master

No commits in common. "e61c0c8298996124c6d090a701ede2b788f9b33e" and "7cec1eede3c70dd372693f8b9d0cb1b5c2e4e270" have entirely different histories.
e61c0c8298 ... 7cec1eede3

3 changed files with 15 additions and 22 deletions
Show stats Expand all files Collapse all files

30
flake.lock
View file

@ -32,11 +32,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738148035, "lastModified": 1737038063,
"narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -52,11 +52,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738448366, "lastModified": 1737762889,
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1738175805, "lastModified": 1737806078,
"narHash": "sha256-fPjaARmK522JLJ7wxFebxG4eE/3HHSmuAA78iAZ+A7g=", "narHash": "sha256-FjgNPBLMCpmwtJT5LiQYkM2lDY+yAmW1ZN1Idx7QeDg=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "d4c75a33c4a7a16bf87cfd804fb5444a1ec53d49", "rev": "83cc6a28afc4155fd3fe28274f6b5287f51ed2b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,11 +82,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1738471961, "lastModified": 1737751639,
"narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=", "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "537286c3c59b40311e5418a180b38034661d2536", "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738410390, "lastModified": 1737885589,
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
hosts/lenar/default.nix
View file

@ -47,7 +47,6 @@
enable = true; enable = true;
changeDefaultNetwork = true; changeDefaultNetwork = true;
}; };
waydroid.enable = true;
podman.enable = true; podman.enable = true;
de.gnome = { de.gnome = {
enable = true; enable = true;

6
nixosModules/dev/containers.nix
View file

@ -23,15 +23,11 @@ let
podman-cfg = { podman-cfg = {
enable = lib.mkEnableOption "Whether to enable Podman."; enable = lib.mkEnableOption "Whether to enable Podman.";
}; };
waydroid-cfg = {
enable = lib.mkEnableOption "Whence to enable Waydroid.";
};
in in
{ {
options.krop = { options.krop = {
docker = docker-cfg; docker = docker-cfg;
podman = podman-cfg; podman = podman-cfg;
waydroid = waydroid-cfg;
}; };
config = { config = {
@ -51,8 +47,6 @@ in
enable = true; enable = true;
}; };
virtualisation.waydroid.enable = cfg.waydroid.enable;
users.users.krop = lib.mkIf (cfg.docker.addUserToGroup && cfg.docker.enable) { users.users.krop = lib.mkIf (cfg.docker.addUserToGroup && cfg.docker.enable) {
extraGroups = [ "docker" ]; extraGroups = [ "docker" ];
}; };