diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix index fa4c873..822dc15 100644 --- a/hosts/sopp/default.nix +++ b/hosts/sopp/default.nix @@ -128,8 +128,8 @@ }); element-desktop = pkgs.element-desktop.overrideAttrs (old: { desktopItem = old.desktopItem.override (old: { - #exec = "element-desktop --disable-gpu --in-process-gpu %u"; - exec = "env NIXOS_OZONE_WL=1 element-desktop %u"; + exec = "element-desktop --disable-gpu --in-process-gpu %u"; + #exec = "env NIXOS_OZONE_WL=1 element-desktop %u"; }); }); }); diff --git a/profiles/web/docs/pdoc.nix b/profiles/web/docs/pdoc.nix index 2f282c7..c14af93 100644 --- a/profiles/web/docs/pdoc.nix +++ b/profiles/web/docs/pdoc.nix @@ -48,6 +48,7 @@ let "base64" "zipfile" ]; + pdoc-modules = [ {name="more-itertools"; literal="more_itertools";} "altair" @@ -166,7 +167,6 @@ let toName = x: if builtins.isString x then x else x.name; toLiteral = x: if builtins.isString x then x else x.literal; - mkPdoc = use-pdoc3: isBuiltin: pkg: let description = if isBuiltin then "builtin" diff --git a/profiles/web/todos.md b/profiles/web/todos.md index 8d5a9a7..44cc6eb 100644 --- a/profiles/web/todos.md +++ b/profiles/web/todos.md @@ -1,3 +1,4 @@ +* [ ] tailscale/wireguard * [ ] mime-types - filetype -> program register * [ ] .mod * [ ] don't use pulsar for text/*, i'd rather use bat or micro @@ -9,18 +10,5 @@ * [ ] kukkee * [ ] rallly * [ ] Rocketchat - A self-hosted discord/slack alternative -* [ ] upterm / tmate - Secure terminal-session sharing - - ``` - services.uptermd = { - enable = false; - openFirewall = true; - #listenAddress # default is "[::]"; - #port = 2222; # default is 2222, uses ssh - #extraFlags - #hostKey = null; - }; - ``` - * [ ] a DAW profile * https://libreddit.noximilien.pbsds.net/r/linuxaudio/comments/wntpyd/linux_plugins_thread_2022/ diff --git a/users/pbsds/default.nix b/users/pbsds/default.nix index 63ea1a2..0c26da4 100644 --- a/users/pbsds/default.nix +++ b/users/pbsds/default.nix @@ -46,8 +46,10 @@ "wheel" "nixbld" # TODO: NAS stuff + ] ++ lib.optionals config.virtualisation.docker.enable [ + "docker" + ]; - ] ++ lib.optional config.virtualisation.docker.enable "docker"; initialHashedPassword = "$6$yNgxTHcP1UYkNwuZ$1sBehnKgPjVnDe0tSV8kyfynWpfjDzuohZX6SoTrMnYFa3/aiMOtI6JppYevl.M6qYhBIT0XBvL6TqSSFWn8B/"; # TODO: fetch from github? diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index 59623bd..4f42ce7 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -116,7 +116,7 @@ #TODO: vpn # TODO: wayland - clip = "xclip -sel clip -t text/plain -rmlastnl -i"; + clip = "( if command -v wl-copy >/dev/null; then wl-copy --trim-newline --type text/plain; else xclip -sel clip -t text/plain -rmlastnl -i; fi )"; # TODO: ps1? pwd-fqdn = ''echo "$(whoami)@$(hostname -f):$(printf "%q" "$(realpath .)/")"'';