enabled git-secret and gnupg

configs/common.nix

@@ -4,9 +4,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-
-{
   imports = [
     /etc/nixos/hardware-configuration.nix
   ];
@@ -50,6 +48,9 @@
     };
   };
 
+  # Set <nixpkgs> correctly
+  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+
   ## Optimise Nix store on rebuild and collect garbage as a service
   nix.optimise.automatic = true;
   nix.gc = {
@@ -154,17 +155,13 @@
       "docker"
       "wheel"
     ];
-    packages =
+    packages = with pkgs; let
-      with pkgs;
+      input = {
-      let
-        input =
-          {
         package,
         output ? "default",
       }:
         inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output};
-        wrap =
+      wrap = {
-          {
         name,
         pkg,
         modules,
@@ -178,8 +175,7 @@
               --prefix PATH : ${pkgs.lib.makeBinPath modules}
           '';
         };
-      in
+    in [
-      [
       # Ricing
       ## Desktop
       bibata-cursors
@@ -189,6 +185,7 @@
       dunst
       wlogout
       wpaperd
+      quickshell
 
       ## Desktop Utilities
       grimblast
@@ -217,6 +214,7 @@
 
       ## Tools
       lazygit
+      git-secret
       p7zip-rar
       any-nix-shell
       bluetui
@@ -238,6 +236,8 @@
       tailscale
       syncthing
       jellyfin-tui
+      devenv
+      nix-output-monitor
 
       # Apps
       ## Actual Useful Stuff
@@ -302,17 +302,17 @@
 
   # System Packages
   environment.systemPackages = with pkgs; [
-
     # Utilities
     inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default
     vim
     unzip
-    python310
+    python315
     usbutils
     curlWithGnuTls
 
     # System
     mesa
+    pkg-config
     vulkan-tools
     gvfs
     wayvnc
@@ -327,8 +327,11 @@
     libnotify
     gsettings-desktop-schemas
   ];
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-all;
+  };
 
   # The comment
   system.stateVersion = "25.05"; # Did you read the comment?
-
 }

configs/configuration-laptop.nix

@@ -4,9 +4,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-
-{
   networking.hostName = "mobile02"; # Define your hostname.
 
   # Opengl and vulkan
@@ -43,11 +41,9 @@
       inputs.chataigne.packages.${stdenv.hostPlatform.system}.default
 
       # Terminal
-      light
       # Apps
     ];
   };
 
   programs.steam.enable = true;
-
 }

configs/configuration-pc.nix

@@ -4,9 +4,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-
-{
   networking.hostName = "HACKSTATION";
 
   # Enable nix-ld to run unpatched binaries
@@ -30,10 +28,16 @@
     extraPackages = with pkgs; [
       libva-vdpau-driver
       libvdpau-va-gl
+      rocmPackages.clr.icd
     ];
     enable32Bit = true;
   };
 
+  # For rOCM
+  systemd.tmpfiles.rules = [
+    "L+ /opt/rocm - - - - ${pkgs.rocmPackages.clr}"
+  ];
+
   hardware.amdgpu.opencl.enable = true;
 
   boot.kernelParams = [
@@ -113,18 +117,29 @@
   users.users.user01 = {
     extraGroups = [
       "docker"
+      "input"
+      "udev"
+      "wheel"
     ];
     packages = with pkgs; [
       bottles
       mumble
       gajim
       ferdium
-      wine64
       delfin
       docker
       orca-slicer
       ffmpeg
       inputs.norgolith.packages.${pkgs.stdenv.hostPlatform.system}.default
+      inputs.cracked-davinci.packages.${pkgs.stdenv.hostPlatform.system}.default
+      inputs.woomer.packages.${pkgs.stdenv.hostPlatform.system}.default
+
+      # wine
+      wineWow64Packages.stable
+      winetricks
+      wine
+      wine64
+      freetype
     ];
   };
 
@@ -132,8 +147,18 @@
     inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.wrapped
   ];
 
