extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-06-03 00:15:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

containers(wine): use sakaya module from flake

Browse Source
This commit is contained in:
Donovan Glover 2024-10-22 03:18:27 -04:00
parent 9504beec01
commit 248e8392fb
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@ -208,11 +208,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721662678, "lastModified": 1729580721,
"narHash": "sha256-KfUBEg4kMnZFnNXpdfNggIEwmcqjYf3EdwcgkKckovw=", "narHash": "sha256-HceXVqBUk5ktSSWlh0h1QTGrx0tqEVBH3UpczrucNuI=",
"owner": "donovanglover", "owner": "donovanglover",
"repo": "sakaya", "repo": "sakaya",
"rev": "6d6e60253b4eba83d53b2d878b3f4447251942f5", "rev": "f7607744ae172ca68f3a87a919868b618c04d0c2",
"type": "github" "type": "github"
}, },
"original": { "original": {

55
modules/containers.nix
View File

@ -60,27 +60,20 @@ in
hostAddress = "192.168.100.34"; hostAddress = "192.168.100.34";
localAddress = "192.168.100.49"; localAddress = "192.168.100.49";
config = config =
{ nix-config, pkgs, ... }:
{ {
nix-config, imports =
config, with nix-config.nixosModules;
lib, [
pkgs, shell
... desktop
}: system
stylix
fonts
]
++ (with nix-config.inputs.sakaya.nixosModules; [ sakaya ]);
let sakaya.enable = true;
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
];
home-manager.sharedModules = with nix-config.homeModules; [ home-manager.sharedModules = with nix-config.homeModules; [
fish fish
@ -95,15 +88,12 @@ in
nixpkgs.overlays = builtins.attrValues nix-config.overlays; nixpkgs.overlays = builtins.attrValues nix-config.overlays;
environment = { environment = {
systemPackages = systemPackages = with pkgs; [
(with pkgs; [ wineWowPackages.waylandFull
wineWowPackages.waylandFull winetricks
winetricks ];
]);
variables = { variables.TERM = "xterm-kitty";
TERM = "xterm-kitty";
};
sessionVariables = { sessionVariables = {
WAYLAND_DISPLAY = "wayland-1"; WAYLAND_DISPLAY = "wayland-1";
@ -124,17 +114,6 @@ in
}; };
hardware.graphics.enable = true; 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" ];
};
}; };
}; };