diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2023-05-26 13:09:02 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2023-05-26 13:09:02 +0200 |
commit | 8d39e40bcf6da354c2e5ff2f1b4b8981c5fcf7f5 (patch) | |
tree | 2aa5f320d974970d781d82952adf0ef041c649e6 | |
parent | 2ad3bd527e7460568097024a4c33d08c4689e65c (diff) | |
download | nixos-8d39e40bcf6da354c2e5ff2f1b4b8981c5fcf7f5.tar nixos-8d39e40bcf6da354c2e5ff2f1b4b8981c5fcf7f5.tar.gz nixos-8d39e40bcf6da354c2e5ff2f1b4b8981c5fcf7f5.tar.bz2 nixos-8d39e40bcf6da354c2e5ff2f1b4b8981c5fcf7f5.tar.xz nixos-8d39e40bcf6da354c2e5ff2f1b4b8981c5fcf7f5.zip |
...
-rw-r--r-- | accounts/gkleen@sif/xmonad/xmonad.hs | 7 | ||||
-rw-r--r-- | hosts/vidhar/pgbackrest/default.nix | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs index d6e32aab..906cc663 100644 --- a/accounts/gkleen@sif/xmonad/xmonad.hs +++ b/accounts/gkleen@sif/xmonad/xmonad.hs | |||
@@ -896,7 +896,7 @@ myKeys' conf host = Map.fromList $ | |||
896 | safeSpawn "loginctl" ["lock-session", sessId] | 896 | safeSpawn "loginctl" ["lock-session", sessId] |
897 | ) | 897 | ) |
898 | , ((modm .|. shiftMask, xK_s ), safeSpawn "systemctl" ["suspend"]) | 898 | , ((modm .|. shiftMask, xK_s ), safeSpawn "systemctl" ["suspend"]) |
899 | , ((modm .|. shiftMask, xK_h ), safeSpawn "systemctl" ["poweroff"]) | 899 | , ((modm .|. shiftMask, xK_h ), inputPromptWithCompl xPConfigMonospace "systemctl" powerActCompl ?+ powerAct) |
900 | , ((modm, xK_v ), windows copyToAll) -- @@ Make focused window always visible | 900 | , ((modm, xK_v ), windows copyToAll) -- @@ Make focused window always visible |
901 | , ((modm .|. shiftMask, xK_v ), killAllOtherCopies) -- @@ Toggle window state back | 901 | , ((modm .|. shiftMask, xK_v ), killAllOtherCopies) -- @@ Toggle window state back |
902 | , ((modm .|. shiftMask, xK_g ), windowPrompt xPConfig Goto wsWindows) | 902 | , ((modm .|. shiftMask, xK_g ), windowPrompt xPConfig Goto wsWindows) |
@@ -925,3 +925,8 @@ myKeys' conf host = Map.fromList $ | |||
925 | modm = XMonad.modMask conf | 925 | modm = XMonad.modMask conf |
926 | 926 | ||
927 | brCycle = [0, 1 % 100, 1 % 10, 1 % 4, 1 % 2, 3 % 4, 1] | 927 | brCycle = [0, 1 % 100, 1 % 10, 1 % 4, 1 % 2, 3 % 4, 1] |
928 | |||
929 | powerActWords = ["poweroff", "reboot", "hibernate", "suspend"] | ||
930 | powerActCompl = mkComplFunFromList' xPConfigMonospace powerActWords | ||
931 | powerAct act | act `elem` powerActWords = safeSpawn "systemctl" $ pure act | ||
932 | | otherwise = return () | ||
diff --git a/hosts/vidhar/pgbackrest/default.nix b/hosts/vidhar/pgbackrest/default.nix index c3ba603a..899b0e0f 100644 --- a/hosts/vidhar/pgbackrest/default.nix +++ b/hosts/vidhar/pgbackrest/default.nix | |||
@@ -41,7 +41,8 @@ in { | |||
41 | 41 | ||
42 | "srv01.uniworx.de" = { | 42 | "srv01.uniworx.de" = { |
43 | pg1-host-type = "tls"; | 43 | pg1-host-type = "tls"; |
44 | pg1-host = "2a03:4000:5e:e55::"; | 44 | # pg1-host = "2a03:4000:5e:e55::"; |
45 | pg1-host = "srv01.uniworx.de"; | ||
45 | pg1-host-ca-file = toString ./ca/ca.crt; | 46 | pg1-host-ca-file = toString ./ca/ca.crt; |
46 | pg1-host-cert-file = toString ./ca/vidhar.crt; | 47 | pg1-host-cert-file = toString ./ca/vidhar.crt; |
47 | pg1-host-key-file = config.sops.secrets."pgbackrest.key".path; | 48 | pg1-host-key-file = config.sops.secrets."pgbackrest.key".path; |