diff --git a/flake.nix b/flake.nix index 1233ef5..37b8ee5 100644 --- a/flake.nix +++ b/flake.nix @@ -91,6 +91,10 @@ specialArgs = { inherit flakes; + doctrine = import "${trivionomicon}/doctrine" { + inherit pkgs; + namespace = "sys"; + }; }; }; @@ -126,6 +130,10 @@ extraSpecialArgs = { inherit flakes; + doctrine = import "${trivionomicon}/doctrine" { + inherit pkgs; + namespace = "hm"; + }; }; }; diff --git a/sys/modules/default.nix b/sys/modules/default.nix index 842c05a..27d719e 100644 --- a/sys/modules/default.nix +++ b/sys/modules/default.nix @@ -15,6 +15,5 @@ ./bluetooth.nix ./net.nix ./steam.nix - ./xdg.nix ]; } diff --git a/sys/modules/xdg.nix b/sys/modules/xdg.nix deleted file mode 100644 index f9d9c54..0000000 --- a/sys/modules/xdg.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.local.sys.xdg; -in { - options.local.sys.xdg = { - enable = mkEnableOption "xdg settings"; - }; - config = mkIf cfg.enable { - xdg.portal = { - enable = true; - wlr.enable = true; - extraPortals = [pkgs.xdg-desktop-portal-gtk]; - xdgOpenUsePortal = true; - # warning: xdg-desktop-portal 1.17 reworked how portal implementations are loaded, you - # should either set `xdg.portal.config` or `xdg.portal.configPackages` - # to specify which portal backend to use for the requested interface. - # - # https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in - # - # If you simply want to keep the behaviour in < 1.17, which uses the first - # portal implementation found in lexicographical order, use the following: - # - # xdg.portal.config.common.default = "*"; - config.common.default = "*"; - }; - }; -} diff --git a/sys/platforms/posixlycorrect/default.nix b/sys/platforms/posixlycorrect/default.nix index ece541d..2550b55 100644 --- a/sys/platforms/posixlycorrect/default.nix +++ b/sys/platforms/posixlycorrect/default.nix @@ -20,7 +20,6 @@ virtualisation.enable = true; androidSupport.enable = true; steam.enable = true; - xdg.enable = true; users = { fabian = { @@ -31,6 +30,8 @@ }; }; + trivium.sway.enable = true; + programs.i3lock.enable = true; networking = {