diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hosts/thinklappi/basesystem.nix (renamed from hardware/basesystem.nix) | 0 | ||||
| -rw-r--r-- | hosts/thinklappi/default.nix | 3 | ||||
| -rw-r--r-- | hosts/thinklappi/thinklappi.nix (renamed from sysconf/thinklappi.nix) | 22 | ||||
| -rw-r--r-- | packages.nix | 1 |
6 files changed, 23 insertions, 17 deletions
diff --git a/flake.lock b/flake.lock index 4f5ecfa..84291b4 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1678109311, - "narHash": "sha256-Q64FoCH5rp3XHoC8u1+KyjLEFGTY7kX9YaIaYfugvfY=", + "lastModified": 1679067095, + "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", "owner": "nix-community", "repo": "home-manager", - "rev": "04d6cad67557512452decbfe888c68fa11338a96", + "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", "type": "github" }, "original": { @@ -24,11 +24,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677932085, - "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", + "lastModified": 1678898370, + "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", + "rev": "ac718d02867a84b42522a0ece52d841188208f2c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5775c42..746ceb6 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ nixosConfigurations.thinklappi = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; - modules = [./sysconf/thinklappi.nix]; + modules = [./hosts/thinklappi/thinklappi.nix]; }; }; } diff --git a/hardware/basesystem.nix b/hosts/thinklappi/basesystem.nix index e5bc5ba..e5bc5ba 100644 --- a/hardware/basesystem.nix +++ b/hosts/thinklappi/basesystem.nix diff --git a/hosts/thinklappi/default.nix b/hosts/thinklappi/default.nix new file mode 100644 index 0000000..5019f10 --- /dev/null +++ b/hosts/thinklappi/default.nix @@ -0,0 +1,3 @@ +{...}: { + thinklappi = import ./thinklappi.nix; +} diff --git a/sysconf/thinklappi.nix b/hosts/thinklappi/thinklappi.nix index b6b175c..5a3f0f6 100644 --- a/sysconf/thinklappi.nix +++ b/hosts/thinklappi/thinklappi.nix @@ -8,16 +8,16 @@ ''; in { imports = [ - ../hardware/basesystem.nix - ../env.nix - ../nix.nix - ../packages.nix - ../users.nix - ../zsh.nix - ../flatpak.nix # Mainly for minecraft + ./basesystem.nix + ../../env.nix + ../../nix.nix + ../../packages.nix + ../../users.nix + ../../zsh.nix + ../../flatpak.nix # Mainly for minecraft # Desktop Environment to use - ../desktop/gnome.nix + ../../desktop/gnome.nix ]; services = { @@ -49,7 +49,11 @@ in { networking = { hostName = "thinklappi"; - networkmanager.enable = true; + nameservers = ["2620:fe::fe" "2620:fe::9" "9.9.9.9" "149.112.112.112"]; + networkmanager = { + enable = true; + dns = "none"; + }; }; time.timeZone = "Europe/Berlin"; diff --git a/packages.nix b/packages.nix index 2d0ed05..918c407 100644 --- a/packages.nix +++ b/packages.nix @@ -18,7 +18,6 @@ zip _7zz - neovim # edit nix files ;) inkscape # vector graphics |