From 042b2e9664eaa5452dd909906d36b1349c14a1f6 Mon Sep 17 00:00:00 2001
From: victor <victor@xirion.net>
Date: Sat, 5 Nov 2022 22:28:04 +0100
Subject: [PATCH] update mastodon

---
 flake.lock                                   |  10 +-
 flake.nix                                    |   1 -
 nixos/hosts/hades/mastodon/configuration.nix |   3 +
 nixos/hosts/hades/tautulli/configuration.nix |   5 +-
 nixos/hosts/thalassa/null/home/hyprland.nix  | 215 +++++++++----------
 nixos/pkgs/glitch-soc/default.nix            |   2 +-
 nixos/pkgs/glitch-soc/gemset.nix             |  20 +-
 nixos/pkgs/glitch-soc/source.nix             |   4 +-
 nixos/pkgs/glitch-soc/version.nix            |   2 +-
 9 files changed, 130 insertions(+), 132 deletions(-)

diff --git a/flake.lock b/flake.lock
index d778361..523c8da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -359,11 +359,11 @@
         "wlroots": "wlroots"
       },
       "locked": {
-        "lastModified": 1667585380,
-        "narHash": "sha256-NipRUi+DGyeNJO98u+ULf7Sd1UdsJ8JitZkKMPaMAF0=",
+        "lastModified": 1667671515,
+        "narHash": "sha256-jdhA2R+Ezam6R++BYId1jwdvgZn6VZDnG4oEK+R8KIQ=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "70aece85224dcca42e6fc596a4b68d688ad6c295",
+        "rev": "bee06f35073da245b71221897becc74260a5b51f",
         "type": "github"
       },
       "original": {
@@ -624,10 +624,10 @@
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1667550944,
-        "narHash": "sha256-ggII6sCaxlD06V9PBE+9fit6zLFsYzQtEsU7wugNYP0=",
+        "narHash": "sha256-8qNYarOJtasZ/+G5mlNC2mh8VG5NagM6tSpK2Rq5hDk=",
         "owner": "NULLx76",
         "repo": "nixpkgs",
-        "rev": "a5cafcd286c4fddd81aebbb9edb6befaf0e1afbe",
+        "rev": "afc2d0fe2359d4f4eff4d003f41130ad52ab427e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0ec2655..e3a91f5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -131,7 +131,6 @@
           vault
           (vault-push-approle-envs self { })
           (vault-push-approles self { })
-          rnix-lsp
         ];
       };
     };
diff --git a/nixos/hosts/hades/mastodon/configuration.nix b/nixos/hosts/hades/mastodon/configuration.nix
index da2efba..6586286 100644
--- a/nixos/hosts/hades/mastodon/configuration.nix
+++ b/nixos/hosts/hades/mastodon/configuration.nix
@@ -28,6 +28,7 @@ in
     cat >> /var/lib/mastodon/.secrets_env <<EOF
     AWS_ACCESS_KEY_ID="$(cat ${vs.mastodon}/awsAccessKeyId)"
     AWS_SECRET_ACCESS_KEY="$(cat ${vs.mastodon}/awsSecretAccessKey)"
+    DEEPL_API_KEY="$(cat ${vs.mastodon}/deeplAPIKey)"
     EOF
   '';
 
@@ -91,6 +92,8 @@ in
       S3_PROTOCOL = "https";
       S3_HOSTNAME = "o.xirion.net";
       S3_ENDPOINT = "https://o.xirion.net/";
+
+      DEEPL_PLAN = "free";
     };
   };
 
diff --git a/nixos/hosts/hades/tautulli/configuration.nix b/nixos/hosts/hades/tautulli/configuration.nix
index 1d10ed9..84ef833 100644
--- a/nixos/hosts/hades/tautulli/configuration.nix
+++ b/nixos/hosts/hades/tautulli/configuration.nix
@@ -15,10 +15,7 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "22.11"; # Did you read the comment?
 