+  programs.obs-studio = {
+    enable = true;
+  };
+
+  programs.wshowkeys = {
+    enable = true;
+    package = inputs.wshowkeys.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  };
+
   programs.steam = {
     enable = true;
+    protontricks.enable = true;
     extraCompatPackages = with pkgs; [
       proton-ge-bin
     ];

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778620495,
+        "lastModified": 1780756231,
-        "narHash": "sha256-Gu7UhWjwKCgSiVC3Qz/Rc7cYi9DNuDTBxYzg3kfLvfM=",
+        "narHash": "sha256-tXQxKdG5716uB9/LIkLQqQwHKf5mRSpHoZhz3lyI2Cg=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "be35f75ac305f430f5f9d89b5f5a4af59ca7567e",
+        "rev": "6ecde03f47172753fe5a2f334f9d3facfb7e6784",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     "beaker-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1773884524,
+        "lastModified": 1780436704,
-        "narHash": "sha256-1dnlofWaxI/YRID+WPz2jHZNDyloBubDt/bAQk9ePLU=",
+        "narHash": "sha256-3aMH1YblnpiXKdkQVMRLmMZ5/8G7vB4HAfLg7+izyHg=",
         "ref": "refs/heads/master",
-        "rev": "abc598baf15d6f8a4de395a27ba34b1e769558e1",
+        "rev": "360d6271e1a20d128430e52637d5d35f4c706ca5",
-        "revCount": 21,
+        "revCount": 34,
         "shallow": false,
         "type": "git",
         "url": "https://git.bwaaa.monster/beaker"
@@ -65,10 +65,46 @@
       },
       "parent": []
     },
