Update flake, add flake registry, fix xhost, others

nix-config/host/materusPC/configuration.nix

@@ -140,8 +140,8 @@ in
     PATH = [ "\${XDG_BIN_HOME}" ];
   };
   environment.shellInit = ''
-    if ! [ -z "$DISPLAY" ]; then xhost +si:localuser:root &> /dev/null; fi;
-    if ! [ -z "$DISPLAY" ]; then xhost +si:localuser:$USER &> /dev/null; fi;
+    if ! [ -z "$DISPLAY" ]; then ${pkgs.xorg.xhost}/bin/xhost +si:localuser:root &> /dev/null; fi;
+    if ! [ -z "$DISPLAY" ]; then ${pkgs.xorg.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi;
   '';
   i18n.inputMethod.enabled = "fcitx5";
   i18n.inputMethod.fcitx5.addons = [
@@ -294,5 +294,7 @@ in
     AllowSuspendThenHibernate=no
   '';
   
+
+
   system.stateVersion = "25.11";
 }

nix-config/host/materusPC/hardware-configuration.nix

@@ -155,6 +155,11 @@ in
   };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  services.udev.extraRules = ''
+    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x744c", ATTR{power/control}="on"
+  '';
+
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   hardware.sane.enable = true;

nix-config/host/materusPC/services.nix

@@ -110,7 +110,6 @@
   services.wivrn = {
     enable = true;
     openFirewall = true;
-    defaultRuntime = true;
   };
   #endregion
 }

nix-config/shared/default.nix

@@ -14,6 +14,7 @@ isHm:
 
   imports = [
     (import ./nvim.nix isHm)
+    ./nix.nix
   ];
   config.mkk.var = import ./private/variables.nix;
   config._module.args.mkk = config.mkk.var;

nix-config/shared/nix.nix

@@ -1,78 +1,130 @@
-{...}:{
-config.nix.package = lib.mkDefault  pkgs.nixVersions.latest;
-  config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry {
+{
+  materusArgs,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  config.nix.package = lib.mkDefault pkgs.nixVersions.latest;
+  config.nix.registry = {
     nixpkgs-stable = {
-      from = { type = "indirect"; id = "nixpkgs-stable"; };
-      flake = materusCfg.materusFlake.inputs.nixpkgs-stable;
+      from = {
+        type = "indirect";
+        id = "nixpkgs-stable";
+      };
+      flake = materusArgs.self.inputs.nixpkgs;
     };
     nixpkgs-unstable = {
-      from = { type = "indirect"; id = "nixpkgs-unstable"; };
-      flake = materusCfg.materusFlake.inputs.nixpkgs;
+      from = {
+        type = "indirect";
+        id = "nixpkgs-unstable";
+      };
+      flake = materusArgs.self.inputs.nixpkgs-unstable;
     };
 
     nixpkgs = {
-      from = { type = "indirect"; id = "nixpkgs"; };
-      flake = materusCfg.configInputs.nixpkgs;
+      from = {
+        type = "indirect";
+        id = "nixpkgs";
+      };
+      flake = materusArgs.inputs.nixpkgs;
     };
 
     emacs-overlay = {
-      from = { type = "indirect"; id = "emacs-overlay"; };
-      flake = materusCfg.configInputs.emacs-overlay;
+      from = {
+        type = "indirect";
+        id = "emacs-overlay";
+      };
+      flake = materusArgs.inputs.emacs-overlay;
     };
 
     flake-utils = {
-      from = { type = "indirect"; id = "flake-utils"; };
-      flake = materusCfg.configInputs.flake-utils;
+      from = {
+        type = "indirect";
+        id = "flake-utils";
+      };
+      flake = materusArgs.inputs.flake-utils;
     };
 
     nixos-hardware = {
-      from = { type = "indirect"; id = "nixos-hardware"; };
-      flake = materusCfg.configInputs.nixos-hardware;
+      from = {
+        type = "indirect";
+        id = "nixos-hardware";
+      };
+      flake = materusArgs.inputs.nixos-hardware;
     };
 
     nixerus = {
-      from = { type = "indirect"; id = "nixerus"; };
-      flake = materusCfg.configInputs.nixerus;
+      from = {
+        type = "indirect";
+        id = "nixerus";
+      };
+      flake = materusArgs.inputs.nixerus;
     };
 
     devshell = {
-      from = { type = "indirect"; id = "devshell"; };
-      flake = materusCfg.configInputs.devshell;
+      from = {
+        type = "indirect";
+        id = "devshell";
+      };
+      flake = materusArgs.inputs.devshell;
     };
 
     home-manager = {
-      from = { type = "indirect"; id = "home-manager"; };
-      flake = materusCfg.configInputs.home-manager;
+      from = {
+        type = "indirect";
+        id = "home-manager";
+      };
+      flake = materusArgs.inputs.home-manager;
     };
 
     sops-nix = {
-      from = { type = "indirect"; id = "sops-nix"; };
-      flake = materusCfg.configInputs.sops-nix;
+      from = {
+        type = "indirect";
+        id = "sops-nix";
+      };
+      flake = materusArgs.inputs.sops-nix;
     };
 
     base16 = {
-      from = { type = "indirect"; id = "base16"; };
-      flake = materusCfg.configInputs.base16;
+      from = {
+        type = "indirect";
+        id = "base16";
+      };
+      flake = materusArgs.inputs.base16;
     };
 
     git-agecrypt = {
-      from = { type = "indirect"; id = "git-agecrypt"; };
-      flake = materusCfg.configInputs.git-agecrypt;
+      from = {
+        type = "indirect";
+        id = "git-agecrypt";
+      };
+      flake = materusArgs.inputs.git-agecrypt;
     };
 
     plasma-manager = {
-      from = { type = "indirect"; id = "plasma-manager"; };
-      flake = materusCfg.configInputs.plasma-manager;
+      from = {
+        type = "indirect";
+        id = "plasma-manager";
+      };
+      flake = materusArgs.inputs.plasma-manager;
     };
 
     nur = {
-      from = { type = "indirect"; id = "nur"; };
-      flake = materusCfg.configInputs.nur;
+      from = {
+        type = "indirect";
+        id = "nur";
+      };
+      flake = materusArgs.inputs.nur;
     };
+
     nix-vscode-extensions = {
-      from = { type = "indirect"; id = "nix-vscode-extensions"; };
-      flake = materusCfg.configInputs.nix-vscode-extensions;
+      from = {
+        type = "indirect";
+        id = "nix-vscode-extensions";
+      };
+      flake = materusArgs.inputs.nix-vscode-extensions;
     };
 
   };
-  }
+}

nix-config/subflake/flake.nix

@@ -8,6 +8,24 @@
       ref = "nixos-unstable";
     };
 
