diff --git a/modules/home/gui/base/default.nix b/modules/home/gui/base/default.nix index a60533a..ccdffce 100644 --- a/modules/home/gui/base/default.nix +++ b/modules/home/gui/base/default.nix @@ -12,6 +12,7 @@ telegram-desktop pavucontrol keepassxc + nextcloud-client gramps ]; }; diff --git a/modules/home/wayland/hyprland/config.nix b/modules/home/wayland/hyprland/config.nix index c65527a..eefb673 100755 --- a/modules/home/wayland/hyprland/config.nix +++ b/modules/home/wayland/hyprland/config.nix @@ -1,5 +1,6 @@ { lib, config, pkgs, ... }: { config = lib.mkIf (config.usercfg.wm == "Wayland") { + wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; diff --git a/modules/nixos/gui/xserver/default.nix b/modules/nixos/gui/xserver/default.nix index ebb1b2c..c191f87 100644 --- a/modules/nixos/gui/xserver/default.nix +++ b/modules/nixos/gui/xserver/default.nix @@ -1,5 +1,6 @@ { lib, config, pkgs, ... }: { config = lib.mkIf (config.syscfg.make.gui) { + programs.xwayland.enable = true; services.xserver = { enable = true; videoDrivers = [ "amd" ]; diff --git a/modules/nixos/system/xdg/default.nix b/modules/nixos/system/xdg/default.nix index 5f0355e..190d377 100644 --- a/modules/nixos/system/xdg/default.nix +++ b/modules/nixos/system/xdg/default.nix @@ -15,12 +15,12 @@ GBM_BACKEND = "amd-drm"; __GL_GSYNC_ALLOWED = "0"; __GL_VRR_ALLOWED = "1"; - WLR_DRM_NO_ATOMIC = "1"; __GLX_VENDOR_LIBRARY_NAME = "amd"; + WLR_DRM_NO_ATOMIC = "1"; _JAVA_AWT_WM_NONREPARENTING = "1"; QT_QPA_PLATFORM = "wayland"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - GDK_BACKEND = "wayland"; + # GDK_BACKEND = "wayland"; WLR_NO_HARDWARE_CURSORS = "1"; MOZ_ENABLE_WAYLAND = "1"; # WLR_BACKEND = "vulkan"; diff --git a/modules/shared/sops/common.yaml b/modules/shared/sops/common.yaml index 29fa3e9..521353d 100755 --- a/modules/shared/sops/common.yaml +++ b/modules/shared/sops/common.yaml @@ -23,7 +23,7 @@ vpn_ssh_pub: ENC[AES256_GCM,data:K7+ZMxQ=,iv:xp1ghLqP5sk91feAIxC1JpHOkCzBfYBO9rH vpn_wg_priv: ENC[AES256_GCM,data:YS2NMqSZdH6gTQq89sWNLna6sLFIzR+uDFurFP1s+3Pe1+QP/SAiX81PZfc=,iv:Ovm3ir8ia5793yYPsKrscpqc4A6B6r270hpx9pWmR1o=,tag:asWYQrENr5ip8kHdb2mkYw==,type:str] vpn_wg_pub: ENC[AES256_GCM,data:orLTPlTD5Y6bimDcc+BFJytQFER2POfgcOFEk6zcKkvuq/GyU8bKgKLxuyM=,iv:TVHw+yVhlDJFz/8HYqI3qT85hGzgx+3Bj7mT0mr3dFE=,tag:EKDs8gE8RJMGQVfcYLj9Jw==,type:str] pgp_key: ENC[AES256_GCM,data:nEMur/Uq,iv:2KXW/AAAWDX09Ich2S6LQ7618ZBAY61KZcGkIabqCLs=,tag:Q7o8fz3dFFuqeMpzu9U/Fg==,type:str] -wifi: ENC[AES256_GCM,data:Zw1jPS/bDDXuwk+0TV8qGwWgdQp8XcDX254lwByLLyf5YCGdBIxYWdTDkIggxHSgSmovg7TwQnIYcxvpqjzm0/nbaHiRvm1tBnO9KIKs0nQhnIdNmjxGXpW9Nv9ZGrTp9/ymNNbG3AxHUT74Eemy09jP+k3h5AsVuCMsMYv2y1Hj9O6CTzV+yU9+WmqCZaTX0PnyVRGYkhcHYTZM0V7I0zZbS5Uzk6AHXVmdTT0KL/1OJ3UlRAQbYMyYJM8gAOXLub6U3nCREBVIl9DydniWy2YTqKWeJcMTPe5JGDdPaUzOSTxNKVm0C1jkIOyfCgHMZfVlfAMXsDpbi9kl6Bwb41R2uS/w1VNCUUtnD9TJ29pdOW6sqEApbdbXri/P7ZK5ogGUhei8+Se1WJNmV/cKii7YYQpWCuGj1PKUj2NLel6loDO2+bps0ejWOkQgPED5tT0rn9Wst2SQKA6wMVjCB6vrry973Hhp4oi9jZ5b3eLnIg1G95JVT/O/2ygS4PLsS+GH8a7OzL2Vy1kYisphuC8sFp6P/aY1ye6WLR0bjaLYUiXHP95RUEDAwbPP4dwPCpsQSRdAqllWJ51c7GIb+nHOQSlDVNurQhbJXH0SD7o6yTKiEeSXoUt4q5oFSJ8GRFYOf8s7+cluKUUv8y306qHj/rh97benRxUTWmAL5/Nn/v6lez6WIhoNaD+MFg1/e5CjnaozOGXx3Ew6ZyI/avKwVk+ni+/o2+HmxTCKShpH5F7eZb3FMmgzIQNM+3C884GehtM1ffZmLlWOZN+nM+Uq3pQ26jgS3aV4AkgCHsNq+Xq+qnOaS2ocl3u/X9hQNoFqbyoS7nbcH9NMjU8NA4XhX922ij5QANj9I0sGlqI3EQ2zZV9zx2YcpY1qMjoMZXA1g0nIfCd63SWa8l8j/FuUbDknE2meFGqgGdvg2YPrgz0CINeKNwkg82xY1bUQMmkUQSyZV5X4Hs810P4IZIIypsyalEiNoS1VegUtG4a4xDLk6ZCXdhxV8bFbBHDdm9t87G0WCc+dyDZo6gvEQQ1gBBAQ3A==,iv:5mBedTqbzgrLUZ4HZGBrz+h3JAT7DUIP++TI+5j7/M8=,tag:XAWSPoSGepULdfn0W/StzQ==,type:str] +wifi: ENC[AES256_GCM,data:DPvKrHbUOT7LpGCXHca+ffbcaVLbsHcdHWaMUDawT+7TkiszrytFGFPn5Qcec7ITXvSJYyMyf7c470NmFR+Jfje+QTRCdKO4bJ2YOwMCYLKsiCa1ImL3kRIjnjCRNyqHEGYNWEq+f2imbPZ7jz70/MbloOOHaTEanVGCCjiSAJFOxfqOXJaHz3hqynluTibsfbCCXRoA51EFcLpSp/LG/wAMOhlUzC8yon+Hd47UienU3PYBttHM/9p/Cpyh3FX2ksTGb+idwyVnEM92y58+8ZGJde88+0wlwzZbarO/D5z0aMlGgLjoHTHd1y2Pb1gVqTcomzH+vdaW9OJ4Btq83QjmdrDXszBPM9okVMbrA05VsFB/rco4fQiLSwXPVK8DyAd+gU7UtiY4IdDdq86jbesPnttuwJukxSHEEpujzHR/bSSyM5KpnLVAwrHJn0V3/Cl46r/AOU+1ctfihdgmJzT829hWeEZfvxLbggX7sQa1uB5yFSnrMM75tLqWMaut6sTBJzQ7QWvgQj+qY2DnBmy5rwRU15lplOp+/o7uzdkgak48g77Xf9+ztETRAYVg9UZ0oSQxWm5CTPUzIL+79qZ33HWeKCWHwnM+GGQvyikXt2XYL44bUlood3rPKqkl/Sp2/nhYTg7eDhyF0Mxc8zSGIzJlc1MAxlsQys4zA7+URcRcv+eHjtGwhXTUiwvd2VNDoutbvPXXULV8sMCO7U+Mrxah1urBH98ULgNxzN4bgrAfSxUV/f7AE7lZ8kAOh6dYblSz26SB+tj/auhml3KOJ9oRY2aLtaQaO5HknTG6aMiQK6W99a8ryU4p1B/FCw9Idolb6arfiKJkfQBaqfx3BDF1HmhWy2QwBGVaJRKZ6zerifVPLs2NERbl5idoqJxcyP1mA0XJl0RT9XJc4kRhaV1GXnybVei65OfDOp0bDoUFGC2WfBYqjhyd7A3mf/7taW/mA/z5iQtL33jKZ79lIMcM2MEQYVKbUF5iUXRBdUWYdg8WgYfZFFJpy7Ut5ijfFhDMe6WkzDjhrgrmJXfpte1gLfArD0n4vcL/WOOwAlaR2va8W7weCji5Mbsx+4pw/rirXa9jNwXWL5g3mFAXFHZbBX55Pnzs6QlaGfSNrfbExO71Hg==,iv:4YWSBiEUvayKUDMHehEiYY/qpd72g7US6QRUW8lGM/g=,tag:0jJKcws26SQ+6bhJavFirg==,type:str] sops: kms: [] gcp_kms: [] @@ -66,8 +66,8 @@ sops: STRtTVpVTCtVZ1FUNENqWFFVNTNuaVUKN6HRiZjTdENeif8dJ29urBxPXDaosjjY InN4Ko6YUaGfvB1DTrKIzrxOpsHS+XjisoGfT71tJwwEOoREklEO/A== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-02-18T07:35:26Z" - mac: ENC[AES256_GCM,data:jnLJi3ZhQfeLO/GmOnUL/HuWoet83V79GGZzoqxWeImQDN9jjSAqrRPULPAREHFD+hc+n2JAW7MZrZD86jcFFy2F+wGhcDAY+25dV6d2CSi34u/dBG5ETHsn/rRV5aAOQWldna/CEpnyi69Oz/oJcQrkHDyeUWsFG/ele6aPmB4=,iv:z+zSX9W/exvEJa37VlFBJ6S2173x7KQ6qnwZw/QAp7A=,tag:ge9klDIulMFv8Szjj6+gzw==,type:str] + lastmodified: "2024-06-01T10:29:21Z" + mac: ENC[AES256_GCM,data:BO+fRQRVeyV9hoIuq3ZyzT3XabPJ8LYSCPv66Qr1oKtnJsUuctYJVl9B1fhP824it9iX5iOBBgf7TfbaWEC6U4O+vWmlxBS18DUr+Y4iYTFn2+XpvOrHCzM1Yu+e/7eM36AQwZWzrxYra4hiRpCx2CyU5Ft1fdn9Ay0JR9nSfg8=,iv:R3SUH42P5bYVO57kTKCu9RuFszVng+l6Hu7u1vCSz9A=,tag:AWEvBrJoz7byXUlwWq2/9g==,type:str] pgp: - created_at: "2023-04-20T10:20:17Z" enc: |-