desktop sync

5 files changed, 227 insertions, 35 deletions

diff --git a/flake.lock b/flake.lock
index 6dd86c3..6864611 100644
--- a/flake.lock
+++ b/flake.lock
@@ -113,6 +113,28 @@
         "type": "github"
       }
     },
+    "fenix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "openmw-nix",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src_2"
+      },
+      "locked": {
+        "lastModified": 1759560021,
+        "narHash": "sha256-J/rtMKVUAEqOFj0ogvcHKK8HbaKhw+tiNrDOpEM+ZDY=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "6ffcbf59c119b0c6384c7d98f18cea06a9af7e9c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "locked": {
         "lastModified": 1733328505,
@@ -146,6 +168,22 @@
     "flake-compat_3": {
       "flake": false,
       "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
         "lastModified": 1767039857,
         "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
         "owner": "edolstra",
@@ -297,9 +335,46 @@
         "type": "github"
       }
     },
+    "flake-utils-plus": {
+      "inputs": {
+        "flake-utils": "flake-utils_2"
+      },
+      "locked": {
+        "lastModified": 1715533576,
+        "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
+        "type": "github"
+      }
+    },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -603,6 +678,22 @@
         "type": "github"
       }
     },
+    "mygui": {
+      "locked": {
+        "lastModified": 1716480759,
+        "narHash": "sha256-GuvNI8u2Dmu0FRTVzg/rQyV9BXFqyP3c65YVgI0Kiqk=",
+        "owner": "Tofixrs",
+        "repo": "nixpkgs",
+        "rev": "8e80bc70b31e86a0c32dd41ba436b79e783255fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Tofixrs",
+        "ref": "mygui",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "fenix": "fenix",
@@ -935,11 +1026,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1775268911,
-        "narHash": "sha256-3Ro4qz3HXgos0mvAkrTWsBTpIgPO6K+fogUYoO3c/UA=",
+        "lastModified": 1775307257,
+        "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "0166a4a54c0430e59308e9a3b0ab95f42293ac4e",
+        "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff",
         "type": "github"
       },
       "original": {
@@ -954,11 +1045,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1775300049,
-        "narHash": "sha256-wtQrLCi2RBsaK/FVoCVkTEo1txBPki6nHHkWAIYidas=",
+        "lastModified": 1775311198,
+        "narHash": "sha256-y0Fgn45jaywG7now1rOsvui0245Q3foRyc7i+qIOiDc=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "129d734fa79c213806007aa9d047679c4bfcdb2e",
+        "rev": "01639f2c1b4e022b618314a943108b9366685289",
         "type": "github"
       },
       "original": {
@@ -1013,6 +1104,29 @@
         "url": "https://git.bwaaa.monster/omnisearch"
       }
     },
+    "openmw-nix": {
+      "inputs": {
+        "fenix": "fenix_2",
+        "mygui": "mygui",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "snowfall-lib": "snowfall-lib"
+      },
+      "locked": {
+        "lastModified": 1772077063,
+        "narHash": "sha256-HGXXCld+zf9UFUVA6or/XI0yLyOCgLk3ce0QcNO2TsM=",
+        "ref": "refs/heads/main",
+        "rev": "99469e2c34f528043d7f6e7d58785e2a5ab0f830",
+        "revCount": 160,
+        "type": "git",
+        "url": "https://codeberg.org/PopeRigby/openmw-nix.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://codeberg.org/PopeRigby/openmw-nix.git"
+      }
+    },
     "otter-launcher": {
       "inputs": {
         "flake-parts": "flake-parts_6",
@@ -1020,7 +1134,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1775197069,
@@ -1068,6 +1182,7 @@
         "nur": "nur",
         "nvf": "nvf",
         "omnisearch": "omnisearch",
+        "openmw-nix": "openmw-nix",
         "otter-launcher": "otter-launcher",
         "satty": "satty",
         "sops-nix": "sops-nix",
@@ -1093,6 +1208,23 @@
         "type": "github"
       }
     },
+    "rust-analyzer-src_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1759301569,
+        "narHash": "sha256-7StxDed3v2fAWLkl+Hse9FlpjT7Dk7Cn/4vxTFyEhIg=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "472037b789cf593172d6adf3b8d9f7a429f6cd9b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": "nixpkgs_4"
@@ -1153,6 +1285,29 @@
         "type": "github"
       }
     },
+    "snowfall-lib": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "flake-utils-plus": "flake-utils-plus",
+        "nixpkgs": [
+          "openmw-nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1736130495,
+        "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=",
+        "owner": "snowfallorg",
+        "repo": "lib",
+        "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "snowfallorg",
+        "repo": "lib",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1178,7 +1333,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1774790928,
@@ -1241,6 +1396,21 @@
     },
     "systems_4": {
       "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_5": {
+      "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
@@ -1254,7 +1424,7 @@
         "type": "github"
       }
     },
