From 3c28cb1d451b069cffbb62e3d4f09e2f88d9d475 Mon Sep 17 00:00:00 2001 From: Ethan Simmons Date: Mon, 17 Jun 2024 16:52:48 -0500 Subject: [PATCH] Set up new server --- flake.lock | 24 ++++++++++++------------ flake.nix | 10 +++++++++- hosts/diphda/hardware-configuration.nix | 8 ++++---- hosts/diphda/system.nix | 14 +++++++++++++- overlays/default.nix | 4 ++++ 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e8b7a78..0f2ef7d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,13 +2,13 @@ "nodes": { "currentSystem": { "locked": { - "lastModified": 1718576296, + "lastModified": 1718580560, "narHash": "sha256-M69Hx8goDX65ZC/F7ENITsGr3XYBCSsa4B+vDOnOGXs=", - "path": "/mnt/etc/nixos/hostname", + "path": "/etc/nixos/hostname", "type": "path" }, "original": { - "path": "/mnt/etc/nixos/hostname", + "path": "/etc/nixos/hostname", "type": "path" } }, @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1718208800, - "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", + "lastModified": 1718437845, + "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", + "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b28f11d..deb6057 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; + }; outputs = inputs@{ self @@ -29,7 +30,7 @@ inherit (self) outputs; inherit (currentSystem) hostname; - overlays = import ./overlays; + overlays = import ./overlays { inherit inputs; }; utils = import ./utils; configs."ankaa" = { @@ -146,11 +147,18 @@ system = "x86_64-linux"; common.nixpkgs = "stable"; + openssh.enable = true; + gui = { enable = false; sway.enable = false; }; + networking = { + firewall = { + allowedTCPPorts = [ 80 443 25565 24454 8089 ]; + }; + }; }; currentConfig = configs."${hostname}"; diff --git a/hosts/diphda/hardware-configuration.nix b/hosts/diphda/hardware-configuration.nix index 6897d98..8bed023 100644 --- a/hosts/diphda/hardware-configuration.nix +++ b/hosts/diphda/hardware-configuration.nix @@ -14,25 +14,25 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/0dfd896f-a313-4a43-a171-3d1157a01c02"; + { device = "/dev/disk/by-uuid/a60ac6e2-b56e-49f8-bfcc-64b099dc6569"; fsType = "btrfs"; options = [ "subvol=root" ]; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/0dfd896f-a313-4a43-a171-3d1157a01c02"; + { device = "/dev/disk/by-uuid/a60ac6e2-b56e-49f8-bfcc-64b099dc6569"; fsType = "btrfs"; options = [ "subvol=home" ]; }; fileSystems."/nix" = - { device = "/dev/disk/by-uuid/0dfd896f-a313-4a43-a171-3d1157a01c02"; + { device = "/dev/disk/by-uuid/a60ac6e2-b56e-49f8-bfcc-64b099dc6569"; fsType = "btrfs"; options = [ "subvol=nix" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/1925-D969"; + { device = "/dev/disk/by-uuid/2E79-9765"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/hosts/diphda/system.nix b/hosts/diphda/system.nix index aac75d2..82ea2e7 100644 --- a/hosts/diphda/system.nix +++ b/hosts/diphda/system.nix @@ -26,6 +26,15 @@ "/nix".options = [ "compress=zstd" "noatime" ]; }; + virtualisation.docker = { + enable = true; + storageDriver = "btrfs"; + }; + + environment.systemPackages = with pkgs; [ + docker-compose + ]; + # Set your time zone. time.timeZone = "America/Chicago"; @@ -35,8 +44,11 @@ # Define a user account. users.users.eesim = { isNormalUser = true; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "networkmanager" ]; shell = pkgs.fish; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEO9a9lCSa84Acv0SqOI608IJGa61dT5Frbw2Y/ABCB9 eesim@ankaa" + ]; }; system.stateVersion = "23.11"; diff --git a/overlays/default.nix b/overlays/default.nix index 52652c3..34dab82 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,3 +1,7 @@ +{ inputs +, ... +}: + { gamescope = import ./gamescope-last-working.nix; }