-  # Additional packages
-  environment.systemPackages = with pkgs; [ ];
-
-  services.tautulli = rec {
+  services.tautulli = {
     enable = true;
     port = 8080;
     openFirewall = true;
diff --git a/nixos/hosts/thalassa/null/home/hyprland.nix b/nixos/hosts/thalassa/null/home/hyprland.nix
index 4d187f9..c042878 100644
--- a/nixos/hosts/thalassa/null/home/hyprland.nix
+++ b/nixos/hosts/thalassa/null/home/hyprland.nix
@@ -5,129 +5,128 @@
     wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png
   '';
 
-  wayland.windowManager.hyprland =
-    let
-      startup-script = pkgs.writeScriptBin "startup" ''
-        #!${pkgs.stdenv.shell}
-        hyprctl setcursor Catppuccin-Frappe-Pink-Cursors ${builtins.toString config.home.pointerCursor.size}
-        ${pkgs.hyprpaper}/bin/hyprpaper &
-        ${pkgs.xsettingsd}/bin/xsettingsd &
-        foot --server &
-        eww daemon &
-        eww open bar &
-        firefox-devedition &
-        webcord &
-        element-desktop &
-      '';
-    in
-    {
-      enable = true;
-      recommendedEnvironment = true;
-      extraConfig = ''
-        monitor=eDP-1,1920x1080@60,0x0,1
-        monitor=eDP-1,addreserved,0,0,48,0
-        monitor=,preferred,auto,1
+  wayland.windowManager.hyprland = let
+    startup-script = pkgs.writeScriptBin "startup" ''
+      #!${pkgs.stdenv.shell}
+      hyprctl setcursor Catppuccin-Frappe-Pink-Cursors ${
+        builtins.toString config.home.pointerCursor.size
+      }
+      ${pkgs.hyprpaper}/bin/hyprpaper &
+      foot --server &
+      eww daemon &
+      eww open bar &
+      firefox-devedition &
+      webcord &
+      element-desktop &
+    '';
+  in {
+    enable = true;
+    recommendedEnvironment = true;
+    extraConfig = ''
+      monitor=eDP-1,1920x1080@60,0x0,1
+      monitor=eDP-1,addreserved,0,0,48,0
+      monitor=,preferred,auto,1
 
-        windowrulev2 = workspace 1 silent,class:^(Electron)$,title:^(.*)(WebCord)(.*)$
-        windowrulev2 = workspace 1 silent,title:^(Element)(.*)$
-        windowrulev2 = workspace 2 silent,class:^(firefox-aurora)$
-        windowrulev2 = float,class:^(firefox-aurora)$,title:^(Picture-in-Picture)$
+      windowrulev2 = workspace 1 silent,class:^(Electron)$,title:^(.*)(WebCord)(.*)$
+      windowrulev2 = workspace 1 silent,title:^(Element)(.*)$
+      windowrulev2 = workspace 2 silent,class:^(firefox-aurora)$
+      windowrulev2 = float,class:^(firefox-aurora)$,title:^(Picture-in-Picture)$
 
-        general {
-          layout = dwindle
-          col.active_border = 0xfff4b8e4
+      general {
+        layout = dwindle
+        col.active_border = 0xfff4b8e4
+      }
+
+      input {
+        kb_options=caps:escape
+        touchpad {
+          natural_scroll= true
         }
+      }
 
-        input {
-          kb_options=caps:escape
-          touchpad {
-            natural_scroll= true
-          }
-        }
+      gestures {
+        workspace_swipe = true
+      }
 
-        gestures {
-          workspace_swipe = true
-        }
+      misc {
+        no_vfr = false
+        disable_hyprland_logo = true
+        disable_splash_rendering = true
+      }
 
-        misc {
-          no_vfr = false
-          disable_hyprland_logo = true
-          disable_splash_rendering = true
-        }
+      dwindle {
+        pseudotile=true
+      }
 
-        dwindle {
-          pseudotile=true
-        }
+      bind=SUPER,RETURN,exec,footclient
+      bind=SUPER,f,exec,firefox-devedition
+      bind=SUPER,d,exec,wofi --show run,drun
 
-        bind=SUPER,RETURN,exec,footclient
-        bind=SUPER,f,exec,firefox-devedition
-        bind=SUPER,d,exec,wofi --show run,drun
+      bind=,Print,exec,grim -g "$(slurp)" -t png - | wl-copy -t image/png
+      bind=SUPER,W,killactive,
+      bind=SUPERSHIFT,Q,exit,
+      bind=SUPER,S,togglefloating,
+      bind=SUPER,P,pin,
 
-        bind=,Print,exec,grim -g "$(slurp)" -t png - | wl-copy -t image/png
-        bind=SUPER,W,killactive,
-        bind=SUPERSHIFT,Q,exit,
-        bind=SUPER,S,togglefloating,
-        bind=SUPER,P,pin,
+      bindm=SUPER,mouse:272,movewindow
+      bindm=SUPER,mouse:273,resizewindow
 
-        bindm=SUPER,mouse:272,movewindow
-        bindm=SUPER,mouse:273,resizewindow
+      bind=SUPER,left,movefocus,l
+      bind=SUPER,right,movefocus,r
+      bind=SUPER,up,movefocus,u
+      bind=SUPER,down,movefocus,d
 
-        bind=SUPER,left,movefocus,l
-        bind=SUPER,right,movefocus,r
-        bind=SUPER,up,movefocus,u
-        bind=SUPER,down,movefocus,d
+      bind=SUPER,1,workspace,1
+      bind=SUPER,2,workspace,2
+      bind=SUPER,3,workspace,3
+      bind=SUPER,4,workspace,4
+      bind=SUPER,5,workspace,5
+      bind=SUPER,6,workspace,6
+      bind=SUPER,7,workspace,7
+      bind=SUPER,8,workspace,8
+      bind=SUPER,9,workspace,9
+      bind=SUPER,0,workspace,10
+      bind=SUPER,grave,togglespecialworkspace
 
-        bind=SUPER,1,workspace,1
-        bind=SUPER,2,workspace,2
-        bind=SUPER,3,workspace,3
-        bind=SUPER,4,workspace,4
-        bind=SUPER,5,workspace,5
-        bind=SUPER,6,workspace,6
-        bind=SUPER,7,workspace,7
-        bind=SUPER,8,workspace,8
-        bind=SUPER,9,workspace,9
-        bind=SUPER,0,workspace,10
-        bind=SUPER,grave,togglespecialworkspace
+      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=ALT,grave,movetoworkspace,special
 
-        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=ALT,grave,movetoworkspace,special
+      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=SUPERSHIFT,grave,movetoworkspacesilent,special
 
-        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=SUPERSHIFT,grave,movetoworkspacesilent,special
+      bind=SUPER,mouse_down,workspace,e+1
+      bind=SUPER,mouse_up,workspace,e-1
 
-        bind=SUPER,mouse_down,workspace,e+1
-        bind=SUPER,mouse_up,workspace,e-1
+      bind=SUPER,g,togglegroup
+      bind=SUPER,tab,changegroupactive
+      bind=SUPER,m,fullscreen,1
+      bind=SUPERSHIFT,m,fullscreen,0
 
-        bind=SUPER,g,togglegroup
-        bind=SUPER,tab,changegroupactive
-        bind=SUPER,m,fullscreen,1
-        bind=SUPERSHIFT,m,fullscreen,0
+      bind=,XF86MonBrightnessUp,exec,brightnessctl -q s +5%
+      bind=,XF86MonBrightnessDown,exec,brightnessctl -q s 5%-
+      bind=,XF86MonRaiseVolume,exec,pamixer -i 5
+      bind=,XF86MonLowerVolume,exec,pamixer -d 5
+      bind=,XF86AudioMute,exec,pamixer -t
 
-        bind=,XF86MonBrightnessUp,exec,brightnessctl -q s +5%
-        bind=,XF86MonBrightnessDown,exec,brightnessctl -q s 5%-
-        bind=,XF86MonRaiseVolume,exec,pamixer -i 5
-        bind=,XF86MonLowerVolume,exec,pamixer -d 5
-        bind=,XF86AudioMute,exec,pamixer -t
-
-        exec-once=${startup-script}/bin/startup
-      '';
-    };
+      exec-once=${startup-script}/bin/startup
+    '';
+  };
 }
diff --git a/nixos/pkgs/glitch-soc/default.nix b/nixos/pkgs/glitch-soc/default.nix
index 9ec3cfb..f265bc7 100644
--- a/nixos/pkgs/glitch-soc/default.nix
+++ b/nixos/pkgs/glitch-soc/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    sha256 = "sha256-Yt7TIH24B+S8JarcCEIyMAKWlFiXlb/5i7p2cBrZlDM=";
+    sha256 = "sha256-8LxM+YFOZTWEsljc9Vvq0mBnonhtMNnfqrKCDSk2iZE=";
   };
 
   mastodon-gems = bundlerEnv {
diff --git a/nixos/pkgs/glitch-soc/gemset.nix b/nixos/pkgs/glitch-soc/gemset.nix
index fb54623..f71e042 100644
--- a/nixos/pkgs/glitch-soc/gemset.nix
+++ b/nixos/pkgs/glitch-soc/gemset.nix
@@ -1102,10 +1102,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16xki30md6bygc62yi2s1y002vq6dm3bhjcjb9pl5dpr3al3fa1j";
+      sha256 = "0g7m38n4f5cjqa4gf4fycw6fqvf6m5hhsx4jawryv3bi4hls07d1";
       type = "gem";
     };
-    version = "1.5.3";
+    version = "1.7.1";
   };
   fuubar = {
     dependencies = ["rspec-core" "ruby-progressbar"];
@@ -2529,10 +2529,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jvxcvsqhalndc1wh7zfdqfg78j5sx57vrgsh54pjsm1d73q79hc";
+      sha256 = "1as4yrb8y5lq49div8p3vqgwrrhdgwnvx4m73y3712nmnlpx6cws";
       type = "gem";
     };
