update mastodon

flake.lock

@@ -287,6 +287,21 @@
       }
     },
     "flake-utils_3": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
       "locked": {
         "lastModified": 1631561581,
         "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
@@ -667,6 +682,44 @@
         "type": "github"
       }
     },
+    "nixvim": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nmdSrc": "nmdSrc"
+      },
+      "locked": {
+        "lastModified": 1667212379,
+        "narHash": "sha256-6U4821gGS73xkE/t490+NRMrrJO+Glb/DArnsJlw/qI=",
+        "owner": "pta2002",
+        "repo": "nixvim",
+        "rev": "f7be7364620a357aded1f46d66a9b86035d8f771",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pta2002",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "nmdSrc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1654807200,
+        "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
+      }
+    },
     "poetry2nix": {
       "flake": false,
       "locked": {
@@ -744,6 +797,7 @@
         "minecraft-servers": "minecraft-servers",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_2",
+        "nixvim": "nixvim",
         "riff": "riff",
         "vault-secrets": "vault-secrets",
         "webcord": "webcord"
@@ -865,7 +919,7 @@
     "vault-secrets": {
       "inputs": {
         "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
         "nix": "nix",
         "nixpkgs": [
           "nixpkgs"

flake.nix

@@ -35,6 +35,9 @@
     mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
     mailserver.inputs.nixpkgs.follows = "nixpkgs";
 
+    nixvim.url = "github:pta2002/nixvim";
+    nixvim.inputs.nixpkgs.follows = "nixpkgs";
+
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";

nixos/hosts/hades/pmm/config/Movies.yml

@@ -18,6 +18,7 @@ templates:
     collection_order: release
     url_poster: <<poster>>
     sort_title: <<collection_name>>
+    url_background: <<background>>
 collections:
   Marvel Cinematic Universe:
     tvdb_list: https://thetvdb.com/lists/marvel-cinematic-universe
@@ -37,3 +38,13 @@ collections:
     template: { name: Studio, company: 3 }
     url_poster: https://theposterdb.com/api/assets/18894
     summary: Pixar Animation Studios, commonly known as Pixar, is an American computer animation studio based in Emeryville, California, a subsidiary of Disney Studios Content owned by The Walt Disney Company. Pixar began in 1979 as part of the Lucasfilm computer division, known as the Graphics Group, before its spin-off as a corporation on February 3, 1986, with funding from Apple co-founder Steve Jobs, who became its majority shareholder. Disney purchased Pixar in 2006 at a valuation of $7.4 billion by converting each share of Pixar stock to 2.3 shares of Disney stock, a transaction that resulted in Jobs becoming Disney's largest single shareholder at the time. Pixar is best known for its feature films technologically powered by RenderMan, the company's own implementation of the industry-standard RenderMan Interface Specification image-rendering application programming interface. Luxo Jr., a desk lamp from the studio's 1986 short film of the same name, is the studio's mascot.
+  Star Trek:
+    tmdb_collection:
+      - 151
+      - 115570
+    template:
+      name: Set
+      poster: https://theposterdb.com/api/assets/222279
+      background: https://i.imgur.com/Yp0NCZa.jpg
+  Bad Trek:
+    tmdb_collection_details: 115575

nixos/hosts/thalassa/null/configuration.nix

@@ -197,7 +197,6 @@ in {
     pciutils
     nvidia-offload
     run-hyprland
-    vim
     wireguard-tools
     slurp
     gdb

nixos/hosts/thalassa/null/home/default.nix

@@ -11,8 +11,8 @@ in {
   home.stateVersion = "22.05";
 
   imports = [
-    inputs.hyprland.homeManagerModules.default
     ./hyprland.nix
+    ./neovim.nix
     ./eww
     ./theme.nix
   ];

nixos/hosts/thalassa/null/home/hyprland.nix

@@ -5,6 +5,10 @@
     wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png
   '';
 
+  imports = [
+    inputs.hyprland.homeManagerModules.default
+  ];
+
   wayland.windowManager.hyprland = let
     startup-script = pkgs.writeScriptBin "startup" ''
       #!${pkgs.stdenv.shell}

nixos/hosts/thalassa/null/home/neovim.nix

@@ -0,0 +1,37 @@
+{ inputs, pkgs, lib, ... }: {
+  imports = [ inputs.nixvim.homeManagerModules.nixvim ];
+  programs.nixvim = {
+    enable = true;
+    package = pkgs.neovim-unwrapped;
+
+    extraPlugins = with pkgs.vimPlugins; [ catppuccin-nvim ];
+
+    colorscheme = "catppuccin-frappe";
+
+    plugins = {
+      nix.enable = true;
+      treesitter = { 
+        enable = true;
+        nixGrammars = false;
+        ensureInstalled = [];
+      };
+      surround.enable = true;
+      fugitive.enable = true;
+      lualine = {
+        enable = true;
+        theme = "catppuccin";
+      };
+      telescope = {
+        enable = true;
+        extensions.fzf-native.enable = true;
+      };
+      lsp = {
+        enable = true;
+        servers.rust-analyzer.enable = true;
+        servers.rnix-lsp.enable = true;
+        servers.pyright.enable = true;
+      };
+      nvim-cmp = { enable = true; };
+    };
+  };
+}

nixos/pkgs/glitch-soc/default.nix

@@ -16,11 +16,6 @@ stdenv.mkDerivation rec {
   # Putting the callPackage up in the arguments list also does not work.
   src = if srcOverride != null then srcOverride else callPackage ./source.nix {};
 
-  yarnOfflineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    sha256 = "sha256-8LxM+YFOZTWEsljc9Vvq0mBnonhtMNnfqrKCDSk2iZE=";
-  };
-
   mastodon-gems = bundlerEnv {
     name = "${pname}-gems-${version}";
     inherit version;
@@ -45,6 +40,11 @@ stdenv.mkDerivation rec {
     pname = "${pname}-modules";
     inherit src version;
 
+    yarnOfflineCache = fetchYarnDeps {
+      yarnLock = "${src}/yarn.lock";
+      sha256 = "sha256-ON4hJrj3YIxSE5PJ3ZVLdMC37f8wpf2Olej8M/Bjcks=";
+    };
+
     nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];
 
     RAILS_ENV = "production";
@@ -52,9 +52,11 @@ stdenv.mkDerivation rec {
 
     buildPhase = ''
       export HOME=$PWD
+      # This option is needed for openssl-3 compatibility
+      # Otherwise we encounter this upstream issue: https://github.com/mastodon/mastodon/issues/17924
       export NODE_OPTIONS=--openssl-legacy-provider
       fixup_yarn_lock ~/yarn.lock
-      yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
+      yarn config --offline set yarn-offline-mirror $yarnOfflineCache
       yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
 
       patchShebangs ~/bin
@@ -119,6 +121,6 @@ stdenv.mkDerivation rec {
     homepage = "https://joinmastodon.org";
     license = licenses.agpl3Plus;
     platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
-    maintainers = with maintainers; [ petabyteboy happy-river erictapen izorkin ];
+    maintainers = with maintainers; [ happy-river erictapen izorkin ];
   };
 }

nixos/pkgs/glitch-soc/source.nix

@@ -1,9 +1,9 @@
 # This file was generated by pkgs.mastodon.updateScript.
 { fetchgit, applyPatches }: let
   src = fetchgit {
-    url = "https://github.com/glitch-soc/mastodon.git";
+    url = "https://git.0x76.dev/v/mastodon.git";
-    rev = "2f8fb49d1314db931385089bc9004a48700161ad";
+    rev = "54101563bbadbfafd9291a867d7fbea6df3a8b7b";
-    sha256 = "0jj3p70lb16gn5cmcxnqkjy0aih3a5i38ppfjadyaxjdxhzbr3kd";
+    sha256 = "1yi0jczfrsrj2rgzyawcpnm4sndyinpqrdaqbv6rz3maa5a0y6qb";
   };
 in applyPatches {
   inherit src;

nixos/pkgs/glitch-soc/version.nix

@@ -1 +1 @@
-"4.0.0rc1"
+"4.0.0rc2"