+    "cracked-davinci": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-pinned": "nixpkgs-pinned"
+      },
+      "locked": {
+        "lastModified": 1782405315,
+        "narHash": "sha256-pZKG7KOr1NPtWwzfEnRZvAi7Uvndd4LiC0OVHjf5IPE=",
+        "ref": "refs/heads/main",
+        "rev": "c9859df9bd3781c63d838a1a90d22129885a910b",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/nixos.davinci"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/nixos.davinci"
+      }
+    },
+    "crane": {
+      "locked": {
+        "lastModified": 1781825982,
+        "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "doot": {
       "inputs": {
         "doot-src": "doot-src",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "utils": "utils"
       },
       "locked": {
@@ -194,11 +230,49 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_6"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_7"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fsel": {
       "inputs": {
         "flake-utils": "flake-utils",
         "naersk": "naersk",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1779043781,
@@ -326,17 +400,17 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems_3",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1779061968,
+        "lastModified": 1781453652,
-        "narHash": "sha256-kWlrGgqZJAdBbXlJMrZ2TKt+bsfEh6jPuAwV58kb6jg=",
+        "narHash": "sha256-BHkT6VFjkjO80YoheG0m9YuAMy3S78Ipr27vAbvZEIw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "4e3955716619c58a8e9e2f81af5f8f2862e77a1b",
+        "rev": "179c2bce0355289c60271fb00b89f2d5511618d5",
         "type": "github"
       },
       "original": {
@@ -509,11 +583,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778234770,
+        "lastModified": 1780251518,
-        "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
+        "narHash": "sha256-fG9xbb1SOAAJ+2kJRakp3ch+BmA/3dEg/K3PoAZTKkw=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
+        "rev": "40ede2e7bdec80ba5d4c443160d905e9f841ae5f",
         "type": "github"
       },
       "original": {
@@ -576,22 +650,6 @@
         "type": "github"
       }
     },
-    "mesa-davinci": {
-      "locked": {
-        "lastModified": 1754501210,
-        "narHash": "sha256-ahTHrGs72TLVcNUR2VHckEx+t6frke0e/Ptk6AaEINk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "599ddd2b79331c1e6153e1659bdaab65d62c4c82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "599ddd2b79331c1e6153e1659bdaab65d62c4c82",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "naersk": {
       "inputs": {
         "fenix": "fenix",
@@ -613,11 +671,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773222311,
+        "lastModified": 1780952837,
-        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
+        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0590cd39f728e129122770c029970378a79d076a",
+        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
         "type": "github"
       },
       "original": {
@@ -642,13 +700,29 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs-pinned": {
       "locked": {
-        "lastModified": 1778869304,
+        "lastModified": 1772567409,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "narHash": "sha256-qspxGige37s/66q9sptyG5VA/l2IOmMMZVJ4Xhta2wU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "e4ec59bc1152b09a4843702e4a49381194f065a2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e4ec59bc1152b09a4843702e4a49381194f065a2",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1781074563,
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
@@ -658,34 +732,18 @@
         "type": "github"
       }
     },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1761597516,
-        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1767379071,
+        "lastModified": 1782233679,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "narHash": "sha256-QyuGP5+QOtmXpy4i2X4DhBVBaySBdDKQEhqKcphcp34=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "667d5cf1c59585031d743c78b394b0a647537c35",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -708,11 +766,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1775710090,
+        "lastModified": 1780749050,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
         "type": "github"
       },
       "original": {
@@ -724,69 +782,37 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1778443072,
+        "lastModified": 1781216227,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1778737229,
+        "lastModified": 1782467914,
-        "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
+        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
+        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1777578337,
-        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
       "locked": {
         "lastModified": 1769170682,
         "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
@@ -810,11 +836,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778882665,
+        "lastModified": 1781412130,
-        "narHash": "sha256-K3Gg/8LKmxrHLzVUx4IF3nTxwl2PU7CrV5oZ8BwHo1U=",
+        "narHash": "sha256-TqXOX3N+tLVa+rjdppBpQSLwVVjSlqpQOrGTgKxur5M=",
         "owner": "NTBBloodbath",
         "repo": "norgolith",
-        "rev": "bcadf7ae0888edb0466aae7390fa2a9eebda1c1d",
+        "rev": "a7d8e257b75f03448ae8d19265fa033afe45fd74",
         "type": "github"
       },
       "original": {
@@ -825,14 +851,14 @@
     },
     "nvim-wrapped": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1778578765,
+        "lastModified": 1782650144,
-        "narHash": "sha256-7ufUOj59GQFhCjKgumnJ3PpSFluNfR0mU3cStmBvzRc=",
+        "narHash": "sha256-E6SKjvY6Vz2mRok6ml8Dm4lMgUyfgtwHgwLlo93SLpI=",
         "ref": "refs/heads/main",
-        "rev": "4751798619cd2b9fad19d389b3ceb8829f783f68",
+        "rev": "45739fc4cf0ba3cdefab6593a0d629b637bb341a",
-        "revCount": 79,
+        "revCount": 88,
         "type": "git",
         "url": "file:///home/user01/.dotfiles/.config/nvim"
       },
@@ -849,11 +875,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774376566,
+        "lastModified": 1780508528,
-        "narHash": "sha256-9MpNFotAXh8pOcYOLivq5UomOS5LbggdsRsNVpRtXAI=",
+        "narHash": "sha256-0OkItQH4D8KcS+mIxgrzGHTHMl7Eb6ZHzTN3UmZbtWI=",
         "ref": "refs/heads/master",
-        "rev": "0b426487cafdc5672ba5077228bcf881c605bfbe",
+        "rev": "e48c6366d07e0357afa379dff7b73328589164e5",
-        "revCount": 68,
+        "revCount": 131,
         "type": "git",
         "url": "https://git.voidarc.co.uk/voidarc/omnisearch"
       },
@@ -866,15 +892,17 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1779026498,
+        "lastModified": 1780973227,
-        "narHash": "sha256-oQw4/UqDpE/K0lkc+zFXdWsNKps9p0rZg6ybMwVDhsM=",
+        "narHash": "sha256-vlNT2248Oxg3++bk8ZkozsU4wDbxOkh6dl3GeoBmmXE=",
         "owner": "kuokuo123",
         "repo": "otter-launcher",
-        "rev": "380ceb9d2cf9b02854fbd3be39177e5e151fae6c",
+        "rev": "764a38d1de308da3268222692652a0a85bb71eee",
         "type": "github"
       },
       "original": {
@@ -909,18 +937,20 @@
     "root": {
       "inputs": {
         "chataigne": "chataigne",
+        "cracked-davinci": "cracked-davinci",
         "doot": "doot",
         "fsel": "fsel",
         "hyprland": "hyprland",
-        "mesa-davinci": "mesa-davinci",
+        "nixpkgs": "nixpkgs_5",
-        "nixpkgs": "nixpkgs_6",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "norgolith": "norgolith",
         "nvim-wrapped": "nvim-wrapped",
         "omnisearch": "omnisearch",
         "otter-launcher": "otter-launcher",
         "sls-steam": "sls-steam",
-        "way-edges": "way-edges"
+        "way-edges": "way-edges",
+        "woomer": "woomer",
+        "wshowkeys": "wshowkeys"
       }
     },
     "rust-analyzer-src": {
@@ -963,14 +993,14 @@
     },
     "sls-steam": {
       "inputs": {
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1778930278,
+        "lastModified": 1781157498,
-        "narHash": "sha256-uAkLSxQXZc9D8r5rfbYDm4kA/AHfRi9GoN0y4lUI8JM=",
+        "narHash": "sha256-gDNHztsHGFAmbbj7Gcu8vWcFU5+4c1EeGU4lhb7Hnqo=",
         "owner": "AceSLS",
         "repo": "SLSsteam",
-        "rev": "4cc5aa10b4e51b7b7533d6b23156adfb90fff882",
+        "rev": "981da676e76f72b1ed3c387f192509ac9a1b91e4",
         "type": "github"
       },
       "original": {
@@ -1054,6 +1084,36 @@
         "type": "github"
       }
     },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems"
@@ -1074,7 +1134,9 @@
     },
     "way-edges": {
       "inputs": {
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -1091,6 +1153,49 @@
         "type": "github"
       }
     },
+    "woomer": {
+      "inputs": {
+        "crane": "crane",
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1782507996,
+        "narHash": "sha256-hO+SIA6Q41hiwZBFGHBjkOsRQFUcO0SbJqmYeyy2sfM=",
+        "owner": "voidarclabs",
+        "repo": "woomer",
+        "rev": "572844bdae8dded0bbad9e23ca354dcd857f6b98",
+        "type": "github"
+      },
+      "original": {
+        "owner": "voidarclabs",
+        "repo": "woomer",
+        "type": "github"
+      }
+    },
+    "wshowkeys": {
+      "inputs": {
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1781708685,
+        "narHash": "sha256-NH5b736WoI9LodJKPlonO1X+Lxg8URMLLRkT5to61Zg=",
+        "owner": "voidarclabs",
+        "repo": "wshowkeys",
+        "rev": "47dfb7a0237acbf847ca28cbb88000b33929f50a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "voidarclabs",
+        "repo": "wshowkeys",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -1119,11 +1224,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778265244,
+        "lastModified": 1780133819,
-        "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=",
+        "narHash": "sha256-0YPKIY3dlnR7SPq7Z8ekFVvzFsfeiAtEj+QUI3KHrlI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968",
+        "rev": "4a170c0ba96fd37374f93d8f91c9ed91814828ac",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,29 +3,47 @@
 
   inputs = {
     # System
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nvim-wrapped = {
+    nvim-wrapped.url = "git+file:///home/user01/.dotfiles/.config/nvim";
-      url = "git+file:///home/user01/.dotfiles/.config/nvim";
-    };
     hyprland.url = "github:hyprwm/Hyprland";
 
     # Apps
     sls-steam.url = "github:AceSLS/SLSsteam";
+    woomer = {
+      url = "github:voidarclabs/woomer";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     chataigne.url = "./modules/chataigne";
     norgolith = {
       url = "github:NTBBloodbath/norgolith";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    wshowkeys = {
+      url = "github:voidarclabs/wshowkeys";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Utils
-    doot.url = "github:voidarclabs/nixos.doot";
+    doot = {
-    way-edges.url = "github:way-edges/way-edges";
+      url = "github:voidarclabs/nixos.doot";
-    otter-launcher.url = "github:kuokuo123/otter-launcher";
+      inputs.nixpkgs.follows = "nixpkgs";
-    fsel.url = "github:Mjoyufull/fsel";
+    };
+    way-edges = {
+      url = "github:way-edges/way-edges";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    otter-launcher = {
+      url = "github:kuokuo123/otter-launcher";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    fsel = {
+      url = "github:Mjoyufull/fsel";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Davinci-resolve
-    mesa-davinci.url = "github:nixos/nixpkgs?ref=599ddd2b79331c1e6153e1659bdaab65d62c4c82";
+    cracked-davinci.url = "git+https://git.voidarc.co.uk/voidarc/nixos.davinci";
 
     omnisearch = {
       url = "git+https://git.voidarc.co.uk/voidarc/omnisearch";
@@ -33,36 +51,33 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
     ...
-    }@inputs:
+  } @ inputs: let
-    let
     system = "x86_64-linux";
 
     hardwareConfig = import /etc/nixos/hardware-configuration.nix;
     common = import ./configs/common.nix;
 
-      mkSystem =
+    mkSystem = extraModules:
-        extraModules:
       nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = {inherit inputs;};
-          modules = [
+        modules =
+          [
             common
             hardwareConfig
           ]
           ++ extraModules;
       };
-    in
+  in {
-    {
     nixosConfigurations = {
       mobile02 = mkSystem [./configs/configuration-laptop.nix];
       hackstation = mkSystem [
         ./configs/configuration-pc.nix
-          ./modules/davinci/davinci.nix
+        # ./modules/davinci/davinci.nix
         ./modules/i3/i3.nix
         inputs.omnisearch.nixosModules.default
         {

modules/chataigne/flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773222311,
+        "lastModified": 1780952837,
-        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
+        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0590cd39f728e129122770c029970378a79d076a",
+        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
         "type": "github"
       },
       "original": {

modules/chataigne/flake.nix

@@ -5,9 +5,10 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
   };
 
-  outputs =
+  outputs = {
-    { self, nixpkgs }:
+    self,
-    let
+    nixpkgs,
+  }: let
     system = "x86_64-linux";
     pkgs = import nixpkgs {inherit system;};
 
@@ -55,8 +56,7 @@
         "Development"
       ];
     };
-    in
+  in {
-    {
     # packages.${system}.default = chataigne-bin;
 
     devShells.${system}.default = pkgs.mkShell {

modules/davinci/davinci.nix

@@ -1,192 +0,0 @@
-# Tested on Davinci 20.2.2. It works for loading videos and exporting in H264/5 & AV1
-# Even if following this guide https://www.reddit.com/r/LinuxCrackSupport/comments/1nfqhld/davinci_resolve_studio_202_fix_linux_crack_guide/
-# nixpkgs rev used for this tests: 4652ba995a945108fb891191c1e910b9a6ed9064
-
-{ lib, inputs, ... }:
-let
-  mesa-good-pkg = inputs.mesa-davinci.legacyPackages.x86_64-linux.mesa;
-  pkgs = import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/ec7c70d12ce2fc37cb92aff673dcdca89d187bae.tar.gz";
-  }) { config.allowUnfree = true; };
-  pkgs-pinned =
-    import
-      (builtins.fetchTarball {
-        url = "https://github.com/NixOS/nixpkgs/archive/497ee3c70707fd71b45c37d48ae1d45e79751047.tar.gz";
-      })
-      {
-        config = {
-          allowUnfree = true;
-        };
-      };
-
-  ffmpeg-encoder-plugin = pkgs.stdenv.mkDerivation (finalAttrs: {
-    pname = "ffmpeg-encoder-plugin";
-    version = "1.2.1";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "EdvinNilsson";
-      repo = "ffmpeg_encoder_plugin";
-      rev = "v${finalAttrs.version}";
-      hash = "sha256-F4Q8YCXD5UldTwLbWK4nHacNPQ/B+4yLL96sq7xZurM=";
-    };
-
-    nativeBuildInputs = [ pkgs.cmake ];
-    buildInputs = [ pkgs.ffmpeg-full ];
-
-    installPhase = ''
-      mkdir -p $out
-      cp ffmpeg_encoder_plugin.dvcp $out/
-    '';
-  });
-
-  davinci-resolve-studio-cracked =
-    let
-      davinci-patched = pkgs-pinned.davinci-resolve-studio.davinci.overrideAttrs (old: {
-        # script based on https://www.reddit.com/r/LinuxCrackSupport/comments/1nfqhld/davinci_resolve_studio_202_fix_linux_crack_guide/
-        #
-        # Additionally, it will install ffmpeg_encoder_plugin to enable H264/5 & AV1 exports:
-        # https://github.com/EdvinNilsson/ffmpeg_encoder_plugin
-        #
-        # Note: $out IS /opt/resolve
-        postInstall = ''
-                    ${old.postInstall or ""}
-                    ${lib.getExe pkgs.perl} -pi -e 's/\x74\x11\xe8\x21\x23\x00\x00/\xeb\x11\xe8\x21\x23\x00\x00/g' $out/bin/resolve
-                    ${lib.getExe pkgs.perl} -pi -e 's/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\x74\x11\x48\x8B\x45\xC8\x8B/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\xEB\x11\x48\x8B\x45\xC8\x8B/' $out/bin/resolve
-                    ${lib.getExe pkgs.perl} -pi -e 's/\x74\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/\xEB\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/' $out/bin/resolve
-                    ${lib.getExe pkgs.perl} -pi -e 's/\x41\xb6\x01\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/\x41\xb6\x00\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/' $out/bin/resolve
-                    touch $out/.license/blackmagic.lic
-                    echo -e "LICENSE blackmagic davinciresolvestudio 999999 permanent uncounted\n  hostid=ANY issuer=CGP customer=CGP issued=28-dec-2023\n  akey=0000-0000-0000-0000 _ck=00 sig=\"00\"" > $out/.license/blackmagic.lic
-
-          					mkdir -p $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64
-          					cp ${ffmpeg-encoder-plugin}/ffmpeg_encoder_plugin.dvcp $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64/
-          					'';
-      });
-    in
-
-    # the following was copied from davinci's derivation from nixpkgs.
-    # if davinci updates, this should be updated too
-    # but remember to replace "davinci" with "davinci-patched"
-    pkgs.buildFHSEnv {
-      inherit (davinci-patched) pname version;
-
-      targetPkgs =
-        pkgs:
-        with pkgs;
-        [
-          alsa-lib
-          aprutil
-          bzip2
-          dbus
-          expat
-          fontconfig
-          freetype
-          glib
-          libGL
-          libGLU
-          libarchive
-          libcap
-          librsvg
-          libtool
-          libuuid
-          libxcrypt # provides libcrypt.so.1
-          libxkbcommon
-          nspr
-          ocl-icd
-          opencl-headers
-          python3
-          python3.pkgs.numpy
-          udev
-          xdg-utils # xdg-open needed to open URLs
-          libICE
-          libSM
-          libX11
-          libXcomposite
-          libXcursor
-          libXdamage
-          libXext
-          libXfixes
-          libXi
-          libXinerama
-          libXrandr
-          libXrender
-          libXt
-          libXtst
-          libXxf86vm
-          libxcb
-          xcbutil
-          xcbutilimage
-          xcbutilkeysyms
-          xcbutilrenderutil
-          xcbutilwm
-          xkeyboardconfig
-          zlib
-          ocl-icd
-          rocmPackages.clr.icd
-          libGL
-          libGLU
-        ]
-        ++ [
-          mesa-good-pkg
-          davinci-patched
-        ];
-
-      extraPreBwrapCmds = ''
-        mkdir -p ~/.local/share/DaVinciResolve/Extras || exit 1
-      '';
-
-      extraBwrapArgs = [
-        ''--bind "$HOME"/.local/share/DaVinciResolve/Extras ${davinci-patched}/Extras''
-      ];
-
-      runScript = "${lib.getExe pkgs.bash} ${pkgs.writeText "davinci-wrapper" ''
-          export QT_XKB_CONFIG_ROOT="${pkgs.xkeyboard_config}/share/X11/xkb"
-          export QT_PLUGIN_PATH="${davinci-patched}/libs/plugins:$QT_PLUGIN_PATH"
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:/usr/lib32:${davinci-patched}/libs
-        	# Force Resolve to use X11 (via XWayland) to avoid Aquamarine/Hyprland conflicts
-          export QT_QPA_PLATFORM=xcb
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${davinci-patched}/libs
-          
-          # Prevent Resolve from trying to talk to the Wayland socket directly
-          unset WAYLAND_DISPLAY
-          ${davinci-patched}/bin/resolve
-      ''}";
-
-      extraInstallCommands = ''
-        mkdir -p $out/share/applications $out/share/icons/hicolor/128x128/apps
-        ln -s ${davinci-patched}/share/applications/*.desktop $out/share/applications/
-        ln -s ${davinci-patched}/graphics/DV_Resolve.png $out/share/icons/hicolor/128x128/apps/davinci-resolve-studio.png
-      '';
-
-      passthru = {
-        inherit davinci-patched;
-        updateScript = lib.getExe (
-          pkgs.writeShellApplication {
-            name = "update-davinci-resolve";
-            runtimeInputs = [
-              pkgs.curl
-              pkgs.jq
-              pkgs.common-updater-scripts
-            ];
-            text = ''
-              set -o errexit
-              drv=pkgs/by-name/da/davinci-resolve/package.nix
-              currentVersion=${lib.escapeShellArg davinci-patched.version}
-              downloadsJSON="$(curl --fail --silent https://www.blackmagicdesign.com/api/support/us/downloads.json)"
-
-              latestLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve \K\d+\.\d+(\.\d+)?' | sort | tail -n 1)"
-              update-source-version davinci-resolve "$latestLinuxVersion" --source-key=davinci.src
-
-              # Since the standard and studio both use the same version we need to reset it before updating studio
-              sed -i -e "s/""$latestLinuxVersion""/""$currentVersion""/" "$drv"
-
-              latestStudioLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve Studio \K\d+\.\d+(\.\d+)?' | sort | tail -n 1)"
-              update-source-version davinci-resolve-studio "$latestStudioLinuxVersion" --source-key=davinci.src
-            '';
-          }
-        );
-      };
-    };
-in
-{
-  environment.systemPackages = [ davinci-resolve-studio-cracked ];
-}

modules/i3/i3.nix

@@ -4,8 +4,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-{
   services.libinput.enable = true;
 
   services.displayManager.defaultSession = "hyprland";
@@ -21,7 +20,7 @@
       extraPackages = with pkgs; [
         dmenu # application launcher most people use
         i3status # gives you the default i3 status bar
-        xorg.xinit
+        xinit
       ];
     };
   };