From f92d20c06078e92a1bb2d79e3afb9449a7b84614 Mon Sep 17 00:00:00 2001 From: Caroline Larimore Date: Sat, 8 Feb 2025 19:54:47 -0800 Subject: migration: wine --- hosts/c-pc/configuration.nix | 3 --- hosts/c-pc/home.nix | 2 -- snowfall/homes/x86_64-linux/c/default.nix | 2 ++ snowfall/modules/home/tools/default.nix | 11 +++++++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/hosts/c-pc/configuration.nix b/hosts/c-pc/configuration.nix index 34c2ec6..726a971 100644 --- a/hosts/c-pc/configuration.nix +++ b/hosts/c-pc/configuration.nix @@ -20,9 +20,6 @@ environment.systemPackages = with pkgs; [ (writeShellScriptBin "toys" "nix-shell -p cmatrix asciiquarium pipes cowsay figlet neofetch") - - wineWowPackages.stable - winetricks jellyfin diff --git a/hosts/c-pc/home.nix b/hosts/c-pc/home.nix index 1167777..9501c46 100644 --- a/hosts/c-pc/home.nix +++ b/hosts/c-pc/home.nix @@ -17,8 +17,6 @@ directories = [ ".local/share/applications" - ".wine" - ".config/jellyfin" ".local/share/jellyfin" ".cache/jellyfin" diff --git a/snowfall/homes/x86_64-linux/c/default.nix b/snowfall/homes/x86_64-linux/c/default.nix index 834091e..cdeb8cb 100644 --- a/snowfall/homes/x86_64-linux/c/default.nix +++ b/snowfall/homes/x86_64-linux/c/default.nix @@ -24,6 +24,8 @@ with lib; with lib.${namespace}; { prismlauncher.extra.rusherhack.enable = true; }; + tools.wine.enable = true; + tools.git = { name = "Caroline Larimore"; email = "caroline@larimo.re"; diff --git a/snowfall/modules/home/tools/default.nix b/snowfall/modules/home/tools/default.nix index da6741a..9627d0f 100644 --- a/snowfall/modules/home/tools/default.nix +++ b/snowfall/modules/home/tools/default.nix @@ -1,8 +1,15 @@ -{ lib, namespace, ... }: +{ lib, pkgs, namespace, ... }: with lib; with lib.${namespace}; { - imports = [ + imports = with pkgs; [ (mkSimpleTool "cloc" {}) (mkSimpleTool "ffmpeg" {}) + (mkSimpleTool "wine" { + packages = [ + wineWowPackages.stable + winetricks + ]; + persist = [ ".wine" ]; + }) ]; } -- cgit v1.2.3