From 7f54f949740fa8d5c7f1226f9fa9e9289385ec06 Mon Sep 17 00:00:00 2001 From: Hadi Date: Mon, 8 Jun 2026 14:47:28 +0200 Subject: [PATCH] nur-anotherhadi Signed-off-by: Hadi --- flake.lock | 637 ++++-------------- flake.nix | 11 +- home/programs/group/basic-apps.nix | 3 +- .../programs/group/cybersecurity-packages.nix | 57 +- home/programs/group/cybersecurity.nix | 7 +- home/programs/group/dev-packages.nix | 5 +- home/programs/group/flake.nix | 3 +- home/programs/group/misc.nix | 2 +- hosts/work/configuration.nix | 2 +- nixos/home-manager.nix | 1 + nixos/sddm.nix | 59 -- 11 files changed, 167 insertions(+), 620 deletions(-) delete mode 100644 nixos/sddm.nix diff --git a/flake.lock b/flake.lock index 50cb0a3..fef48af 100644 --- a/flake.lock +++ b/flake.lock @@ -166,34 +166,13 @@ "bun2nix_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_2", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1778446047, - "narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=", - "owner": "nix-community", - "repo": "bun2nix", - "rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "bun2nix", - "type": "github" - } - }, - "bun2nix_3": { - "inputs": { - "flake-parts": "flake-parts_3", "import-tree": "import-tree_2", "nixpkgs": [ "default-creds", "nixpkgs" ], - "systems": "systems_3", - "treefmt-nix": "treefmt-nix_3" + "systems": "systems_2", + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1770895533, @@ -209,16 +188,16 @@ "type": "github" } }, - "bun2nix_4": { + "bun2nix_3": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "import-tree": "import-tree_3", "nixpkgs": [ "iknowyou", "nixpkgs" ], - "systems": "systems_5", - "treefmt-nix": "treefmt-nix_4" + "systems": "systems_4", + "treefmt-nix": "treefmt-nix_3" }, "locked": { "lastModified": 1770895533, @@ -343,8 +322,8 @@ }, "default-creds": { "inputs": { - "bun2nix": "bun2nix_3", - "nixpkgs": "nixpkgs_4" + "bun2nix": "bun2nix_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1780323652, @@ -393,22 +372,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1777699697, @@ -424,22 +387,6 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -459,27 +406,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "bun2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1777988971, - "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -497,7 +423,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -515,7 +441,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nvf", @@ -536,7 +462,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -557,42 +483,6 @@ "type": "github" } }, - "flake-utils": { - "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_2": { - "inputs": { - "systems": "systems_9" - }, - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -609,52 +499,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", - "nixpkgs": [ - "jwt-tui", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_3", - "nixpkgs": [ - "spilltea", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -677,50 +521,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "jwt-tui", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "spilltea", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -738,53 +538,9 @@ "type": "github" } }, - "gomod2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "jwt-tui", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770585520, - "narHash": "sha256-yBz9Ozd5Wb56i3e3cHZ8WcbzCQ9RlVaiW18qDYA/AzA=", - "owner": "nix-community", - "repo": "gomod2nix", - "rev": "1201ddd1279c35497754f016ef33d5e060f3da8d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "gomod2nix", - "type": "github" - } - }, - "gomod2nix_2": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "spilltea", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770585520, - "narHash": "sha256-yBz9Ozd5Wb56i3e3cHZ8WcbzCQ9RlVaiW18qDYA/AzA=", - "owner": "nix-community", - "repo": "gomod2nix", - "rev": "1201ddd1279c35497754f016ef33d5e060f3da8d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "gomod2nix", - "type": "github" - } - }, "helium-browser": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1780054154, @@ -889,9 +645,9 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_4", + "systems": "systems_3", "xdph": "xdph" }, "locked": { @@ -1143,8 +899,8 @@ }, "iknowyou": { "inputs": { - "bun2nix": "bun2nix_4", - "nixpkgs": "nixpkgs_7", + "bun2nix": "bun2nix_3", + "nixpkgs": "nixpkgs_6", "nur-osint": "nur-osint" }, "locked": { @@ -1206,26 +962,6 @@ "type": "github" } }, - "jwt-tui": { - "inputs": { - "git-hooks": "git-hooks", - "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1780041051, - "narHash": "sha256-8Im6iclbJ96xlL0JZsMlPxivSDI1eusRuRn65hFBTEs=", - "owner": "anotherhadi", - "repo": "jwt-tui", - "rev": "c0c852ba27caf6f8e55e9dcae2a25bb79c393ed9", - "type": "github" - }, - "original": { - "owner": "anotherhadi", - "repo": "jwt-tui", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1778541201, @@ -1285,8 +1021,8 @@ }, "nixarr": { "inputs": { - "nixpkgs": "nixpkgs_9", - "treefmt-nix": "treefmt-nix_5", + "nixpkgs": "nixpkgs_7", + "treefmt-nix": "treefmt-nix_4", "vpnconfinement": "vpnconfinement", "website-builder": "website-builder" }, @@ -1306,7 +1042,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1780310866, @@ -1402,28 +1138,31 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_11": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", - "owner": "nixos", + "lastModified": 1780749050, + "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1433,35 +1172,19 @@ "locked": { "lastModified": 1778869304, "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_13": { - "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_14": { "locked": { "lastModified": 1775888245, "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", @@ -1477,23 +1200,7 @@ "type": "github" } }, - "nixpkgs_15": { - "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_16": { + "nixpkgs_14": { "locked": { "lastModified": 1780243769, "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", @@ -1509,22 +1216,6 @@ "type": "github" } }, - "nixpkgs_17": { - "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1776548001, @@ -1542,22 +1233,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1772773019, "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", @@ -1573,7 +1248,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1777578337, "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", @@ -1589,7 +1264,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1779357205, "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", @@ -1605,7 +1280,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1775710090, "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", @@ -1621,23 +1296,7 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1775595990, "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", @@ -1653,10 +1312,39 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "notashelf-tuigreet": { "inputs": { "crane": "crane", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay" }, "locked": { @@ -1698,6 +1386,24 @@ "type": "github" } }, + "nur-anotherhadi": { + "inputs": { + "nixpkgs": "nixpkgs_11" + }, + "locked": { + "lastModified": 1780920949, + "narHash": "sha256-0aUc1DUHupGFXc1WkSnpvAqyFQTlVS/Z8cHyQv1FSvE=", + "owner": "anotherhadi", + "repo": "nur-packages", + "rev": "3a3412876627343386097b1a1cc0a803ed55bf82", + "type": "github" + }, + "original": { + "owner": "anotherhadi", + "repo": "nur-packages", + "type": "github" + } + }, "nur-osint": { "inputs": { "nixpkgs": [ @@ -1721,12 +1427,12 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_5", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_4", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_13", - "systems": "systems_7" + "nixpkgs": "nixpkgs_12", + "systems": "systems_5" }, "locked": { "lastModified": 1780511420, @@ -1812,7 +1518,6 @@ "inputs": { "awesome-wallpapers": "awesome-wallpapers", "blog": "blog", - "bun2nix": "bun2nix_2", "caelestia-cli": "caelestia-cli", "caelestia-shell": "caelestia-shell_2", "default-creds": "default-creds", @@ -1820,19 +1525,17 @@ "home-manager": "home-manager", "hyprland": "hyprland", "iknowyou": "iknowyou", - "jwt-tui": "jwt-tui", "nix-index-database": "nix-index-database", "nixarr": "nixarr", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable", "notashelf-tuigreet": "notashelf-tuigreet", + "nur-anotherhadi": "nur-anotherhadi", "nvf": "nvf", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", - "spilltea": "spilltea", - "stylix": "stylix", - "usbguard-tui": "usbguard-tui" + "stylix": "stylix" } }, "rust-overlay": { @@ -1858,7 +1561,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1780547341, @@ -1879,7 +1582,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1780422259, @@ -1895,26 +1598,6 @@ "type": "github" } }, - "spilltea": { - "inputs": { - "git-hooks": "git-hooks_2", - "gomod2nix": "gomod2nix_2", - "nixpkgs": "nixpkgs_15" - }, - "locked": { - "lastModified": 1780165111, - "narHash": "sha256-xOJ+VvrdPRyNJBVo+1Sd1tvw++OWbBN59uWI3Tc/hCY=", - "owner": "anotherhadi", - "repo": "spilltea", - "rev": "a75b65644f6d9fd8e2d54a6361e8f2db3d0272d6", - "type": "github" - }, - "original": { - "owner": "anotherhadi", - "repo": "spilltea", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -1922,11 +1605,11 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_14", "nur": "nur", - "systems": "systems_10", + "systems": "systems_7", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -1961,21 +1644,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1992,21 +1660,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2021,6 +1674,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_5": { "locked": { "lastModified": 1681028828, @@ -2066,36 +1734,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -2183,27 +1821,6 @@ } }, "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "bun2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "default-creds", @@ -2225,7 +1842,7 @@ "type": "github" } }, - "treefmt-nix_4": { + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "iknowyou", @@ -2247,7 +1864,7 @@ "type": "github" } }, - "treefmt-nix_5": { + "treefmt-nix_4": { "inputs": { "nixpkgs": [ "nixarr", @@ -2268,24 +1885,6 @@ "type": "github" } }, - "usbguard-tui": { - "inputs": { - "nixpkgs": "nixpkgs_17" - }, - "locked": { - "lastModified": 1779819262, - "narHash": "sha256-m4Bg2uy9WqYHaTod/dJfFUHCAXDwg6+4GLXGUIAid5Q=", - "owner": "anotherhadi", - "repo": "usbguard-tui", - "rev": "031ff4869609f9f3c100275fb666d43daa373856", - "type": "github" - }, - "original": { - "owner": "anotherhadi", - "repo": "usbguard-tui", - "type": "github" - } - }, "vpnconfinement": { "locked": { "lastModified": 1767604552, diff --git a/flake.nix b/flake.nix index 942a26d..33fecce 100644 --- a/flake.nix +++ b/flake.nix @@ -14,9 +14,8 @@ sops-nix.url = "github:Mic92/sops-nix"; nvf.url = "github:notashelf/nvf"; notashelf-tuigreet.url = "github:NotAShelf/tuigreet"; - bun2nix.url = "github:nix-community/bun2nix"; - usbguard-tui.url = "github:anotherhadi/usbguard-tui"; - jwt-tui.url = "github:anotherhadi/jwt-tui"; + helium-browser.url = "github:oxcl/nix-flake-helium-browser"; + nur-anotherhadi.url = "github:anotherhadi/nur-packages"; nix-index-database = { url = "github:nix-community/nix-index-database"; @@ -38,16 +37,13 @@ url = "github:Gerg-L/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + # Server - # FIXME: Deleted repo for now - # eleakxir.url = "github:anotherhadi/eleakxir"; nixarr.url = "github:rasmus-kirk/nixarr"; default-creds.url = "github:anotherhadi/default-creds"; blog.url = "github:anotherhadi/blog"; awesome-wallpapers.url = "github:anotherhadi/awesome-wallpapers"; iknowyou.url = "github:anotherhadi/iknowyou"; - spilltea.url = "github:anotherhadi/spilltea"; - helium-browser.url = "github:oxcl/nix-flake-helium-browser"; }; outputs = inputs @ { @@ -65,6 +61,7 @@ pkgs ; pkgs-stable = nixpkgs-stable.legacyPackages.${system}; + pkgs-nur-hadi = inputs.nur-anotherhadi.packages.${system}; }; merge = nixpkgs.lib.foldl nixpkgs.lib.recursiveUpdate {}; in diff --git a/home/programs/group/basic-apps.nix b/home/programs/group/basic-apps.nix index 2796032..2f524ec 100644 --- a/home/programs/group/basic-apps.nix +++ b/home/programs/group/basic-apps.nix @@ -1,4 +1,4 @@ -{pkgs-stable, ...}: { +{pkgs-stable, pkgs-nur-hadi, ...}: { home.packages = with pkgs-stable; [ vlc # Video player obsidian # Note taking app @@ -26,5 +26,6 @@ httpie # Command-line HTTP client, a user-friendly cURL replacement wiremix # Simple TUI mixer for PipeWire impala # TUI for managing wifi + pkgs-nur-hadi.usbguard-tui ]; } diff --git a/home/programs/group/cybersecurity-packages.nix b/home/programs/group/cybersecurity-packages.nix index 7a2cfde..c0e9af5 100644 --- a/home/programs/group/cybersecurity-packages.nix +++ b/home/programs/group/cybersecurity-packages.nix @@ -1,37 +1,48 @@ { pkgs, pkgs-stable, - inputs, - system, + pkgs-nur-hadi, }: (with pkgs-stable; [ - termshark # wireshark - trufflehog - nmap - john + # Web + dirb + ffuf + katana + whatweb + + # Hashes hashcat - metasploit haiti hydra + john + + # Databases + mariadb + redis + sqlmap + nosqli + + # Network + inetutils + termshark # wireshark in TUI dnsrecon whois dig - nosqli - jwt-cli - nuclei - caido - gobuster - dirb - ffuf - sqlmap - katana - inetutils + nmap samba + + # Misc + metasploit + nuclei openvpn - mariadb - redis + + # Secrets + trufflehog + + # Forensics + binwalk +]) +++ (with pkgs-nur-hadi; [ + spilltea + jwt-tui ]) -++ [ - inputs.spilltea.packages.${system}.default - inputs.jwt-tui.packages.${system}.default -] diff --git a/home/programs/group/cybersecurity.nix b/home/programs/group/cybersecurity.nix index 4e00659..cc569cb 100644 --- a/home/programs/group/cybersecurity.nix +++ b/home/programs/group/cybersecurity.nix @@ -1,12 +1,11 @@ { - inputs, - pkgs-stable, pkgs, + pkgs-stable, + pkgs-nur-hadi, ... }: { home.packages = import ./cybersecurity-packages.nix { - inherit pkgs pkgs-stable inputs; - system = pkgs.stdenv.hostPlatform.system; + inherit pkgs pkgs-stable pkgs-nur-hadi; }; systemd.user.tmpfiles.rules = [ diff --git a/home/programs/group/dev-packages.nix b/home/programs/group/dev-packages.nix index 8df3239..93abb25 100644 --- a/home/programs/group/dev-packages.nix +++ b/home/programs/group/dev-packages.nix @@ -6,18 +6,15 @@ }: (with pkgs; [ go - bun - nodejs claude-code - inputs.bun2nix.packages.${system}.default ]) ++ (with pkgs-stable; [ + nodejs air duckdb docker python3 jq - just nix-prefetch-github rsync ]) diff --git a/home/programs/group/flake.nix b/home/programs/group/flake.nix index e557b5a..8609ea6 100644 --- a/home/programs/group/flake.nix +++ b/home/programs/group/flake.nix @@ -2,11 +2,12 @@ inputs, pkgs, pkgs-stable, + pkgs-nur-hadi, system, ... }: let devPackages = import ./dev-packages.nix {inherit pkgs pkgs-stable inputs system;}; - cyberPackages = import ./cybersecurity-packages.nix {inherit pkgs pkgs-stable inputs system;}; + cyberPackages = import ./cybersecurity-packages.nix {inherit pkgs pkgs-stable pkgs-nur-hadi;}; in { packages.${system} = { dev = pkgs.buildEnv { diff --git a/home/programs/group/misc.nix b/home/programs/group/misc.nix index 0f48ca3..436a462 100644 --- a/home/programs/group/misc.nix +++ b/home/programs/group/misc.nix @@ -1,5 +1,6 @@ { pkgs-stable, + pkgs-nur-hadi, inputs, ... }: { @@ -11,6 +12,5 @@ pipes cmatrix fastfetch - inputs.usbguard-tui.packages.${pkgs-stable.stdenv.hostPlatform.system}.default ]; } diff --git a/hosts/work/configuration.nix b/hosts/work/configuration.nix index 094a700..92c3c91 100644 --- a/hosts/work/configuration.nix +++ b/hosts/work/configuration.nix @@ -7,7 +7,7 @@ ../../nixos/home-manager.nix ../../nixos/nix.nix ../../nixos/systemd-boot.nix - ../../nixos/sddm.nix + ../../nixos/tuigreet.nix ../../nixos/usbguard.nix ../../nixos/users.nix ../../nixos/utils.nix diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index a4fd838..69369eb 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -14,6 +14,7 @@ system = pkgs.stdenv.hostPlatform.system; config.allowUnfree = true; }; + pkgs-nur-hadi = inputs.nur-anotherhadi.packages.${pkgs.stdenv.hostPlatform.system}; }; }; } diff --git a/nixos/sddm.nix b/nixos/sddm.nix deleted file mode 100644 index a1bc785..0000000 --- a/nixos/sddm.nix +++ /dev/null @@ -1,59 +0,0 @@ -# SDDM is a display manager for X11 and Wayland -{ - pkgs, - inputs, - config, - ... -}: let - foreground = config.theme.textColorOnWallpaper; - sddm-astronaut = pkgs.sddm-astronaut.override { - embeddedTheme = "pixel_sakura"; - themeConfig = { - HeaderTextColor = "#${foreground}"; - DateTextColor = "#${foreground}"; - TimeTextColor = "#${foreground}"; - LoginFieldTextColor = "#${foreground}"; - PasswordFieldTextColor = "#${foreground}"; - UserIconColor = "#${foreground}"; - PasswordIconColor = "#${foreground}"; - WarningColor = "#${foreground}"; - LoginButtonBackgroundColor = "#${foreground}"; - SystemButtonsIconsColor = "#${foreground}"; - SessionButtonTextColor = "#${foreground}"; - VirtualKeyboardButtonTextColor = "#${foreground}"; - DropdownBackgroundColor = "#${foreground}"; - HighlightBackgroundColor = "#${foreground}"; - Background = - if "sakura_pixelart_light_static.png" == config.stylix.image - then - pkgs.fetchurl { - url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/sakura_pixelart_light_animated.gif"; - sha256 = "sha256-qySDskjmFYt+ncslpbz0BfXiWm4hmFf5GPWF2NlTVB8="; - } - else if "cat-watching-the-star_pixelart_purple_static.png" == config.stylix.image - then - pkgs.fetchurl { - url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/cat-watching-the-star_pixelart_purple_animated.gif"; - sha256 = ""; - } - else "${toString config.stylix.image}"; - }; - }; -in { - services.displayManager = { - sddm = { - package = pkgs.kdePackages.sddm; - extraPackages = [sddm-astronaut]; - enable = true; - wayland.enable = true; - theme = "sddm-astronaut-theme"; - settings = { - Wayland.SessionDir = "${ - inputs.hyprland.packages."${pkgs.stdenv.hostPlatform.system}".hyprland - }/share/wayland-sessions"; - }; - }; - }; - - environment.systemPackages = [sddm-astronaut]; -}