diff --git a/common/home/packages/games.nix b/common/home/packages/games.nix index 446799b..cc806aa 100644 --- a/common/home/packages/games.nix +++ b/common/home/packages/games.nix @@ -14,6 +14,7 @@ xemu the-powder-toy gzdoom + qzdl r2modman # gale ruffle diff --git a/common/home/packages/hacking.nix b/common/home/packages/hacking.nix index 28fe594..6550e08 100644 --- a/common/home/packages/hacking.nix +++ b/common/home/packages/hacking.nix @@ -10,7 +10,6 @@ gephi xxd hexcurse - (lib.hiPrio autopsy) sleuthkit exiftool samba4 @@ -43,6 +42,7 @@ ]; stable = with pkgs-stable; [ + (lib.hiPrio autopsy) smbmap kerbrute bloodhound diff --git a/common/home/packages/internet.nix b/common/home/packages/internet.nix index 41f2de7..b46b51c 100644 --- a/common/home/packages/internet.nix +++ b/common/home/packages/internet.nix @@ -11,6 +11,8 @@ megasync floorp-bin vivaldi + librewolf + ladybird ]; stable = with pkgs-stable; [ diff --git a/common/home/packages/object-creation.nix b/common/home/packages/object-creation.nix index f6032c6..0e4c0b3 100644 --- a/common/home/packages/object-creation.nix +++ b/common/home/packages/object-creation.nix @@ -13,11 +13,13 @@ prusa-slicer # bambu-studio openrocket + calculix-ccx ]; stable = with pkgs-stable; [ # Object creation kicad + openscad (lib.hiPrio freecad) # brlcad ]; diff --git a/common/nixos/default-config.nix b/common/nixos/default-config.nix index 82630cd..fed955f 100644 --- a/common/nixos/default-config.nix +++ b/common/nixos/default-config.nix @@ -80,7 +80,7 @@ networking = { networkmanager.enable = true; - wireless.enable = false; + # wireless.enable = false; hosts = { "192.168.0.219" = [ "server.idm.reboot-codes.com" ]; diff --git a/flake.lock b/flake.lock index 9e731a9..4feffda 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765984806, - "narHash": "sha256-DwuSAWvgBKU7NRof3YzjtP1XcH2E01LGj3umVArVVmI=", + "lastModified": 1766424259, + "narHash": "sha256-ikKwd1/8rLIz8I+B8kwLaNwW5Hh75bkgGRalC+gEpw0=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "ad53a7d8976c4bd8d36b6e73b980cde0d3541043", + "rev": "37c289121c7ed44f723c326b6c079cd8aaeb35cf", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1765794845, - "narHash": "sha256-YD5QWlGnusNbZCqR3pxG8tRxx9yUXayLZfAJRWspq2s=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "7194cfe5b7a3660726b0fe7296070eaef601cae9", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -88,7 +88,7 @@ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" }, "original": { "type": "tarball", @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1765980955, - "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", + "lastModified": 1766963849, + "narHash": "sha256-9a1PTYJByzRUurF8Vb5kNXcO5HEBj9uGQMS7JoLUGTI=", "owner": "nix-community", "repo": "home-manager", - "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", + "rev": "87785ddbc70fbd379cf3ee0d1ebd778957172248", "type": "github" }, "original": { @@ -349,15 +349,16 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_4", + "nvfetcher": "nvfetcher", "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765935045, - "narHash": "sha256-nppx66CXo7GpJnvpjrlNdNBvi/bFhVpc8sk09rtysfA=", + "lastModified": 1766538331, + "narHash": "sha256-biwvZsCGC4vCXS6rzs3tUkELqqEXPko0E3R9IhYKavE=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "cefcf3998f426c7b3d956ac7bd8360dddd724e33", + "rev": "9e8efcd2c4ea906772dea99204a9819284a29b81", "type": "github" }, "original": { @@ -384,11 +385,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -416,11 +417,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -436,11 +437,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1765990771, - "narHash": "sha256-dy3vF3WACPcTYPUEarrxvTdaMa6dE6FJt1bzTQrJsC0=", + "lastModified": 1766965629, + "narHash": "sha256-3WPHmtOp7/PgSVilz2AK/GSycPZTcOUsLcZvCAGdaRE=", "owner": "nix-community", "repo": "NUR", - "rev": "a4cf43e41d03053985d575c8a31e818a13cfaf02", + "rev": "550229be6f173ebacbb7368108878349b780c778", "type": "github" }, "original": { @@ -449,6 +450,35 @@ "type": "github" } }, + "nvfetcher": { + "inputs": { + "flake-compat": [ + "nixpkgs-xr", + "flake-compat" + ], + "flake-utils": [ + "nixpkgs-xr", + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs-xr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765698311, + "narHash": "sha256-78sPqekEDJiol2YD3Hx2zHu5E4AtrbNrUKi0032HMHo=", + "owner": "berberman", + "repo": "nvfetcher", + "rev": "dbae9626c46b93d9fd6b85c8b292939ae569c4fc", + "type": "github" + }, + "original": { + "owner": "berberman", + "repo": "nvfetcher", + "type": "github" + } + }, "pwndbg": { "inputs": { "nixpkgs": [ @@ -459,11 +489,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1765987975, - "narHash": "sha256-26RB0KAh5kwSa/Mm9UUEJrFc94nO7h+FWVnILqXmqF0=", + "lastModified": 1766861643, + "narHash": "sha256-Zl5D3qws8aF+djyv1CByEcvGuU9jrq0ypCGM2iNEplY=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "cdd13551ff02311e4327bfeb763924317da7b36a", + "rev": "dca241bf82d70392e4ceb783d1af9cef20081cc2", "type": "github" }, "original": { @@ -585,11 +615,11 @@ ] }, "locked": { - "lastModified": 1765939271, - "narHash": "sha256-7F/d+ZrTYyOxnBZcleQZjOOEWc1IMXR/CLLRLLsVtHo=", + "lastModified": 1766890375, + "narHash": "sha256-0Zi7ChAtjq/efwQYmp7kOJPcSt6ya9ynSUe6ppgZhsQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8028944c1339469124639da276d403d8ab7929a8", + "rev": "91e1f7a0017065360f447622d11b7ce6ed04772f", "type": "github" }, "original": { @@ -636,11 +666,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { diff --git a/nixos/custom-odin-nixos/configuration.nix b/nixos/custom-odin-nixos/configuration.nix index 62c9559..9c852a2 100755 --- a/nixos/custom-odin-nixos/configuration.nix +++ b/nixos/custom-odin-nixos/configuration.nix @@ -523,6 +523,10 @@ in { "io.github.hydrusnetwork.hydrus" ]; }; + + i2pd = { + enable = false; + }; }; environment = { diff --git a/nixos/default.nix b/nixos/default.nix index c7898bb..4f7852b 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,4 +1,20 @@ -{ disko, nixpkgs, nixpkgs-stable, home-manager, flatpaks, rust-overlay, nur, chaotic, aagl, nixGL, pwndbg, nix-index-database, nixpkgs-xr, ... }: let +{ + disko, + nixpkgs, + nixpkgs-stable, + home-manager, + flatpaks, + rust-overlay, + nur, + chaotic, + aagl, + nixGL, + pwndbg, + nix-index-database, + nixpkgs-xr, + ... +}: +let defaultDesktop = { username = "reboot"; system = "x86_64-linux"; @@ -19,59 +35,86 @@ hosts = { "latitude7390-loki-nixos" = defaultDesktop; - "custom-odin-nixos" = defaultDesktop;# // { useDisko = true; }; + "custom-odin-nixos" = defaultDesktop; # // { useDisko = true; }; "temp-installer-nixos" = installISO; - + "minisforum-valkyrie-2-nixos.cloud.reboot-codes.com" = server; }; -in (nixpkgs.lib.genAttrs (builtins.attrNames hosts) (hostname: let - hostConfig = hosts."${hostname}"; - system = hostConfig.system; +in +(nixpkgs.lib.genAttrs (builtins.attrNames hosts) ( + hostname: + let + hostConfig = hosts."${hostname}"; + system = hostConfig.system; - pkgs-stable = import nixpkgs-stable { - # Refer to the `system` parameter from - # the outer scope recursively - inherit system; + pkgs-stable = import nixpkgs-stable { + # Refer to the `system` parameter from + # the outer scope recursively + inherit system; - config = import ../common/utils/nix-config.nix; - }; -in nixpkgs.lib.nixosSystem rec { - system = hostConfig.system; + config = import ../common/utils/nix-config.nix; + }; + in + nixpkgs.lib.nixosSystem rec { + system = hostConfig.system; - # The `specialArgs` parameter passes the non-default nixpkgs instances to other nix modules - specialArgs = { - inherit pkgs-stable rust-overlay nixGL hostConfig pwndbg nix-index-database nixpkgs-xr; - }; + # The `specialArgs` parameter passes the non-default nixpkgs instances to other nix modules + specialArgs = { + inherit + pkgs-stable + rust-overlay + nixGL + hostConfig + pwndbg + nix-index-database + nixpkgs-xr + ; + }; - modules = [ - # Imported Flakes - home-manager.nixosModules.home-manager - flatpaks.nixosModules.nix-flatpak - nur.modules.nixos.default - chaotic.nixosModules.default - nix-index-database.nixosModules.nix-index - nixpkgs-xr.nixosModules.nixpkgs-xr + modules = [ + # Imported Flakes + home-manager.nixosModules.home-manager + flatpaks.nixosModules.nix-flatpak + nur.modules.nixos.default + chaotic.nixosModules.default + nix-index-database.nixosModules.nix-index + nixpkgs-xr.nixosModules.nixpkgs-xr - { - networking.hostName = "${hostname}"; # Define your hostname. + { + networking.hostName = "${hostname}"; # Define your hostname. - # AAGL stuff: https://github.com/ezKEa/aagl-gtk-on-nix - imports = [ aagl.nixosModules.default ]; - nix.settings = aagl.nixConfig; + # AAGL stuff: https://github.com/ezKEa/aagl-gtk-on-nix + imports = [ aagl.nixosModules.default ]; + nix.settings = aagl.nixConfig; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; - #! IMPORTANT: Any custom package inputs **need** to be placed here as well if they should be used by home-manager! - extraSpecialArgs = { - inherit pkgs-stable pwndbg nixpkgs-xr; + #! IMPORTANT: Any custom package inputs **need** to be placed here as well if they should be used by home-manager! + extraSpecialArgs = { + inherit pkgs-stable pwndbg nixpkgs-xr; + }; }; - }; - } + } - ../common/nixos # TODO: Set default system packages! - ../common/home - (./. + "/${hostname}") # Our Configs, TODO: Make sure that home and system packages are `//`'d together with previous configs. (Use lib.mkForce for force overrides?) - ] ++ (if (nixpkgs.lib.hasAttr "useDisko" hostConfig) then (if hostConfig.useDisko then [disko.nixosModules.disko (./. + "/${hostname}/disko.nix")] else []) else []); -})) + ../common/nixos # TODO: Set default system packages! + ../common/home + (./. + "/${hostname}") # Our Configs, TODO: Make sure that home and system packages are `//`'d together with previous configs. (Use lib.mkForce for force overrides?) + ] + ++ ( + if (nixpkgs.lib.hasAttr "useDisko" hostConfig) then + ( + if hostConfig.useDisko then + [ + disko.nixosModules.disko + (./. + "/${hostname}/disko.nix") + ] + else + [ ] + ) + else + [ ] + ); + } +))