fix: update environment for noctalia-shell

flake.lock

@@ -11,11 +11,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1768580572,
+        "lastModified": 1769185456,
-        "narHash": "sha256-8j7ifTZnVDOs0VxsbUjIym9e8oiv1F+I38PtkJZL7w0=",
+        "narHash": "sha256-GcliRryigbTJ0cYNHZyJQ60qgejwFp5eOwNm8WZFTwc=",
         "owner": "linyinfeng",
         "repo": "angrr",
-        "rev": "422b6156d54cc668f74321b2ea83fac4acef6996",
+        "rev": "e4beb21d3e2722a0e5241382e43b94be989d9b6e",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768575137,
+        "lastModified": 1769432988,
-        "narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=",
+        "narHash": "sha256-q4arZjXnLiuMnLzO972lrXIGdzyGb4DGaIt69CcCYdE=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611",
+        "rev": "d7a8632c0d8d144478aac1a8c8d5083b770cbb03",
         "type": "github"
       },
       "original": {
@@ -193,11 +193,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1769064677,
+        "lastModified": 1769756857,
-        "narHash": "sha256-Upa108vGOlaOBGQTmmLEKuWekBm519u42A/oYSjTs+4=",
+        "narHash": "sha256-GqbD7+WVvBD/kpcwOXz4EFuKcRI3qoGebKmzxjS7EY0=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "439e81e0b40781e16c444ca1c7fcd1cf8c5c406c",
+        "rev": "6c51b42ac2c25328067956ff980572482786d20c",
         "type": "github"
       },
       "original": {
@@ -544,11 +544,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769132734,
+        "lastModified": 1769776025,
-        "narHash": "sha256-gmU9cRplrQWqoback9PgQX7Dlsdx8JlhlVZwf0q1F7E=",
+        "narHash": "sha256-70a1kVC08AMTvPc7iqQsJbbD4Y1fukakMVudz4oY9SM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d055b309a6277343cb1033a11d7500f0a0f669fc",
+        "rev": "0fba737f8d5571d41467f3d99a878e11b8c0f0f0",
         "type": "github"
       },
       "original": {
@@ -606,11 +606,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1768941735,
+        "lastModified": 1769548169,
-        "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=",
+        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54",
+        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
         "type": "github"
       },
       "original": {
@@ -706,11 +706,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1769095293,
+        "lastModified": 1769714858,
-        "narHash": "sha256-GPlRdJ7LVLyabpJ2tDA9Bj5em9wi3mKXeedIDl7+LWs=",
+        "narHash": "sha256-IHHAKi8yMonZZmVHUQxew1V9UfLBG8Um9PLbNPx3OA4=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "180bdbbc91c89f540a52d2b31c8c08116c53b91f",
+        "rev": "dfbb02586582d5332d0c06653583b9d743bce081",
         "type": "github"
       },
       "original": {
@@ -739,11 +739,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1768678265,
+        "lastModified": 1769577126,
-        "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=",
+        "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "d7184a04b904e07113f4623610775ae78d32394c",
+        "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543",
         "type": "github"
       },
       "original": {
@@ -797,11 +797,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768561867,
+        "lastModified": 1768764703,
-        "narHash": "sha256-prGOZ+w3pZfGTRxworKcJliCNsewF0L4HUPjgU/6eaw=",
+        "narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "8b720b9662d4dd19048664b7e4216ce530591adc",
+        "rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b",
         "type": "github"
       },
       "original": {
@@ -840,11 +840,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768840529,
+        "lastModified": 1769217863,
-        "narHash": "sha256-e22ou8nikeThx9x9/y29VdMEW4Fm7DBzlhp9ndDJUGE=",
+        "narHash": "sha256-RY9kJDXD6+2Td/59LkZ0PFSereCXHdBX9wIkbYjRKCY=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "b8e9a758fa2e08d8ac5c3be5d4b1fcc92fd3ce84",
+        "rev": "38a5250e57f583662eac3b944830e4b9e169e965",
         "type": "github"
       },
       "original": {
@@ -883,11 +883,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1769160766,
+        "lastModified": 1769777176,
-        "narHash": "sha256-XqxuTeiXBmN7bj/JkGnB4htuVFVOw4y9Wc3oGiXn8qI=",
+        "narHash": "sha256-QYVHxk0OeFld+OtcSwBpOQ3c9MD/05hYXuIeIVo7Uh0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "13575c754596a1f1c4233bea5664f8646c5eb761",
+        "rev": "f08748ce7761b63fba645434b971ae449ab8106c",
         "type": "github"
       },
       "original": {
@@ -899,11 +899,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1768940263,
+        "lastModified": 1769598131,
-        "narHash": "sha256-sJERJIYTKPFXkoz/gBaBtRKke82h4DkX3BBSsKbfbvI=",
+        "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ceaaa8bc963ced4d830e06ea2d0863b6490ff03",
+        "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
         "type": "github"
       },
       "original": {
@@ -915,11 +915,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1769160721,
+        "lastModified": 1769771256,
-        "narHash": "sha256-Tzsu2ByvbS+p+spJQcjXNctMn1gQF5Hu7NiYklFKjD4=",
+        "narHash": "sha256-h4DqqTizWuAe8r+TRka5l5BtkUSHkblYJYUwfCFOZrs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec52769d18b62740ba9d5213def35abbb85ae95b",
+        "rev": "ee19cd9893d4317475d420634f26305a4ac1139b",
         "type": "github"
       },
       "original": {
@@ -931,11 +931,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1769018530,
+        "lastModified": 1769461804,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
         "type": "github"
       },
       "original": {
@@ -995,11 +995,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1769018530,
+        "lastModified": 1769461804,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
         "type": "github"
       },
       "original": {
@@ -1016,16 +1016,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1768687399,
+        "lastModified": 1769661167,
-        "narHash": "sha256-/7yEiXC2Z/Yk/p7aNgChkAa7BgPRlV5/0z8+jZXH8e8=",
+        "narHash": "sha256-SHavMqGRv78sND/wQ53OhBBE2VBhgE3bSNRxxo5z7FE=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "d01378f73b0c07d486519600a7808b072d088609",
+        "rev": "790572cd244f3ddf542668ea0da25ff6db07dd78",
         "type": "github"
       },
       "original": {
         "owner": "noctalia-dev",
-        "ref": "v4.1.1",
+        "ref": "v4.2.5",
         "repo": "noctalia-shell",
         "type": "github"
       }
