flake.lock update

flake.lock

@@ -64,11 +64,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1780459148,
+        "lastModified": 1781195293,
-        "narHash": "sha256-oIpiel88r8zV/WqTFwcGAjWXKOASHNzq7wjXQ6ORTvg=",
+        "narHash": "sha256-C9OFghpvf3RzK2rGsZjjNNrTrHgFOecEkpDhFnU4QGs=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "493ed7ef062ba3972c06e60970fe5ebe014f5c33",
+        "rev": "5f5109c83854577191634f7b86fc6e0c8fd44964",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
     },
     "flake-file": {
       "locked": {
-        "lastModified": 1779051720,
+        "lastModified": 1781217157,
-        "narHash": "sha256-+jbXnODsR19pFKB0x/6kHhFgW6yV6N+CGClFr45eDU8=",
+        "narHash": "sha256-N3q/SP2Ropk336e9KSgLh7kpROY6P70dprYdbPIfd5c=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "c58eb27d9434e5be0c8693f1eb18d47035bc21ba",
+        "rev": "ce63eaf7ebfe04a176653f66385a7f0a36380cee",
         "type": "github"
       },
       "original": {
@@ -273,11 +273,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1780408569,
+        "lastModified": 1781305496,
-        "narHash": "sha256-s7Tv6FUQThRAvW8En8XVC6HMb0uiikzVccCcCo9u/Bg=",
+        "narHash": "sha256-g8Vv4Qfc7n+lgov97REu3X6BeJtvYY0hlSUZR1GrGQQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f384af1bec6423a0d4ba1855917ab948f64e5808",
+        "rev": "c87a39aa979acc4848016d2220c6238390d84779",
         "type": "github"
       },
       "original": {
@@ -303,11 +303,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1778541201,
+        "lastModified": 1780772958,
-        "narHash": "sha256-n0twkzWexzjsoDycOTvvQNuGEdg62UiNHYcFCduYpKI=",
+        "narHash": "sha256-VKKe8r4pwCGWZ3Yr9CPN129R4S3CKLSrlYqdYz3vKpM=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "1a3573fc9d2486738fe0b2cacc5cd10dd5f3a445",
+        "rev": "0871dbf63a53610c95db04439ed8ea4d6ec9c160",
         "type": "github"
       },
       "original": {
@@ -428,11 +428,11 @@
     "nixos-hardware": {
       "flake": false,
       "locked": {
-        "lastModified": 1780310866,
+        "lastModified": 1781168557,
-        "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
+        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "4ed851c979641e28597a05086332d75cdc9e395f",
+        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
         "type": "github"
       },
       "original": {
@@ -479,11 +479,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1779877693,
+        "lastModified": 1780365719,
-        "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=",
+        "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0",
+        "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f",
         "type": "github"
       },
       "original": {
@@ -495,11 +495,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1780336545,
+        "lastModified": 1781268102,
-        "narHash": "sha256-bWVU1JP9hCYZzQjMLdMzr/FINF+UvpZGvCJcnNY616k=",
+        "narHash": "sha256-OzxtVgj26jwAo9t9GxmOsQD3waYIx71PJ3u++2hmWJQ=",
-        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
+        "rev": "49a4bd0573c376468dd7996ddb6f9fa31d8c4d97",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1008784.4df1b885d76a/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1015535.49a4bd0573c3/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -518,11 +518,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1780421419,
+        "lastModified": 1781362949,
-        "narHash": "sha256-EkZYvhK9B9M9j9vuLNSexG1Uf51UshGkPy5iVpYORe8=",
+        "narHash": "sha256-kgSfxqUoV3i4LUOAg2yrusFtaT90ZA610U4Vj2tUMFo=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "8265ea062b4c37dc1b9846ec83bb8c9615048ef1",
+        "rev": "4d990efc21ab10d83bffc78d6645f7f32fa46491",
         "type": "github"
       },
       "original": {
@@ -575,11 +575,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777944972,
+        "lastModified": 1780547341,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
         "type": "github"
       },
       "original": {
@@ -647,11 +647,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780449413,
+        "lastModified": 1780661205,
-        "narHash": "sha256-ZsjnJ85CrTxI7+VaOWzkOB1u/+d4CM9AxBazXfsYXuA=",
+        "narHash": "sha256-3F5DixT3Gk91lBI9E+TGMm0ko5HrRbDiL23di16TJGA=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "e72bd9cf5fbc57e620912b773bed42b4e278bdc0",
+        "rev": "8dd304c3582ddd339217e1cc5fb53f50acb63c2d",
         "type": "github"
       },
       "original": {

modules/features/niri.nix

@@ -6,8 +6,10 @@
     };
   };
 
-  perSystem = { pkgs, lib, self', ... }: {
+  perSystem = { pkgs, lib, self', ... }:
-    packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap {
+    let
+      nixGLPackage = inputs.nixgl.packages.${pkgs.stdenv.hostPlatform.system}.nixGLIntel;
+      myNiriUnwrapped = inputs.wrapper-modules.wrappers.niri.wrap {
         inherit pkgs;
         settings = {
           spawn-at-startup = [
@@ -22,10 +24,27 @@
 
           binds = {
             "Mod+Return".spawn-sh = lib.getExe pkgs.kitty;
-          "Mod+Q".close-window = null;
+            # "Mod+Q".close-window = null;
             "Mod+S".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle";
           };
         };
       };
+    in {
+      packages.myNiri = pkgs.symlinkJoin {
+        name = "my-niri-nixgl";
+        paths = [ myNiriUnwrapped ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        meta.mainProgram = "niri";
+        postBuild = ''
+          for exe in "$out"/bin/*; do
+            if [[ -f "$exe" ]]; then
+              base="$(basename "$exe")"
+              mv "$exe" "$out/bin/.''${base}-real"
+              makeWrapper ${lib.getExe nixGLPackage} "$exe" \
+                --add-flags "$out/bin/.''${base}-real"
+            fi
+          done
+        '';
+      };
     };
 }

modules/features/noctalia.nix

@@ -1,10 +1,29 @@
 { self, inputs, ... }: {
-  perSystem = { pkgs, ... }: {
+  perSystem = { pkgs, lib, ... }:
-    packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
+    let
-      inherit pkgs; # THIS PART IS VERY IMPORTAINT, I FORGOT IT IN THE VIDEO!!!
+      nixGLPackage = inputs.nixgl.packages.${pkgs.stdenv.hostPlatform.system}.nixGLIntel;
-      settings =
+      myNoctaliaUnwrapped = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
-        (builtins.fromJSON
+        inherit pkgs;
-          (builtins.readFile ./noctalia.json)).settings;
+        # settings =
+        #   (builtins.fromJSON
+        #     (builtins.readFile ./noctalia.json)).settings;
+      };
+    in {
+      packages.myNoctalia = pkgs.symlinkJoin {
+        name = "my-noctalia-nixgl";
+        paths = [ myNoctaliaUnwrapped ];
+        nativeBuildInputs = [ pkgs.makeWrapper ];
+        meta.mainProgram = "noctalia-shell";
+        postBuild = ''
+          for exe in "$out"/bin/*; do
+            if [[ -f "$exe" ]]; then
+              base="$(basename "$exe")"
+              mv "$exe" "$out/bin/.''${base}-real"
+              makeWrapper ${lib.getExe nixGLPackage} "$exe" \
+                --add-flags "$out/bin/.''${base}-real"
+            fi
+          done
+        '';
       };
     };
 }

modules/programs/niri.nix

@@ -1,28 +0,0 @@
-{ self, inputs, ... }: {
-  flake.modules.nixos.niri = { pkgs, lib, ... }: {
-    programs.niri = {
-      enable = true;
-      package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri;
-    };
-  };
-
-  perSystem = { pkgs, lib, self', ... }: {
-    packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap {
-      inherit pkgs;
-      env.RUST_BACKTRACE = "full";
-      settings = {
-        spawn-at-startup = [
-          "${lib.getExe self'.packages.myNoctalia}"
-        ];
-        xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
-        input.keyboard.xkb.layout = "us,ua";
-        layout.gaps = 5;
-        binds = {
-          "Mod+Return".spawn-sh = lib.getExe pkgs.ghostty;
-          "Mod+Q".close-window = null;
-          "Mod+S".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle";
-        };
-      };
-    };
-  };
-}

modules/programs/noctalia.nix

@@ -1,8 +0,0 @@
-{ self, inputs, ... }: {
-  perSystem = { pkgs, ... }: {
-    packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
-      inherit pkgs;
-      # settings = (builtins.fromJSON (builtins.readFile ./noctalia.json)).settings;
-    };
-  };
-}

modules/services/ssh.nix

@@ -126,99 +126,91 @@ in
           SetEnv TERM="xterm-256color"
         '';
 
-        matchBlocks = lib.mkMerge [
+        settings = lib.mkMerge [
           {
             "john-pc-ubuntu" = {
-              hostname = "192.168.1.85";
+              HostName = "192.168.1.85";
             };
 
             "*" = lib.mkMerge [
               {
-                user = "john";
+                User = "john";
-                identityAgent = "${config.home.homeDirectory}/.1password/agent.sock";
+                IdentityAgent = "${config.home.homeDirectory}/.1password/agent.sock";
 
-                compression = false;
+                Compression = false;
-                serverAliveInterval = 0;
+                ServerAliveInterval = 0;
-                serverAliveCountMax = 3;
+                ServerAliveCountMax = 3;
 
-                identitiesOnly = true;
+                IdentitiesOnly = true;
-                inherit identityFile;
+                IdentityFile = identityFile;
 
-                hashKnownHosts = false;
+                HashKnownHosts = false;
-                userKnownHostsFile = cfg.knownHostsFile;
+                UserKnownHostsFile = cfg.knownHostsFile;
 
-                addKeysToAgent = "yes";
+                AddKeysToAgent = "yes";
-                forwardAgent = false;
+                ForwardAgent = false;
               }
-              (lib.mkIf cfg.certificates.enable { inherit certificateFile; })
+              (lib.mkIf cfg.certificates.enable { CertificateFile = certificateFile; })
             ];
           }
           (lib.mkIf cfg.matchSets.appdaemon {
             "appdaemon" = {
-              hostname = "192.168.1.242";
+              HostName = "192.168.1.242";
-              user = "appdaemon";
+              User = "appdaemon";
             };
             "ad-nix" = {
-              hostname = "192.168.1.201";
+              HostName = "192.168.1.201";
-              user = "appdaemon";
+              User = "appdaemon";
             };
           })
           (lib.mkIf cfg.matchSets.certs {
             "janus" = {
-              hostname = "janus.john-stream.com";
+              HostName = "janus.john-stream.com";
-              user = "root";
+              User = "root";
             };
             "soteria" = {
-              hostname = "soteria.john-stream.com";
+              HostName = "soteria.john-stream.com";
-              user = "john";
+              User = "john";
             };
           })
           (lib.mkIf cfg.matchSets.homelab {
             "docs" = {
-              hostname = "192.168.1.110";
+              HostName = "192.168.1.110";
-              user = "root";
+              User = "root";
-              extraOptions = {
               RequestTTY = "force";
               RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
             };
-            };
             "gitea" = {
-              hostname = "192.168.1.104";
+              HostName = "192.168.1.104";
-              user = "john";
+              User = "john";
             };
             "hermes" = {
-              hostname = "192.168.1.150";
+              HostName = "192.168.1.150";
-              user = "root";
+              User = "root";
               # Enabling this breaks the ability of Zed to install its remote stuff
-              # extraOptions = {
               # RequestTTY = "force";
               # RemoteCommand = "/root/.nix-profile/bin/jsl-zsh";
-              # };
             };
             "panoptes" = {
-              hostname = "192.168.1.107";
+              HostName = "192.168.1.107";
-              user = "panoptes";
+              User = "panoptes";
             };
           })
           (lib.mkIf cfg.matchSets.dev {
             "test-nix" = {
-              hostname = "fded:fb16:653e:25da:be24:11ff:fea0:753f";
+              HostName = "fded:fb16:653e:25da:be24:11ff:fea0:753f";
-              user = "john";
+              User = "john";
-              extraOptions = {
               RequestTTY = "auto";
               # RemoteCommand = "/run/current-system/sw/bin/jsl-zsh";
             };
-            };
           })
           (lib.mkIf cfg.matchSets.tailscale {
             "jdl-docker" = {
-              hostname = "jdl-docker.tailcf205.ts.net";
+              HostName = "jdl-docker.tailcf205.ts.net";
-              user = "john";
+              User = "john";
-              extraOptions = {
               RequestTTY = "auto";
               # RemoteCommand = "~/.nix-profile/bin/jsl-zsh";
             };
-            };
           })
         ];
       };