-    version = "3.8.1";
+    version = "3.8.2";
   };
   safety_net_attestation = {
     dependencies = ["jwt"];
@@ -2605,10 +2605,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "031ifqpjn51s91ki5svmkv8n4dzky4lxx4vi8pxlv5y9bwgf30gx";
+      sha256 = "0ij0m4m4zi3ffn1csdrj4g96l4vpqlsw3rrgjxda9yqsq4ylf624";
       type = "gem";
     };
-    version = "4.0.2";
+    version = "4.0.3";
   };
   sidekiq-unique-jobs = {
     dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];
@@ -2722,10 +2722,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bpmrz2vw59gw556y5hsha3xlrvfv4qwck4wg2r39qf2bp2hcr1b";
+      sha256 = "0v7nk5i3fa63h6clfr5vbr0y91v3kxkaxh6gbdx583pn982avdlc";
       type = "gem";
     };
-    version = "0.2.21";
+    version = "0.2.22";
   };
   statsd-ruby = {
     groups = ["default"];
@@ -2816,10 +2816,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
+      sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v";
       type = "gem";
     };
-    version = "2.0.10";
+    version = "2.0.11";
   };
   tpm-key_attestation = {
     dependencies = ["bindata" "openssl" "openssl-signature_algorithm"];
diff --git a/nixos/pkgs/glitch-soc/source.nix b/nixos/pkgs/glitch-soc/source.nix
index 1b89654..7c989a7 100644
--- a/nixos/pkgs/glitch-soc/source.nix
+++ b/nixos/pkgs/glitch-soc/source.nix
@@ -2,8 +2,8 @@
 { fetchgit, applyPatches }: let
   src = fetchgit {
     url = "https://github.com/glitch-soc/mastodon.git";
-    rev = "371563b0e249b6369e04709fb974a8e57413529f";
-    sha256 = "19zbndh2scnjpcdfg142p8wc3a31qg8rzakfmk1x9vmf19sf8yf7";
+    rev = "2f8fb49d1314db931385089bc9004a48700161ad";
+    sha256 = "0jj3p70lb16gn5cmcxnqkjy0aih3a5i38ppfjadyaxjdxhzbr3kd";
   };
 in applyPatches {
   inherit src;
diff --git a/nixos/pkgs/glitch-soc/version.nix b/nixos/pkgs/glitch-soc/version.nix
index d23f68c..618fe10 100644
--- a/nixos/pkgs/glitch-soc/version.nix
+++ b/nixos/pkgs/glitch-soc/version.nix
@@ -1 +1 @@
-"3.5.3"
+"4.0.0rc1"