diff --git a/hosts/nb-01.cloonar.com/modules/sway/sway.nix b/hosts/nb-01.cloonar.com/modules/sway/sway.nix index 811025a..b84d25c 100644 --- a/hosts/nb-01.cloonar.com/modules/sway/sway.nix +++ b/hosts/nb-01.cloonar.com/modules/sway/sway.nix @@ -1,6 +1,8 @@ { config, pkgs, lib, ... }: let + cfg = config.cloonar.sway; + dbus-sway-environment = pkgs.writeTextFile { name = "dbus-sway-environment"; destination = "/bin/dbus-sway-environment"; @@ -13,7 +15,20 @@ let ''; }; + sway-conf = builtins.readFile ./sway.conf + cfg.additionalConfig; in { + + options.cloonar.sway.additionalConfig = { + dataDir = mkOption { + type = types.str; + default = ""; + description = lib.mdDoc '' + Additional sway config + ''; + }; + }; + + config = { imports = [ ./social.nix ./signal-work.nix @@ -71,20 +86,8 @@ in { wtype apache-directory-studio firefox - yubikey-personalization-gui ]; - # nixpkgs.config.permittedInsecurePackages = [ - # "qtwebkit-5.212.0-alpha4" - # "electron-13.6.9" - # ]; - # nixpkgs.config.allowBroken = true; - - programs._1password-gui = { - enable = true; - polkitPolicyOwners = [ "dominik" ]; - }; - programs.light.enable = true; fonts.fonts = with pkgs; [ @@ -115,4 +118,5 @@ in { "xdg/waybar/style.css".text = builtins.readFile ./waybar.css; "xdg/foot/foot.ini".text = builtins.readFile ./foot.ini; }; + }; } diff --git a/hosts/steamdeck.cloonar.com/configuration.nix b/hosts/steamdeck.cloonar.com/configuration.nix index 05007e3..a6f6c16 100644 --- a/hosts/steamdeck.cloonar.com/configuration.nix +++ b/hosts/steamdeck.cloonar.com/configuration.nix @@ -18,6 +18,10 @@ ./hardware-configuration.nix ]; + cloonar.sway.additionalConfig = '' + output eDP-1 disable + ''; + programs.steam.enable = true; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [