From d8ff719ba7e2b27f009001b49e522cc0675ddc18 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 17 Mar 2025 11:05:39 +0000 Subject: [PATCH] add mgba; change from podman to docker; --- configuration/base/kde.nix | 1 + configuration/modules/virtualisation.nix | 10 ++++---- devices/tuxedo/configuration.nix | 2 +- devices/tuxedo/home.nix | 3 ++- flake.lock | 30 ++++++++++++------------ home-manager/gaming.nix | 1 + 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/configuration/base/kde.nix b/configuration/base/kde.nix index 23e3fea..3c61beb 100644 --- a/configuration/base/kde.nix +++ b/configuration/base/kde.nix @@ -20,6 +20,7 @@ in services.displayManager.sddm = { enable = true; wayland.enable = true; + autoNumlock = true; settings = { Wayland = { CompositorCommand = kwin; diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index d00a115..5b56d76 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -10,18 +10,16 @@ enable = true; qemu.vhostUserPackages = [ pkgs.virtiofsd ]; }; - # remember to add the necessary users to the podman group - podman = { + # remember to add the necessary users to the docker group + docker = { enable = true; - # Create a `docker` alias for podman, to use it as a drop-in replacement - dockerCompat = true; - # Required for containers under podman-compose to be able to talk to each other. - defaultNetwork.settings.dns_enabled = true; + storageDriver = "btrfs"; }; waydroid = { enable = true; }; }; programs.virt-manager.enable = true; + # environment.systemPackages = with pkgs;[ podman-compose ]; } diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 1d5203b..9d94750 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -48,7 +48,7 @@ users.users.worble = { initialPassword = "password"; isNormalUser = true; - extraGroups = [ "wheel" "gamemode" "podman" "cdrom" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "wheel" "gamemode" "docker" "cdrom" ]; # Enable ‘sudo’ for the user. linger = true; }; diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 64d169c..3aab415 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { imports = [ @@ -77,6 +77,7 @@ gpu-api = "vulkan"; hwdec = "vulkan"; screenshot-directory = "/mnt/HDD1/Pictures/"; + screenshot-template = "%F/%F_snapshot_%P"; glsl-shaders = "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl"; }; extraInput = '' diff --git a/flake.lock b/flake.lock index 6cf7615..1b79fb7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1740485968, - "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1741185283, - "narHash": "sha256-Wk+2uWk4WhtB1LtXt3smd0K2JZ5qeZj9LldGTmfEldo=", + "lastModified": 1741916884, + "narHash": "sha256-x5449hmPlq6A1nmEii0+uCwYv1a0URLa78RbnKZ+Rls=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c7a72aa0e5f72bc6a9d8dfaf33e4de013c960f7b", + "rev": "69cd2482309b5a806f0cf6a7306e47b8b155f014", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741196730, - "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "type": "github" }, "original": { diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index bb92adc..386001f 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -5,5 +5,6 @@ steamguard-cli bottles inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryubing + mgba ]; }