a

flake.lock

@@ -1019,6 +1019,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-floorp": {
+      "locked": {
+        "lastModified": 1697124353,
+        "narHash": "sha256-Zdpiv74nvmSPyl56ntJuTt9Udg1qt8GHqDv9InkChJA=",
+        "owner": "christoph-heiss",
+        "repo": "nixpkgs",
+        "rev": "7da03ef9701a350b383e9bc36639ae0ad3481e4d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "christoph-heiss",
+        "ref": "new/floorp",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
@@ -1324,6 +1340,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-persistence": "nixos-persistence",
         "nixpkgs": "nixpkgs_3",
+        "nixpkgs-floorp": "nixpkgs-floorp",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "nur": "nur",

flake.nix

@@ -2,6 +2,7 @@
   description = "config!!!";
 
   inputs = {
+    nixpkgs-floorp.url = "github:christoph-heiss/nixpkgs/new/floorp";
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nur.url = "github:nix-community/NUR";

hosts/wolumonde/modules/musikspider.nix

@@ -6,7 +6,7 @@
   pkg =
     inputs.musikspider.packages.${pkgs.system}.musikspider.overrideAttrs
     (old: {
-      LOCAL_MUSIKQUAD_SERVER = "http://localhost:5005";
+      LOCAL_MUSIKQUAD_SERVER = "http://127.0.0.1:5005";
       PUBLIC_MUSIKQUAD_SERVER = "mq.gaze.systems";
       PUBLIC_BASEURL = "ms.gaze.systems";
     });
@@ -28,7 +28,7 @@ in {
       Restart = "on-failure";
       RestartSec = 5;
       WorkingDirectory = "/var/lib/musikspider";
-      Environment="HOME=/var/lib/musikspider";
+      Environment = "HOME=/var/lib/musikspider";
       EnvironmentFile = pkgs.writeText "musikspider-env" ''
         PORT=${port}
       '';

pkgs-set/overlays/floorp.nix

@@ -0,0 +1,4 @@
+{inputs}:
+final: prev: {
+  floorp = inputs.nixpkgs-floorp.legacyPackages.${final.system}.floorp;
+}

pkgs-set/overlays/prismlauncher.nix

@@ -1,5 +1,5 @@
 {inputs}: final: prev: {
-  # prismlauncher = prev.prismlauncher.overrideAttrs (old: {
+  prismlauncher = prev.prismlauncher.overrideAttrs (old: {
-  #   patches = [((toString inputs.self) + "/pkgs-set/patches/prismlauncher-offline.patch")];
+    patches = [((toString inputs.self) + "/pkgs-set/patches/prismlauncher-offline.patch")];
-  # });
+  });
 }

pkgs-set/pkgs/fluidsynth-dssi.nix

@@ -1,5 +1,22 @@
-{ lib, stdenv, fetchurl, alsa-lib, autoconf, automake, dssi, gtk2, libjack2,
+{
-ladspaH, ladspaPlugins, liblo, pkg-config, fluidsynth, rpm2targz, libtool, ... }:
+  lib,
+  stdenv,
+  fetchurl,
+  alsa-lib,
+  autoconf,
+  automake,
+  dssi,
+  gtk2,
+  libjack2,
+  ladspaH,
+  ladspaPlugins,
+  liblo,
+  pkg-config,
+  fluidsynth,
+  rpm2targz,
+  libtool,
+  ...
+}:
 stdenv.mkDerivation rec {
   pname = "fluidsynth-dssi";
   version = "1.9.9";
@@ -9,8 +26,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-DJSrdxQpjvQTzio6e3p/iSYJWu+AbydyKkeKsRQA6qc=";
   };
 
-  nativeBuildInputs = [ autoconf automake pkg-config rpm2targz libtool ];
+  nativeBuildInputs = [autoconf automake pkg-config rpm2targz libtool];
-  buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH ladspaPlugins liblo fluidsynth.dev ];
+  buildInputs = [alsa-lib dssi gtk2 libjack2 ladspaH ladspaPlugins liblo fluidsynth.dev];
 
   unpackPhase = ''
     rpm2targz $src

pkgs-set/pkgs/phantom.nix

@@ -1,4 +1,8 @@
-{stdenv, libsForQt5, ...}:
+{
+  stdenv,
+  libsForQt5,
+  ...
+}:
 stdenv.mkDerivation {
   pname = "phantomstyle";
   version = "309c97";

users/modules/firefox/default.nix

@@ -62,8 +62,9 @@
           ]
           ++ (with myExtensions; [
             youtube-disable-number-seek
-            styl-us
             showdex
+            better-twitter-extension
+            better-clean-twitter
           ]);
         extraConfig = builtins.readFile (
           builtins.fetchurl {

users/modules/firefox/extensions.json

@@ -2,5 +2,7 @@
   {"slug":"catppuccin-mocha-sky"},
   {"slug":"youtube-disable-number-seek"},
   {"slug":"showdex"},
-  {"slug":"styl-us"}
+  {"slug":"styl-us"},
+  {"slug":"better-twitter-extension"},
+  {"slug":"better-clean-twitter"}
 ]

users/modules/firefox/extensions.nix

@@ -4,6 +4,46 @@
   lib,
   stdenv,
 }: {
+  "better-clean-twitter" = buildFirefoxXpiAddon {
+    pname = "better-clean-twitter";
+    version = "1.3.2";
+    addonId = "bct@presti.me";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4124387/better_clean_twitter-1.3.2.xpi";
+    sha256 = "094d99c7678c3247a0b07a2d0d942df969daafe567d392a52a6f0b40ce7382bd";
+    meta = with lib; {
+      homepage = "https://presti.me";
+      description = "Remove all the annoying clutter from your Twitter.";
+      license = licenses.gpl3;
+      mozPermissions = [
+        "*://twitter.com/*"
+        "*://api.twitter.com/*"
+        "activeTab"
+        "storage"
+        "tabs"
+        "scripting"
+        "webRequest"
+        "nativeMessaging"
+        "https://twitter.com/*"
+      ];
+      platforms = platforms.all;
+    };
+  };
+  "better-twitter-extension" = buildFirefoxXpiAddon {
+    pname = "better-twitter-extension";
+    version = "2.1.2";
+    addonId = "{ef32ca60-1728-4011-a585-4de439fe7ba7}";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4056346/better_twitter_extension-2.1.2.xpi";
+    sha256 = "25cf90586def269d7a54d8b4fd71aa63529e25ed6689df4c05b0d7f8c3fabca9";
+    meta = with lib; {
+      description = "Hide what is not important on <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/26ca20fd517be4e3078c65b14f44521b572c8c48532db6c37d90ff3a2ee15167/http%3A//Twitter.com\" rel=\"nofollow\">Twitter.com</a>";
+      mozPermissions = [
+        "storage"
+        "https://twitter.com/*"
+        "https://mobile.twitter.com/*"
+      ];
+      platforms = platforms.all;
+    };
+  };
   "catppuccin-mocha-sky" = buildFirefoxXpiAddon {
     pname = "catppuccin-mocha-sky";
     version = "2.0";

users/modules/godot/default.nix

@@ -1,3 +1,3 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [godot godot-headless godot-server];
+  home.packages = with pkgs; [godot_4];
 }

users/patriot/default.nix

@@ -114,6 +114,7 @@ in {
         ["zoxide" "zsh" "fzf" "starship" "direnv"]
         # dev stuff
         ["helix" "git" "ssh"]
+        ["godot"]
         ["musikcube" "musikcubed"]
       ];
     in
@@ -144,17 +145,20 @@ in {
           ".vst"
         ]
         ++ mkPaths ".local/share" [
+          "bottles"
           "direnv"
           "zsh"
           "keyrings"
+          "yuzu"
           # "lutris"
           # "Terraria"
-          # "PrismLauncher"
+          "PrismLauncher"
         ]
         ++ mkPaths ".config" [
           # "lutris"
           "dconf"
           "retroarch"
+          "yuzu"
         ];
       files = l.flatten [
         ".config/gnome-initial-setup-done"
@@ -218,7 +222,7 @@ in {
         helvum
         nix-output-monitor
         inputs.nh.packages.${pkgs.system}.default
-        # prismlauncher
+        prismlauncher
         # steamPackages.steamcmd
         # steam-tui
         gtkcord4
@@ -232,9 +236,11 @@ in {
         (retroarch.override {
           cores = with libretro; [desmume citra];
         })
+        yuzu
         # wineWowPackages.stagingFull
         # lutris
         distrobox
+        bottles
       ];
     };
     programs = {