From dfbf68052f0490b06b7a2289717e2b1dcf86560b Mon Sep 17 00:00:00 2001 From: macronova Date: Sat, 26 Apr 2025 11:43:58 +0800 Subject: [PATCH] Use docker --- flake.lock | 58 ++++++++++++++++++++--------------------- linux/quasar/device.nix | 11 ++------ linux/quasar/gui.nix | 2 +- 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index c093617..ecf2c06 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "candy-icons": { "flake": false, "locked": { - "lastModified": 1738178806, - "narHash": "sha256-Y56gg6dROTaKGvIwsi7xZim8Bc66x3zAWPTsAjYjALc=", + "lastModified": 1745449297, + "narHash": "sha256-aXAtVtsJC9MdkhUJWZnOQteaR005+KnPxFrEepfomCk=", "ref": "refs/heads/master", - "rev": "907231dcea3008532ec912757d106b4155937331", - "revCount": 1259, + "rev": "1763fc1f476e6c2ba7ca8df878645815b808ebca", + "revCount": 1300, "type": "git", "url": "https://github.com/EliverLara/candy-icons" }, @@ -159,11 +159,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "lastModified": 1745627989, + "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=", "owner": "nix-community", "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", + "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "yorha-sound-theme": "yorha-sound-theme" }, "locked": { - "lastModified": 1739053809, - "narHash": "sha256-f09f16njUWxRneGUWbJpjy/UocpXWMgEI7xPMPeBAM4=", + "lastModified": 1745551900, + "narHash": "sha256-PN/zlruDzK1M9SgWMclDUXaNrp6xaoFPy5bbYd2693Y=", "ref": "refs/heads/main", - "rev": "397ae7f5ec32fcce5e702ec8de69151c1c1b3b0d", - "revCount": 34, + "rev": "0cfc86bb27f951f65a588e90973b4eeeea542045", + "revCount": 35, "type": "git", "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, @@ -362,11 +362,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -515,11 +515,11 @@ "sweet-ambar-blue": { "flake": false, "locked": { - "lastModified": 1738884950, - "narHash": "sha256-w64CckY8o9dFITJJicdpOAKjA+UCLY/p+y0ZYbmYd8o=", + "lastModified": 1745099863, + "narHash": "sha256-szZ/y/gLnGzTfAIg2pGBhy4axMJ49zGMVolhPTMGzKc=", "ref": "Ambar-Blue", - "rev": "7b266b8dfa45d1af0b0044c3d66e56af837fdec5", - "revCount": 321, + "rev": "b54cc159a43644dadf92cf88d81f77606ae46bb6", + "revCount": 329, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, @@ -532,11 +532,11 @@ "sweet-ambar-blue-dark": { "flake": false, "locked": { - "lastModified": 1738883097, - "narHash": "sha256-sfG6LaJdrWGQvT1ixLP4Z48tv4UHoG25imFMD5AYn98=", + "lastModified": 1745099718, + "narHash": "sha256-8zv645W69igfRmKsxXIFz6E3mFmx+ewNZWhm6N/JJ0I=", "ref": "Ambar-Blue-Dark", - "rev": "cfb490ef620d897d6d6729aa3c21885ffa1e49b9", - "revCount": 404, + "rev": "16760c356de1d87601064bcbd9d6c81a60e61d2c", + "revCount": 413, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, @@ -549,11 +549,11 @@ "sweet-folders": { "flake": false, "locked": { - "lastModified": 1679179505, - "narHash": "sha256-QexfqXH5a1IEhKBRjWSMdrEvThvLRzd4M32Xti1DCGE=", + "lastModified": 1739589885, + "narHash": "sha256-Pb3xsNKM5yGT4uAUxrCds1JSSvU/whhTJcmqiM7EW+4=", "ref": "refs/heads/master", - "rev": "b2192ff1412472f036fdf9778c6b9dbcb6c044ec", - "revCount": 14, + "rev": "40a5d36e50437901c7eaa1119bb9ae8006e2fe5c", + "revCount": 29, "type": "git", "url": "https://github.com/EliverLara/Sweet-folders" }, diff --git a/linux/quasar/device.nix b/linux/quasar/device.nix index 2f470f8..28bba1d 100644 --- a/linux/quasar/device.nix +++ b/linux/quasar/device.nix @@ -45,18 +45,11 @@ in { udev.packages = [pkgs.via]; }; - systemd.services."user@".serviceConfig.Delegate = "cpu cpuset memory pids"; - - users.users.${userName}.extraGroups = ["adbusers" "cdrom"]; + users.users.${userName}.extraGroups = ["adbusers" "cdrom" "docker"]; virtualisation = { containers.enable = true; - podman = { - enable = true; - autoPrune.enable = true; - defaultNetwork.settings.dns_enabled = true; - dockerCompat = true; - }; + docker.enable = true; spiceUSBRedirection.enable = true; }; } diff --git a/linux/quasar/gui.nix b/linux/quasar/gui.nix index 2035974..6ac97a2 100644 --- a/linux/quasar/gui.nix +++ b/linux/quasar/gui.nix @@ -7,6 +7,7 @@ in { home-manager.users.${userName} = { config, + osConfig, pkgs, ... }: let @@ -96,7 +97,6 @@ in { enable = true; pinentryPackage = pkgs.pinentry-qt; }; - podman.enable = true; xsettingsd = { enable = true; settings = {