From 1cbc923e747ee1980af1049a00ef64dee41502ac Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Mon, 10 Oct 2022 18:35:14 +0200 Subject: [PATCH] Move steam to desktop module --- machines/loki/configuration.nix | 2 +- modules/desktop/default.nix | 2 -- users/erwin/desktop.nix | 10 ++++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix index a1456b1..25d908f 100644 --- a/machines/loki/configuration.nix +++ b/machines/loki/configuration.nix @@ -9,7 +9,7 @@ in users = { erwin = { enable = true; - home-manager = true; + desktop = true; }; builder.enable = true; }; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 0d283da..3bc78ec 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -28,8 +28,6 @@ in seahorse.enable = true; - steam.enable = true; - sway = { enable = true; wrapperFeatures = { diff --git a/users/erwin/desktop.nix b/users/erwin/desktop.nix index 7447bad..deb9fdb 100644 --- a/users/erwin/desktop.nix +++ b/users/erwin/desktop.nix @@ -11,7 +11,7 @@ with lib; let in { options.eboskma.users.erwin = { - home-manager = mkEnableOption "home-manager"; + desktop = mkEnableOption "desktop"; terminal = mkOption { type = types.str; default = "foot"; @@ -20,8 +20,8 @@ in }; config = - mkIf cfg.home-manager { - home-manager.users.erwin = mkIf cfg.home-manager { + mkIf cfg.desktop { + home-manager.users.erwin = mkIf cfg.desktop { _module.args.flake-inputs = inputs; programs.home-manager.enable = true; @@ -127,7 +127,7 @@ in imv iotop (jetbrains.clion.override { jdk = pkgs.jetbrains.jdk; }) - # kicad + kicad libnotify libreoffice mpv @@ -227,6 +227,8 @@ in ] ++ (map (mod: (../../home-manager/modules + "/${mod}")) (builtins.attrNames (builtins.readDir ../../home-manager/modules))); }; + programs.steam.enable = true; + programs.wireshark = { enable = true; package = pkgs.wireshark;