Fix out of date nix stuff, config edits

6 files changed, 35 insertions, 36 deletions

diff --git a/nix_archive/flake.lock b/nix_archive/flake.lock
index bdc8f63..8c1b326 100644
--- a/nix_archive/flake.lock
+++ b/nix_archive/flake.lock
@@ -15,11 +15,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757553294,
-        "narHash": "sha256-GOdswZ7kgdrXFF3qPlCBgPaPfYYGjsJ4sOt1SblHnUA=",
+        "lastModified": 1761860722,
+        "narHash": "sha256-XeRANEYWMSN+wBvLbT0Zgtp2A84Q7Y0oSQESjWf4mtA=",
         "ref": "refs/heads/master",
-        "rev": "77837d7b63240c069b3351a919a7d2af670f46cd",
-        "revCount": 149,
+        "rev": "d4ea79a8622b6bf03555f186aeb1f5fa9283721f",
+        "revCount": 153,
         "type": "git",
         "url": "https://git.akon.city/camu"
       },
@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761584077,
-        "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=",
+        "lastModified": 1761845621,
+        "narHash": "sha256-d+R4MHsGmdebvSMsYUFWONsZSlUbOo8Zq/wjMdMiIac=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef",
+        "rev": "97e3022a8d2c09313fa49847f6da4d76abcfc72d",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755211482,
-        "narHash": "sha256-ifly37Yij9iKGHVo0m1OaY6gKNogn8tFMPZqopOhgoQ=",
+        "lastModified": 1761860690,
+        "narHash": "sha256-SyUqzmPZwvyF1CVSbIlTTNKlF52MBh4q1PIou50L0Wo=",
         "ref": "refs/heads/master",
-        "rev": "ca800f761080289735561154f02eddb21198a876",
-        "revCount": 72,
+        "rev": "aa64ea4be134979a72312e9e645237ac4f376981",
+        "revCount": 74,
         "type": "git",
         "url": "https://git.akon.city/mauri"
       },
@@ -144,11 +144,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1760958188,
-        "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
+        "lastModified": 1761827175,
+        "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
+        "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8",
         "type": "github"
       },
       "original": {
@@ -164,11 +164,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1757427959,
-        "narHash": "sha256-p0i07rLfAMzJWYfsjFOXEtIWeS1EGVxJaCi9gfyCwRE=",
+        "lastModified": 1761563673,
+        "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "785f1b67b6c53de088f640f2a7da50ca4b2d7161",
+        "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1757068644,
-        "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
+        "lastModified": 1761373498,
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1761373498,
-        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
+        "lastModified": 1761672384,
+        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
+        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
         "type": "github"
       },
       "original": {
@@ -233,11 +233,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761601325,
-        "narHash": "sha256-0UtnyehKLys0HWhctZEjKN7zDe+ML0HCDdqdfHk221o=",
+        "lastModified": 1761857284,
+        "narHash": "sha256-oIt6cQrUB4VA3lgDgwptzP5P7iq0DalaqQMctYQB31k=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "378c5c7b0b2471b59b71e42b229ea5e68050235d",
+        "rev": "abbcf2d95f63db25ae8c6cfd331bbab3b97d962a",
         "type": "github"
       },
       "original": {
diff --git a/nix_archive/hosts/palm/programs.nix b/nix_archive/hosts/palm/programs.nix
index 493653b..cd996a4 100644
--- a/nix_archive/hosts/palm/programs.nix
+++ b/nix_archive/hosts/palm/programs.nix
@@ -7,9 +7,9 @@
     (asNeeded "imv" ["imv"])
     (asNeeded "mpv" ["mpv"])
     (asNeeded "steam-run" ["steam-run"])
-    #camu
-    #camu-devshell
-    #mauri
+    camu
+    camu-devshell
+    mauri
   ];
   local.scripts.imports = [
     "battery"
diff --git a/nix_archive/hosts/sofue/programs.nix b/nix_archive/hosts/sofue/programs.nix
index d964fbf..314f96c 100644
--- a/nix_archive/hosts/sofue/programs.nix
+++ b/nix_archive/hosts/sofue/programs.nix
@@ -19,9 +19,9 @@
     (asNeeded "imv" ["imv"])
     (asNeeded "mpv" ["mpv"])
     (asNeeded "vlc" ["vlc"])
-    #camu
-    #camu-devshell
-    #mauri
+    camu
+    camu-devshell
+    mauri
   ];
   local.scripts.imports = [
     "discord-wayland"
diff --git a/nix_archive/nix/programs/firefox.nix b/nix_archive/nix/programs/firefox.nix
index c485e49..61f19cc 100644
--- a/nix_archive/nix/programs/firefox.nix
+++ b/nix_archive/nix/programs/firefox.nix
@@ -3,7 +3,7 @@ let
   colo = config.local.scheme;
 in {
   environment.systemPackages = with pkgs; [
-    firefox-wayland
+    firefox
   ];
   environment.sessionVariables = {
     BROWSER = "firefox";
diff --git a/nix_archive/nix/system.nix b/nix_archive/nix/system.nix
index 92b95df..7aaebe6 100644
--- a/nix_archive/nix/system.nix
+++ b/nix_archive/nix/system.nix
@@ -78,7 +78,7 @@
     enable = true;
     extraPackages = with pkgs; [
       libvdpau-va-gl
-      vaapiVdpau
+      libva-vdpau-driver
     ];
   };
 
diff --git a/nix_archive/nix/user.nix b/nix_archive/nix/user.nix
index 3c78a18..360f53d 100644
--- a/nix_archive/nix/user.nix
+++ b/nix_archive/nix/user.nix
@@ -19,9 +19,8 @@ in {
     fontDir.enable = true;
     packages = with pkgs; [
       local-fonts
-      vistafonts
+      vista-fonts
       noto-fonts
-      noto-fonts-extra
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
       noto-fonts-emoji-blob-bin