diff --git a/flake.lock b/flake.lock index 71d7e6ec..0e05220c 100644 --- a/flake.lock +++ b/flake.lock @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1721662678, - "narHash": "sha256-KfUBEg4kMnZFnNXpdfNggIEwmcqjYf3EdwcgkKckovw=", + "lastModified": 1729580721, + "narHash": "sha256-HceXVqBUk5ktSSWlh0h1QTGrx0tqEVBH3UpczrucNuI=", "owner": "donovanglover", "repo": "sakaya", - "rev": "6d6e60253b4eba83d53b2d878b3f4447251942f5", + "rev": "f7607744ae172ca68f3a87a919868b618c04d0c2", "type": "github" }, "original": { diff --git a/modules/containers.nix b/modules/containers.nix index 007bd945..dc29cc43 100644 --- a/modules/containers.nix +++ b/modules/containers.nix @@ -60,27 +60,20 @@ in hostAddress = "192.168.100.34"; localAddress = "192.168.100.49"; config = + { nix-config, pkgs, ... }: { - nix-config, - config, - lib, - pkgs, - ... - }: + imports = + with nix-config.nixosModules; + [ + shell + desktop + system + stylix + fonts + ] + ++ (with nix-config.inputs.sakaya.nixosModules; [ sakaya ]); - let - inherit (nix-config.inputs.sakaya.packages.${pkgs.system}) sakaya; - inherit (config.modules.system) username; - inherit (lib) getExe; - in - { - imports = with nix-config.nixosModules; [ - shell - desktop - system - stylix - fonts - ]; + sakaya.enable = true; home-manager.sharedModules = with nix-config.homeModules; [ fish @@ -95,15 +88,12 @@ in nixpkgs.overlays = builtins.attrValues nix-config.overlays; environment = { - systemPackages = - (with pkgs; [ - wineWowPackages.waylandFull - winetricks - ]); + systemPackages = with pkgs; [ + wineWowPackages.waylandFull + winetricks + ]; - variables = { - TERM = "xterm-kitty"; - }; + variables.TERM = "xterm-kitty"; sessionVariables = { WAYLAND_DISPLAY = "wayland-1"; @@ -124,17 +114,6 @@ in }; hardware.graphics.enable = true; - - networking.firewall.allowedTCPPorts = [ 39493 ]; - - systemd.services.sakaya = { - enable = true; - description = "sakaya server"; - unitConfig.Type = "simple"; - path = with pkgs; [ su ]; - serviceConfig.ExecStart = "/usr/bin/env su ${username} --command=${getExe sakaya}"; - wantedBy = [ "multi-user.target" ]; - }; }; };