diff --git a/flake.lock b/flake.lock index 5914bf6..7644c8d 100644 --- a/flake.lock +++ b/flake.lock @@ -396,6 +396,22 @@ "type": "github" } }, + "openrgb": { + "flake": false, + "locked": { + "lastModified": 1705609609, + "narHash": "sha256-Il3EpVsM5FjzpH5ayplz1ezCeV+cY0LPF/66+US8RGY=", + "owner": "CalcProgrammer1", + "repo": "OpenRGB", + "rev": "6c279ea830e5442fc409a958b979fb8949073b2e", + "type": "gitlab" + }, + "original": { + "owner": "CalcProgrammer1", + "repo": "OpenRGB", + "type": "gitlab" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -456,6 +472,41 @@ "type": "github" } }, + "prismlauncher": { + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "flake-parts": [ + "flake-parts" + ], + "libnbtplusplus": [ + "libnbtplusplus" + ], + "nix-filter": [ + "nix-filter" + ], + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": [ + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1705608124, + "narHash": "sha256-zVhmURyQ7Q0ZibCNZS12I2CJQXstnnpO9j/gM0h7LNY=", + "owner": "PrismLauncher", + "repo": "PrismLauncher", + "rev": "4cda04271fd615657e1eed7a32f791cbcdcbea76", + "type": "github" + }, + "original": { + "owner": "PrismLauncher", + "repo": "PrismLauncher", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", @@ -474,7 +525,9 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-lib": "nixpkgs-lib", + "openrgb": "openrgb", "pre-commit-hooks": "pre-commit-hooks_2", + "prismlauncher": "prismlauncher", "tela-icon-theme": "tela-icon-theme" } }, diff --git a/flake.nix b/flake.nix index 236e6bd..b68e36b 100644 --- a/flake.nix +++ b/flake.nix @@ -24,15 +24,15 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - #prismlauncher = { - # url = "github:PrismLauncher/PrismLauncher"; - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.flake-parts.follows = "flake-parts"; - # inputs.pre-commit-hooks.follows = "pre-commit-hooks"; - # inputs.flake-compat.follows = "flake-compat"; - # inputs.libnbtplusplus.follows = "libnbtplusplus"; - # inputs.nix-filter.follows = "nix-filter"; - #}; + prismlauncher = { + url = "github:PrismLauncher/PrismLauncher"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + inputs.pre-commit-hooks.follows = "pre-commit-hooks"; + inputs.flake-compat.follows = "flake-compat"; + inputs.libnbtplusplus.follows = "libnbtplusplus"; + inputs.nix-filter.follows = "nix-filter"; + }; nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-generators = { url = "github:nix-community/nixos-generators"; @@ -43,10 +43,10 @@ url = "github:vinceliuice/Tela-icon-theme"; flake = false; }; - #openrgb = { - # url = "gitlab:CalcProgrammer1/OpenRGB"; - # flake = false; - #}; + openrgb = { + url = "gitlab:CalcProgrammer1/OpenRGB"; + flake = false; + }; # Dependencys flake-parts = { diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 50574a4..fd4af21 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -10,10 +10,12 @@ in { substituters = lib.mkForce [ "https://cache.nixos.org" "https://nix-community.cachix.org" + "https://surrealdb.cachix.org" ]; trusted-public-keys = lib.mkForce [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "surrealdb.cachix.org-1:rbm7Qs+s36pxbfk9jhIa5HRld6gZ63koZz1h/9sSxaA=" ]; trusted-users = [ "root" ]; sandbox = true; diff --git a/systems/zap/default.nix b/systems/zap/default.nix index c1ab321..272b60d 100644 --- a/systems/zap/default.nix +++ b/systems/zap/default.nix @@ -17,6 +17,8 @@ boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + networking.useDHCP = false; + boot.loader = { grub = { enable = true; @@ -24,24 +26,25 @@ }; }; - networking = { - wireless.enable = lib.mkForce false; - interfaces.eth0 = { - ipv4.addresses = [{ - address = "134.255.219.135"; - prefixLength = 24; - }]; - ipv6.addresses = [{ - address = "fe80::a018:44ff:fe5a:fb5b"; - prefixLength = 64; - }]; - }; - defaultGateway6 = { - address = "fe80::"; - interface = "eth0"; - }; - defaultGateway = "134.255.219.255"; - }; + services.cloud-init.enable = true; + services.cloud-init.network.enable = true; + +# networking = { +# wireless.enable = lib.mkForce false; +# interfaces.eth0 = { +# ipv4.addresses = [{ +# address = "134.255.219.135"; +# prefixLength = 24; +# }]; +# }; +# interfaces.ens18 = { +# ipv4.addresses = [{ +# address = "185.249.199.92"; +# prefixLength = 24; +# }]; +# }; +# defaultGateway = "134.255.219.1"; +# }; time.timeZone = "Europe/Berlin"; @@ -64,17 +67,17 @@ type = "table"; format = "msdos"; partitions = [ - { - name = "ESP"; - start = "1M"; - end = "500M"; - bootable = true; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - } +# { +# name = "ESP"; +# start = "1M"; +# end = "500M"; +# bootable = true; +# content = { +# type = "filesystem"; +# format = "vfat"; +# mountpoint = "/boot"; +# }; +# } { name = "root"; start = "500M"; @@ -83,7 +86,7 @@ bootable = true; content = { type = "filesystem"; - format = "bcachefs"; + format = "ext4"; mountpoint = "/"; }; }