From 6bfea61ffe7195e9a66d69092314567b36e1b78a Mon Sep 17 00:00:00 2001 From: blake Date: Fri, 7 Nov 2025 15:35:45 -0600 Subject: [PATCH] restructure slippi into gaming subdir --- bin/rebuild | 3 +- users/blake/dots/programs/default.nix | 6 ++-- users/blake/dots/programs/slippi/default.nix | 38 -------------------- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 users/blake/dots/programs/slippi/default.nix diff --git a/bin/rebuild b/bin/rebuild index 8c397a6..5b7c674 100755 --- a/bin/rebuild +++ b/bin/rebuild @@ -27,7 +27,8 @@ git status --short read -rp "commit message: " commit_msg echo "rebuilding nixos with flake.nix..." #if ! sudo nixos-rebuild switch --flake .#"$hostname" 2>&1 | tee "$logfile"; then -if ! nh os switch 2>&1 | tee "$logfile"; then +#if ! nh os switch 2>&1 | tee "$logfile"; then +if ! sudo nixos-rebuild switch --flake .#"$hostname" 2>&1 | tee "$logfile"; then echo "rebuild failed; exited with no commit" exit 1 fi diff --git a/users/blake/dots/programs/default.nix b/users/blake/dots/programs/default.nix index 9059059..284889c 100644 --- a/users/blake/dots/programs/default.nix +++ b/users/blake/dots/programs/default.nix @@ -9,6 +9,7 @@ in { imports = [ ./_media-tools ./_browsers + ./_gaming ./thunderbird ./libreoffice @@ -18,7 +19,6 @@ in { ./zathura ./discord - ./slippi ]; options.dots.programs = { @@ -29,6 +29,7 @@ in { dots = { media-tools.enable = lib.mkDefault true; browsers.enable = lib.mkDefault true; + gaming.enable = lib.mkDefault true; thunderbird.enable = lib.mkDefault true; libreoffice.enable = lib.mkDefault true; @@ -37,9 +38,6 @@ in { bitwarden.enable = lib.mkDefault true; discord.enable = lib.mkDefault true; zathura.enable = lib.mkDefault true; - - slippi.enable = lib.mkDefault true; - }; }; } diff --git a/users/blake/dots/programs/slippi/default.nix b/users/blake/dots/programs/slippi/default.nix deleted file mode 100644 index 6f2b254..0000000 --- a/users/blake/dots/programs/slippi/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - pkgs, - lib, - inputs, - config, - ... -}: let - program = "slippi"; - cfg = config.dots.${program}; - home_dir = config.home.homeDirectory; -in { - options.dots.${program} = { - enable = lib.mkEnableOption "enables ${program}"; - }; - - imports = [ - inputs.slippi.homeManagerModules.default - ]; - - config = lib.mkIf cfg.enable { - - # enable with home-manager - # this is very nice thanks to: https://github.com/lytedev/slippi-nix - # that link is where the options can be found - slippi-launcher = { - enable = true; - isoPath = "${home_dir}/documents/melee/isos/Super Smash Bros. Melee (USA) (En,Ja) (v1.02).iso"; - launchMeleeOnPlay = false; - useMonthlySubfolders = true; # for replays - # in the event this is out of date, versions can be specificed here - #netplayVersion = "2.11.10"; - #netplayHash = "sha256-d1iawMsMwFElUqFmwWAD9rNsDdQr2LKscU8xuJPvxYg="; - #playbackVersion = "2.11.10"; - #playbackHash = "sha256-d1iawMsMwFElUqFmwWAD9rNsDdQr2LKscU8xuJPvxYg="; - }; - - }; -}