+    nixerus = {
+      type = "github";
+      owner = "materusPL";
+      repo = "Nixerus";
+      ref = "master";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        home-manager.follows = "home-manager";
+      };
+    };
+
+    nur = {
+      type = "github";
+      owner = "nix-community";
+      repo = "NUR";
+      ref = "master";
+    };
+
     flake-utils = {
       type = "github";
       owner = "numtide";
@@ -15,6 +33,28 @@
       ref = "main";
     };
 
+    git-agecrypt = {
+      type = "github";
+      owner = "vlaci";
+      repo = "git-agecrypt";
+      ref = "main";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
+
+    plasma-manager = {
+      type = "github";
+      owner = "nix-community";
+      repo = "plasma-manager";
+      ref = "trunk";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        home-manager.follows = "home-manager";
+      };
+    };
+
     home-manager = {
       type = "github";
       owner = "nix-community";
@@ -25,17 +65,6 @@
       };
     };
 
-    nixerus = {
-      type = "github";
-      owner = "materusPL";
-      repo = "Nixerus";
-      ref = "master";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        home-manager.follows = "home-manager";
-      };
-    };
-
     sops-nix = {
       type = "github";
       owner = "Mic92";
@@ -56,6 +85,40 @@
       };
     };
 
+    devshell = {
+      type = "github";
+      owner = "numtide";
+      repo = "devshell";
+      ref = "main";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+
+    emacs-overlay = {
+      type = "github";
+      owner = "nix-community";
+      repo = "emacs-overlay";
+      ref = "master";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+
+    nixos-hardware = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixos-hardware";
+      ref = "master";
+    };
+
+    base16 = {
+      type = "github";
+      owner = "SenchoPens";
+      repo = "base16.nix";
+      ref = "main";
+    };
+
   };
 
   outputs = inputs: inputs;