From b81fe9488efbaa84756a007c744fe54228e973eb Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 1 Apr 2024 12:41:27 +1300 Subject: [PATCH] refactor(gaming): remove slippi and nix-gaming flake --- home/modules/desktop/default.nix | 2 +- home/modules/desktop/gaming/default.nix | 6 +++--- .../desktop/gaming/factorio/default.nix | 11 +++++++++++ home/modules/desktop/gaming/slippi/default.nix | 18 ------------------ home/profile/default.nix | 1 + home/profile/gaming/default.nix | 2 +- home/user/ooks/ooksdesk/default.nix | 2 +- 7 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 home/modules/desktop/gaming/factorio/default.nix delete mode 100644 home/modules/desktop/gaming/slippi/default.nix diff --git a/home/modules/desktop/default.nix b/home/modules/desktop/default.nix index 3de80a9..4682b53 100644 --- a/home/modules/desktop/default.nix +++ b/home/modules/desktop/default.nix @@ -10,6 +10,6 @@ #./utility -- still needs to be implemented ./wayland # -- almost done, need to implement eww ./productivity - # ./gaming + ./gaming ]; } diff --git a/home/modules/desktop/gaming/default.nix b/home/modules/desktop/gaming/default.nix index 1d9f803..ef13135 100644 --- a/home/modules/desktop/gaming/default.nix +++ b/home/modules/desktop/gaming/default.nix @@ -3,12 +3,12 @@ { imports = [ - ./slippi + ./factorio ]; options.homeModules.desktop.gaming = { - slippi = { - enable = lib.mkEnableOption "Enable Slippi home module"; + factorio = { + enable = lib.mkEnableOption "Enable factorio home module"; }; }; diff --git a/home/modules/desktop/gaming/factorio/default.nix b/home/modules/desktop/gaming/factorio/default.nix new file mode 100644 index 0000000..c0b8c9d --- /dev/null +++ b/home/modules/desktop/gaming/factorio/default.nix @@ -0,0 +1,11 @@ +{ lib, config, pkgs, ... }: + +let + cfg=config.homeModules.desktop.gaming.factorio; +in + +{ + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ factorio ]; + }; +} diff --git a/home/modules/desktop/gaming/slippi/default.nix b/home/modules/desktop/gaming/slippi/default.nix deleted file mode 100644 index c2eb669..0000000 --- a/home/modules/desktop/gaming/slippi/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ inputs, config, lib, ... }: - -let - cfg = config.homeModules.desktop.gaming.slippi; -in - -{ - -imports = [ - inputs.ssbm-nix.homeManagerModule -]; - - config = lib.mkIf cfg.enable { - ssbm = { - slippi-launcher.enable = true; - }; - }; -} diff --git a/home/profile/default.nix b/home/profile/default.nix index f4a5411..c0ed525 100644 --- a/home/profile/default.nix +++ b/home/profile/default.nix @@ -12,6 +12,7 @@ in ./hyprland #./creative ./productivity + ./gaming ]; options = { diff --git a/home/profile/gaming/default.nix b/home/profile/gaming/default.nix index 5a55bef..3d58277 100644 --- a/home/profile/gaming/default.nix +++ b/home/profile/gaming/default.nix @@ -11,7 +11,7 @@ in config = lib.mkIf cfg.enable { homeModules.desktop = { gaming = { - slippi.enable = true; + factorio.enable = true; }; }; }; diff --git a/home/user/ooks/ooksdesk/default.nix b/home/user/ooks/ooksdesk/default.nix index f02238a..f455171 100644 --- a/home/user/ooks/ooksdesk/default.nix +++ b/home/user/ooks/ooksdesk/default.nix @@ -5,7 +5,7 @@ ../../../profile ]; - activeProfiles = ["base" "hyprland" "productivity"]; + activeProfiles = ["base" "hyprland" "productivity" "gaming"]; home.sessionVariables.HN = "ooksdesk";