diff --git a/flake.lock b/flake.lock index 8690bc2..06001d8 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1748845209, - "narHash": "sha256-fWfMFjKNxzGjqW2XZHDg6cSyHcir8rk8ev9DHo2YkTA=", + "lastModified": 1749307245, + "narHash": "sha256-dkNXh5EtuwlEqWuct2D6uvZFmzDqZ77Jowr8FCQYERY=", "owner": "aylur", "repo": "astal", - "rev": "7f2292f0792ffc9b127d4788b3dd3f104b5374b2", + "rev": "6d809a701f68dceaf451842e858b6cd566b14c94", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1748832438, - "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", + "lastModified": 1749200714, + "narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=", "owner": "nix-community", "repo": "disko", - "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", + "rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1748939465, - "narHash": "sha256-fOiTgpPr066aliyPWQvP3ckvH1pvUFx660U4GVysYyM=", + "lastModified": 1749388797, + "narHash": "sha256-zdrCX8aZ2pR6OOD2GETQIwJC/tSRZHwIG7yc5dv0uiA=", "owner": "karaolidis", "repo": "home-manager", - "rev": "9168d85abbf984b7f0891095405841212dfd3f8b", + "rev": "fcda314e910a6afcd932d5d836934d3011fa195d", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748939429, - "narHash": "sha256-IrdLwKWucb9xj1dOpbXHuaV1GzHYx51ZGF4wbl5NPwU=", + "lastModified": 1749390405, + "narHash": "sha256-o7D6AM4Zf+gsK/vK45KPqbot5Kx0Ha3i1eluq06ognI=", "owner": "karaolidis", "repo": "nixpkgs", - "rev": "7b041169050f5a7b6a15bacdb68a935cee995fe7", + "rev": "e00baa7bbdde781acf8d3bb65f36ec7a043fc12e", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1748935843, - "narHash": "sha256-ZTbwljoJXgkGAPlYz0GIcNiXQNfPFHe2A0Dqe9KDyPA=", + "lastModified": 1749388083, + "narHash": "sha256-WVbICtwfjwr/dPeWjvJkPpI6kaE2Aeg+nDM6faRKZME=", "owner": "nix-community", "repo": "NUR", - "rev": "032af0a65aa867a6209718033995f5ba73fee543", + "rev": "7502ee791dfee0ed3f32382eaabb4d73451f472b", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "quadlet-nix": { "locked": { - "lastModified": 1748295604, - "narHash": "sha256-GDqEYNafnb4kpz3OUhfrpS7ys5r8QR/t1t7fPA6XLRQ=", + "lastModified": 1749099346, + "narHash": "sha256-5gi/YaLVsFztGvVH45eB6jsBmZf+HnvDeSA9RXUqbcY=", "owner": "SEIAROTg", "repo": "quadlet-nix", - "rev": "5f4bc5934584eb2b6f0b8e3e13041fe76f2947b6", + "rev": "d4119a3423f938427252ba8bbdbe8ce040751864", "type": "github" }, "original": { @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1748752728, - "narHash": "sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o=", + "lastModified": 1749357231, + "narHash": "sha256-AbrPgGFVYR45TlYLHYTppayG0xzOG9XXhi+1j3Klbw8=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "0e03de40d5128eb2ad600c98f57cf5db2cdf3240", + "rev": "03783416f7416715c52166d4e8ba0492a7149397", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1748243702, - "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", + "lastModified": 1749194973, + "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", + "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", "type": "github" }, "original": { diff --git a/hosts/common/configs/system/docker/default.nix b/hosts/common/configs/system/docker/default.nix deleted file mode 100644 index 0a819f3..0000000 --- a/hosts/common/configs/system/docker/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, pkgs, ... }: -{ - virtualisation.docker = { - enable = true; - enableOnBoot = false; - storageDriver = "btrfs"; - - daemon.settings = { - experimental = true; - ipv6 = true; - fixed-cidr-v6 = "fd00::/80"; - }; - - autoPrune = { - enable = true; - flags = [ "--all" ]; - }; - }; - - environment = { - persistence."/persist/state"."/var/lib/docker".create = "directory"; - systemPackages = with pkgs; [ docker-compose ]; - }; - - systemd = { - services.docker.after = [ config.environment.persistence."/persist/state"."/var/lib/docker".mount ]; - sockets.docker.after = [ config.environment.persistence."/persist/state"."/var/lib/docker".mount ]; - }; -} diff --git a/hosts/common/configs/user/console/dive/default.nix b/hosts/common/configs/user/console/dive/default.nix index 52899b1..e75e1c4 100644 --- a/hosts/common/configs/user/console/dive/default.nix +++ b/hosts/common/configs/user/console/dive/default.nix @@ -16,8 +16,7 @@ in home.packages = with pkgs; [ dive ]; xdg.configFile."dive/config.yaml" = lib.mkIf ( - (config.virtualisation.podman.enable || hmConfig.services.podman.enable) - && !(config.virtualisation.docker.enable || config.virtualisation.docker.rootless.enable) + config.virtualisation.podman.enable || hmConfig.services.podman.enable ) { source = (pkgs.formats.yaml { }).generate "config.yaml" { container-engine = "podman"; }; }; }; } diff --git a/hosts/common/configs/user/console/docker/default.nix b/hosts/common/configs/user/console/docker/default.nix deleted file mode 100644 index fe1c93b..0000000 --- a/hosts/common/configs/user/console/docker/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - user ? throw "user argument is required", - home ? throw "home argument is required", - rootless ? true, -}: -{ - config, - lib, - pkgs, - ... -}: -lib.mkMerge [ - { - virtualisation.docker.rootless = { - enable = rootless; - setSocketVariable = true; - enableOnBoot = false; - storageDriver = "btrfs"; - - daemon.settings = { - experimental = true; - ipv6 = true; - fixed-cidr-v6 = "fd00::/80"; - }; - - autoPrune = { - enable = true; - flags = [ "--all" ]; - }; - }; - - home-manager.users.${user} = { - home = { - packages = with pkgs; [ docker-compose ]; - sessionVariables.DOCKER_CONFIG = "${home}/.config/docker"; - }; - }; - } - (lib.mkIf rootless { - environment.persistence."/persist/state"."${home}/.local/share/docker".create = "directory"; - - systemd.user = { - services.docker.after = [ - config.environment.persistence."/persist/state"."${home}/.local/share/docker".mount - ]; - sockets.docker.after = [ - config.environment.persistence."/persist/state"."${home}/.local/share/docker".mount - ]; - }; - }) - (lib.mkIf (!rootless) { users.users.${user}.extraGroups = [ "docker" ]; }) -] diff --git a/hosts/common/configs/user/gui/astal/config/widget/components/Launcher.tsx b/hosts/common/configs/user/gui/astal/config/widget/components/Launcher.tsx index 8bd2826..c3e2359 100644 --- a/hosts/common/configs/user/gui/astal/config/widget/components/Launcher.tsx +++ b/hosts/common/configs/user/gui/astal/config/widget/components/Launcher.tsx @@ -4,7 +4,9 @@ export default () => (