-    "systems_5": {
+    "systems_6": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1269,7 +1439,7 @@
         "type": "github"
       }
     },
-    "systems_6": {
+    "systems_7": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1286,7 +1456,7 @@
     },
     "waybar": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1357,18 +1527,18 @@
     },
     "yazi": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ],
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1775220334,
-        "narHash": "sha256-IOF5iEoYyx9rMGh5lGH53yaHkaqEFX7P0VPSXzsXDmM=",
+        "lastModified": 1775309337,
+        "narHash": "sha256-NJBCvQonDrRNsh204W7aK3kiyOX47aW1/OcMA8NXivs=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "0cedbd9c7bbc44b23d54306b3effa3fa68eacdd8",
+        "rev": "4bb4f37555421cebf02dbd6dba16e56bd5cf4c80",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7fb8394..619fe09 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,10 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-    nur.url = "github:nix-community/NUR";
+    openmw-nix = {
+      url = "git+https://codeberg.org/PopeRigby/openmw-nix.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     nix-gaming-edge = {
       url = "github:powerofthe69/nix-gaming-edge";
@@ -68,11 +71,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixcord = {
-      url = "github:KaylorBen/nixcord";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     spicetify-nix = {
       url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index cfdcd8e..c0ee5b2 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -57,7 +57,10 @@
     srv = {
       omnisearch.enable = true;
       bluetooth.enable = true;
-      i2p.enable = true;
+      i2p = {
+        enable = true;
+        enableBrowser = true;
+      };
       yggdrasil.enable = true;
       files = {
         enable = true;
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index 2fcf340..ad2d748 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -3,6 +3,7 @@
   lib,
   pkgs,
   username,
+  inputs,
   ...
 }:
 let
@@ -61,7 +62,13 @@ in
       environment.systemPackages = with pkgs; [
         openttd-jgrpp
         openmw
-        portmod
+        inputs.openmw-nix.packages.x86_64-linux.umo
+        inputs.openmw-nix.packages.x86_64-linux.momw-configurator
+        inputs.openmw-nix.packages.x86_64-linux.delta-plugin
+        inputs.openmw-nix.packages.x86_64-linux.openmw-validator
+        inputs.openmw-nix.packages.x86_64-linux.groundcoverify
+        inputs.openmw-nix.packages.x86_64-linux.plox
+        inputs.openmw-nix.packages.x86_64-linux.s3lightfixes
       ];
     })
 
@@ -80,11 +87,34 @@ in
 
     # --- VR SUPPORT ---
     (lib.mkIf cfg.vr.enable {
+      programs.alvr = {
+        enable = true;
+        openFirewall = true;
+        package = pkgs.alvr.overrideAttrs (
+          finalAttrs: prevAttrs: {
+            version = "20.13.0";
+
+            src = pkgs.fetchFromGitHub {
+              owner = "alvr-org";
+              repo = "ALVR";
+              tag = "v${finalAttrs.version}";
+              fetchSubmodules = true;
+              hash = "sha256-h7/fuuolxbNkjUbqXZ7NTb1AEaDMFaGv/S05faO2HIc=";
+            };
+
+            cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
+              inherit (finalAttrs) src;
+              hash = "sha256-A0ADPMhsREH1C/xpSxW4W2u4ziDrKRrQyY5kBDn//gQ=";
+            };
+          }
+        );
+      };
       services.wivrn = {
         enable = true;
         openFirewall = true;
         highPriority = true;
         steam.importOXRRuntimes = true;
+        # defaultRuntime = true;
       };
       environment.systemPackages = [ pkgs.android-tools ];
       users.users.${username}.extraGroups = [ "adbusers" ];
diff --git a/os/srv/i2p.nix b/os/srv/i2p.nix
index f2c27b1..9bf897b 100644
--- a/os/srv/i2p.nix
+++ b/os/srv/i2p.nix
@@ -11,7 +11,7 @@ in
 {
   options.os.srv.i2p = {
     enable = lib.mkEnableOption "enables i2pd";
-    enableBrowser = lib.mkEnableOption "enables mullvad browser and creates a desktop entry";
+    enableBrowser = lib.mkEnableOption "enables mullvad browser for browsing eepsites";
   };
 
   config = lib.mkMerge [
@@ -42,16 +42,7 @@ in
       };
     })
     (lib.mkIf cfg.enableBrowser {
-      home-manager.users.${username} = {
-        home.packages = [ pkgs.mullvad-browser ];
-        xdg.desktopEntries = {
-          i2p-browser = {
-            name = "i2p Browser";
-            genericName = "Web Browser";
-            exec = "${pkgs.mullvad-browser}/bin/mullvad-browser -p i2p";
-          };
-        };
-      };
+      home-manager.users.${username}.home.packages = [ pkgs.mullvad-browser ];
     })
   ];
 }