From 91c899d278656e30b59553bd29c08e50cb8cc9a4 Mon Sep 17 00:00:00 2001 From: "Gustavo \"Guz\" L. de Mello" Date: Tue, 19 Mar 2024 13:08:21 -0300 Subject: [PATCH] chore: commit --- hosts/desktop/default/home.nix | 4 ---- hosts/desktop/shared-configuration.nix | 19 +++++++++++++++ hosts/desktop/shared-home.nix | 2 ++ modules/client/default.nix | 32 ++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 modules/client/default.nix diff --git a/hosts/desktop/default/home.nix b/hosts/desktop/default/home.nix index b29970a..ceb5595 100644 --- a/hosts/desktop/default/home.nix +++ b/hosts/desktop/default/home.nix @@ -7,9 +7,5 @@ options.default.home = { }; config = { librewolf.profiles.guz.isDefault = true; - - services.flatpak.packages = [ - "com.valvesoftware.Steam" - ]; }; } diff --git a/hosts/desktop/shared-configuration.nix b/hosts/desktop/shared-configuration.nix index 5f6c155..07f05d7 100644 --- a/hosts/desktop/shared-configuration.nix +++ b/hosts/desktop/shared-configuration.nix @@ -39,6 +39,11 @@ }) ]; + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ ]; + + virtualisation.waydroid.enable = true; + sops.defaultSopsFile = ../../secrets/desktop-secrets.yaml; sops.defaultSopsFormat = "yaml"; @@ -82,6 +87,15 @@ wl-clipboard ]; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-run" + ]; + programs.steam = { + enable = true; + }; + # Enable the X11 windowing system. services.xserver.enable = true; @@ -109,6 +123,11 @@ hardware.opentabletdriver.enable = true; + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + services.blueman.enable = true; + # hardware.pulseaudio.enable = true; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/hosts/desktop/shared-home.nix b/hosts/desktop/shared-home.nix index 3529d15..0685067 100644 --- a/hosts/desktop/shared-home.nix +++ b/hosts/desktop/shared-home.nix @@ -81,6 +81,8 @@ gimp inkscape pureref + gamemode + lutris # (pkgs.writeShellScriptBin "my-hello" '' # echo "Hello, ${config.home.username}!" diff --git a/modules/client/default.nix b/modules/client/default.nix new file mode 100644 index 0000000..ade62c0 --- /dev/null +++ b/modules/client/default.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.client; +in +{ + imports = [ ]; + options.client = with lib; with lib.types; { + enable = mkEnableOption ""; + name = mkOption { + type = str; + default = "client"; + }; + flakeDir = mkOption { + type = str; + }; + localIp = mkOption { + type = nullOr str; + default = null; + }; + ip = mkOption { + type = nullOr str; + default = cfg.localIp; + }; + users = mkOption { + type = attrsOf (submodule { ... }: { + options = { }; + }); + }; + }; + config = lib.mkIf cfg.enable { }; +}