@@ -1105,11 +1105,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1768996281,
+        "lastModified": 1769703626,
-        "narHash": "sha256-s+TolkG0f98fR6RtBEmymBb8RHmZ04U3SL8cjoqog2k=",
+        "narHash": "sha256-Wqj6eSydSGJdFGj5SiADEms+GJnyJoNo6i7JDRM+n+w=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "2d124215693f13dcf6ad097a02acdd473c80e447",
+        "rev": "2e3535826072546f88b746633db65f453f783028",
         "type": "github"
       },
       "original": {
@@ -1126,11 +1126,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768893558,
+        "lastModified": 1769513611,
-        "narHash": "sha256-ntZKV5rLdZHtXKYpwDdFkkD8y/ycL0s229l0Zb/vfmw=",
+        "narHash": "sha256-qbRBdvTFaHlOD4TFQieMIG9WkcfDj4038xOebWSq87c=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "0a97486171f077a37991456e7de5ffa85e88a217",
+        "rev": "f4975025895c336a7af6eeaebe13bfe6ad01ac27",
         "type": "github"
       },
       "original": {
@@ -1161,11 +1161,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1768744881,
+        "lastModified": 1769728672,
-        "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=",
+        "narHash": "sha256-/sCPdG7t3r0l8A16+siLKmFScoHkG0oPDM1q0CZgnZ0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "06684f00cfbee14da96fd4307b966884de272d3a",
+        "rev": "861c3c92a9f865d5adae1c1917a6c383170eff13",
         "type": "github"
       },
       "original": {
@@ -1312,11 +1312,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768158989,
+        "lastModified": 1769691507,
-        "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
+        "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
+        "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b",
         "type": "github"
       },
       "original": {
@@ -1366,11 +1366,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1768765571,
+        "lastModified": 1769713942,
-        "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=",
+        "narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69",
+        "rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0",
         "type": "github"
       },
       "original": {
@@ -1387,11 +1387,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769059766,
+        "lastModified": 1769748063,
-        "narHash": "sha256-u95Qe60mF3eoEqrd0tIej4A8TDWoc/N4ZjZ60npplgw=",
+        "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "dc0483a6e3ff1ffb04ad77d26c1a4458f4cf82d6",
+        "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -81,7 +81,7 @@
     };
     niri.url = "github:sodiboo/niri-flake";
     noctalia = {
-      url = "github:noctalia-dev/noctalia-shell/v4.1.1";
+      url = "github:noctalia-dev/noctalia-shell/v4.2.5";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     zen.inputs.nixpkgs.follows = "nixpkgs";

hosts/imxyy-nix-x16/home.nix

@@ -64,8 +64,8 @@
       defaultApplications =
         let
           browser = [ config.my.desktop.browser.default.desktop ];
-          editor = [ "codium.desktop" ];
+          editor = [ "nvim.desktop" ];
-          imageviewer = [ "org.gnome.Shotwell-Viewer.desktop" ];
+          imageviewer = [ "org.gnome.Loupe.desktop" ];
         in
         {
           "inode/directory" = [ "org.gnome.Nautilus.desktop" ];
@@ -74,7 +74,6 @@
 
           "text/*" = editor;
           "application/json" = editor;
-          "text/html" = editor;
           "text/xml" = editor;
           "application/xml" = editor;
           "application/xhtml+xml" = editor;
@@ -87,6 +86,7 @@
           "application/x-extension-xht" = editor;
           "application/x-extension-xhtml" = editor;
 
+          "text/html" = browser;
           "x-scheme-handler/about" = browser;
           "x-scheme-handler/ftp" = browser;
           "x-scheme-handler/http" = browser;

hosts/imxyy-nix/home.nix

@@ -96,8 +96,8 @@
       defaultApplications =
         let
           browser = [ config.my.desktop.browser.default.desktop ];
-          editor = [ "codium.desktop" ];
+          editor = [ "nvim.desktop" ];
-          imageviewer = [ "org.gnome.Shotwell-Viewer.desktop" ];
+          imageviewer = [ "org.gnome.Loupe.desktop" ];
         in
         {
           "inode/directory" = [ "org.gnome.Nautilus.desktop" ];
@@ -106,7 +106,6 @@
 
           "text/*" = editor;
           "application/json" = editor;
-          "text/html" = editor;
           "text/xml" = editor;
           "application/xml" = editor;
           "application/xhtml+xml" = editor;
@@ -119,6 +118,7 @@
           "application/x-extension-xht" = editor;
           "application/x-extension-xhtml" = editor;
 
+          "text/html" = browser;
           "x-scheme-handler/about" = browser;
           "x-scheme-handler/ftp" = browser;
           "x-scheme-handler/http" = browser;

modules/desktop/media/all.nix

@@ -10,7 +10,7 @@ in
   config = lib.mkIf cfg.enable {
     my.desktop.media = {
       mpv.enable = true;
-      shotwell.enable = true;
+      loupe.enable = true;
       thunderbird.enable = true;
       vlc.enable = true;
       splayer.enable = true;

modules/desktop/media/loupe.nix

@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.my.desktop.media.loupe;
+in
+{
+  options.my.desktop.media.loupe = {
+    enable = lib.mkEnableOption "loupe";
+  };
+
+  config = lib.mkIf cfg.enable {
+    my.hm.home.packages = [ pkgs.loupe ];
+  };
+}

modules/desktop/media/shotwell.nix

@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.my.desktop.media.shotwell;
-in
-{
-  options.my.desktop.media.shotwell = {
-    enable = lib.mkEnableOption "shotwell";
-  };
-
-  config = lib.mkIf cfg.enable {
-    my.hm.home.packages = [ pkgs.shotwell ];
-  };
-}

modules/desktop/wm/niri/config.nix

@@ -5,6 +5,9 @@
   assets,
   ...
 }:
+let
+  settings = config.my.hm.programs.niri.settings;
+in
 {
   config = lib.mkIf config.my.desktop.wm.niri.enable {
     my.hm.programs.niri.settings = {
@@ -97,17 +100,11 @@
         }
       ];
 
-      environment = {
+      environment.NIXOS_OZONE_WL = "1";
-        QT_QPA_PLATFORM = "wayland;xcb";
-        XDG_SESSION_TYPE = "wayland";
-        XDG_CURRENT_DESKTOP = "niri";
-        XDG_SESSION_DESKTOP = "niri";
 
-        NIXOS_OZONE_WL = "1";
+      spawn-at-startup = lib.mkBefore (map (c: { command = c; }) [
-        NOCTALIA_SETTINGS_FALLBACK = "${config.my.hm.xdg.configHome}/noctalia/gui-settings.json";
+        ([ "dbus-update-activation-environment" "--systemd" ] ++ builtins.attrNames settings.environment)
-      };
 
-      spawn-at-startup = map (c: { command = c; }) [
         [
           "${lib.getExe pkgs.swaybg}"
           "-m"
@@ -131,7 +128,14 @@
           "cliphist"
           "store"
         ]
-      ];
+        # TODO: Is there a better way?
+        [
+          "systemctl"
+          "restart"
+          "--user"
+          "noctalia-shell.service"
+        ]
+      ]);
 
       binds =
         let

treefmt.nix

@@ -7,10 +7,6 @@
       nixfmt.enable = true;
       stylua.enable = true;
       keep-sorted.enable = true;
-      typos = {
-        enable = true;
-        configFile = "typos.toml";
-      };
     };
   };
 }