mirror of
https://codeberg.org/jopejoe1/nix-conf.git
synced 2025-01-01 17:36:33 +01:00
fix zap
This commit is contained in:
parent
bd82eb5832
commit
cf9261966c
4 changed files with 101 additions and 43 deletions
53
flake.lock
53
flake.lock
|
|
@ -396,6 +396,22 @@
|
||||||
"type": "github"
|
"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": {
|
"pre-commit-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
|
|
@ -456,6 +472,41 @@
|
||||||
"type": "github"
|
"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": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
|
|
@ -474,7 +525,9 @@
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-lib": "nixpkgs-lib",
|
"nixpkgs-lib": "nixpkgs-lib",
|
||||||
|
"openrgb": "openrgb",
|
||||||
"pre-commit-hooks": "pre-commit-hooks_2",
|
"pre-commit-hooks": "pre-commit-hooks_2",
|
||||||
|
"prismlauncher": "prismlauncher",
|
||||||
"tela-icon-theme": "tela-icon-theme"
|
"tela-icon-theme": "tela-icon-theme"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
26
flake.nix
26
flake.nix
|
|
@ -24,15 +24,15 @@
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
#prismlauncher = {
|
prismlauncher = {
|
||||||
# url = "github:PrismLauncher/PrismLauncher";
|
url = "github:PrismLauncher/PrismLauncher";
|
||||||
# inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
# inputs.flake-parts.follows = "flake-parts";
|
inputs.flake-parts.follows = "flake-parts";
|
||||||
# inputs.pre-commit-hooks.follows = "pre-commit-hooks";
|
inputs.pre-commit-hooks.follows = "pre-commit-hooks";
|
||||||
# inputs.flake-compat.follows = "flake-compat";
|
inputs.flake-compat.follows = "flake-compat";
|
||||||
# inputs.libnbtplusplus.follows = "libnbtplusplus";
|
inputs.libnbtplusplus.follows = "libnbtplusplus";
|
||||||
# inputs.nix-filter.follows = "nix-filter";
|
inputs.nix-filter.follows = "nix-filter";
|
||||||
#};
|
};
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
nixos-generators = {
|
nixos-generators = {
|
||||||
url = "github:nix-community/nixos-generators";
|
url = "github:nix-community/nixos-generators";
|
||||||
|
|
@ -43,10 +43,10 @@
|
||||||
url = "github:vinceliuice/Tela-icon-theme";
|
url = "github:vinceliuice/Tela-icon-theme";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
#openrgb = {
|
openrgb = {
|
||||||
# url = "gitlab:CalcProgrammer1/OpenRGB";
|
url = "gitlab:CalcProgrammer1/OpenRGB";
|
||||||
# flake = false;
|
flake = false;
|
||||||
#};
|
};
|
||||||
|
|
||||||
# Dependencys
|
# Dependencys
|
||||||
flake-parts = {
|
flake-parts = {
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,12 @@ in {
|
||||||
substituters = lib.mkForce [
|
substituters = lib.mkForce [
|
||||||
"https://cache.nixos.org"
|
"https://cache.nixos.org"
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
|
"https://surrealdb.cachix.org"
|
||||||
];
|
];
|
||||||
trusted-public-keys = lib.mkForce [
|
trusted-public-keys = lib.mkForce [
|
||||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
"surrealdb.cachix.org-1:rbm7Qs+s36pxbfk9jhIa5HRld6gZ63koZz1h/9sSxaA="
|
||||||
];
|
];
|
||||||
trusted-users = [ "root" ];
|
trusted-users = [ "root" ];
|
||||||
sandbox = true;
|
sandbox = true;
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
||||||
|
|
||||||
|
networking.useDHCP = false;
|
||||||
|
|
||||||
boot.loader = {
|
boot.loader = {
|
||||||
grub = {
|
grub = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -24,24 +26,25 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
services.cloud-init.enable = true;
|
||||||
wireless.enable = lib.mkForce false;
|
services.cloud-init.network.enable = true;
|
||||||
interfaces.eth0 = {
|
|
||||||
ipv4.addresses = [{
|
# networking = {
|
||||||
address = "134.255.219.135";
|
# wireless.enable = lib.mkForce false;
|
||||||
prefixLength = 24;
|
# interfaces.eth0 = {
|
||||||
}];
|
# ipv4.addresses = [{
|
||||||
ipv6.addresses = [{
|
# address = "134.255.219.135";
|
||||||
address = "fe80::a018:44ff:fe5a:fb5b";
|
# prefixLength = 24;
|
||||||
prefixLength = 64;
|
# }];
|
||||||
}];
|
# };
|
||||||
};
|
# interfaces.ens18 = {
|
||||||
defaultGateway6 = {
|
# ipv4.addresses = [{
|
||||||
address = "fe80::";
|
# address = "185.249.199.92";
|
||||||
interface = "eth0";
|
# prefixLength = 24;
|
||||||
};
|
# }];
|
||||||
defaultGateway = "134.255.219.255";
|
# };
|
||||||
};
|
# defaultGateway = "134.255.219.1";
|
||||||
|
# };
|
||||||
|
|
||||||
time.timeZone = "Europe/Berlin";
|
time.timeZone = "Europe/Berlin";
|
||||||
|
|
||||||
|
|
@ -64,17 +67,17 @@
|
||||||
type = "table";
|
type = "table";
|
||||||
format = "msdos";
|
format = "msdos";
|
||||||
partitions = [
|
partitions = [
|
||||||
{
|
# {
|
||||||
name = "ESP";
|
# name = "ESP";
|
||||||
start = "1M";
|
# start = "1M";
|
||||||
end = "500M";
|
# end = "500M";
|
||||||
bootable = true;
|
# bootable = true;
|
||||||
content = {
|
# content = {
|
||||||
type = "filesystem";
|
# type = "filesystem";
|
||||||
format = "vfat";
|
# format = "vfat";
|
||||||
mountpoint = "/boot";
|
# mountpoint = "/boot";
|
||||||
};
|
# };
|
||||||
}
|
# }
|
||||||
{
|
{
|
||||||
name = "root";
|
name = "root";
|
||||||
start = "500M";
|
start = "500M";
|
||||||
|
|
@ -83,7 +86,7 @@
|
||||||
bootable = true;
|
bootable = true;
|
||||||
content = {
|
content = {
|
||||||
type = "filesystem";
|
type = "filesystem";
|
||||||
format = "bcachefs";
|
format = "ext4";
|
||||||
mountpoint = "/";
|
mountpoint = "/";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue