From 7871b2f1b4178f60829d65f2eab6a81690d15167 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 20 Sep 2022 11:24:06 +0200 Subject: [PATCH] minor changes --- .../hosts/olympus/hedgedoc/configuration.nix | 27 ++++++++-------- nixos/hosts/thalassa/null/configuration.nix | 4 --- nixos/hosts/thalassa/null/home/hyprland.nix | 31 +++++++++++++------ 3 files changed, 35 insertions(+), 27 deletions(-) diff --git a/nixos/hosts/olympus/hedgedoc/configuration.nix b/nixos/hosts/olympus/hedgedoc/configuration.nix index 1f06d8d..3856ad0 100644 --- a/nixos/hosts/olympus/hedgedoc/configuration.nix +++ b/nixos/hosts/olympus/hedgedoc/configuration.nix @@ -76,19 +76,20 @@ in secretKey = "$MINIO_SECRET_KEY"; }; email = true; - oauth2 = let url = "https://id.0x76.dev"; in - { - providerName = "authentik"; - clientID = "$AUTHENTIK_CLIENTID"; - clientSecret = "$AUTHENTIK_CLIENTSECRET"; - scope = "openid email profile"; - userProfileURL = "${url}/application/o/userinfo/"; - tokenURL = "${url}/application/o/token/"; - authorizationURL = "${url}/application/o/authorize/"; - userProfileUsernameAttr = "preferred_username"; - userProfileDisplayNameAttr = "name"; - userProfileEmailAttr = "email"; - }; + # Disable until fixed + # oauth2 = let url = "https://id.0x76.dev"; in + # { + # providerName = "authentik"; + # clientID = "$AUTHENTIK_CLIENTID"; + # clientSecret = "$AUTHENTIK_CLIENTSECRET"; + # scope = "openid email profile"; + # userProfileURL = "${url}/application/o/userinfo/"; + # tokenURL = "${url}/application/o/token/"; + # authorizationURL = "${url}/application/o/authorize/"; + # userProfileUsernameAttr = "preferred_username"; + # userProfileDisplayNameAttr = "name"; + # userProfileEmailAttr = "email"; + # }; }; }; } diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix index 306c681..eb08f21 100644 --- a/nixos/hosts/thalassa/null/configuration.nix +++ b/nixos/hosts/thalassa/null/configuration.nix @@ -85,7 +85,6 @@ in wifi.backend = "iwd"; firewallBackend = "nftables"; }; - # networking.interfaces.wlp0s20f3.useDHCP = true; fileSystems."/".options = [ "compress=zstd" ]; # Filesystem dedup @@ -123,9 +122,6 @@ in portal = { enable = true; wlr.enable = true; - extraPortals = with pkgs; [ - # xdg-desktop-portal-gtk - ]; }; }; services.dbus.enable = true; diff --git a/nixos/hosts/thalassa/null/home/hyprland.nix b/nixos/hosts/thalassa/null/home/hyprland.nix index d213720..45b2467 100644 --- a/nixos/hosts/thalassa/null/home/hyprland.nix +++ b/nixos/hosts/thalassa/null/home/hyprland.nix @@ -71,16 +71,27 @@ bind=SUPER,9,workspace,9 bind=SUPER,0,workspace,10 - bind=SUPERSHIFT,1,movetoworkspace,1 - bind=SUPERSHIFT,2,movetoworkspace,2 - bind=SUPERSHIFT,3,movetoworkspace,3 - bind=SUPERSHIFT,4,movetoworkspace,4 - bind=SUPERSHIFT,5,movetoworkspace,5 - bind=SUPERSHIFT,6,movetoworkspace,6 - bind=SUPERSHIFT,7,movetoworkspace,7 - bind=SUPERSHIFT,8,movetoworkspace,8 - bind=SUPERSHIFT,9,movetoworkspace,9 - bind=SUPERSHIFT,0,movetoworkspace,10 + bind=ALT,1,movetoworkspace,1 + bind=ALT,2,movetoworkspace,2 + bind=ALT,3,movetoworkspace,3 + bind=ALT,4,movetoworkspace,4 + bind=ALT,5,movetoworkspace,5 + bind=ALT,6,movetoworkspace,6 + bind=ALT,7,movetoworkspace,7 + bind=ALT,8,movetoworkspace,8 + bind=ALT,9,movetoworkspace,9 + bind=ALT,0,movetoworkspace,10 + + bind=SUPERSHIFT,1,movetoworkspacesilent,1 + bind=SUPERSHIFT,2,movetoworkspacesilent,2 + bind=SUPERSHIFT,3,movetoworkspacesilent,3 + bind=SUPERSHIFT,4,movetoworkspacesilent,4 + bind=SUPERSHIFT,5,movetoworkspacesilent,5 + bind=SUPERSHIFT,6,movetoworkspacesilent,6 + bind=SUPERSHIFT,7,movetoworkspacesilent,7 + bind=SUPERSHIFT,8,movetoworkspacesilent,8 + bind=SUPERSHIFT,9,movetoworkspacesilent,9 + bind=SUPERSHIFT,0,movetoworkspacesilent,10 bind=SUPER,mouse_down,workspace,e+1 bind=SUPER,mouse_up,workspace,e-1