diff options
| -rw-r--r-- | flake.lock | 14 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | host/atlas.nix | 33 | ||||
| -rw-r--r-- | host/hardware/atlas.nix | 6 | ||||
| -rw-r--r-- | host/software/desktop/default.nix | 3 |
5 files changed, 43 insertions, 15 deletions
@@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1735264675, - "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "lastModified": 1752308619, + "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1629367653, - "narHash": "sha256-TYovgHylzgcVC7M714mPVdCCsnHV9Uh2DiLWhi/KWe8=", + "lastModified": 1629652608, + "narHash": "sha256-eNcsdqMyK/Q3P0Tj16uDNcQzKIFf4CJkM7qTq3BdtF0=", "owner": "KnairdA", "repo": "pkgs", - "rev": "5e27bc6838920fe2948bc0953a519232bced0397", + "rev": "fb63603b5eec859c84464e1a7f6f14931303f679", "type": "github" }, "original": { @@ -2,7 +2,7 @@ description = "System environment of Adrian Kummerlaender"; inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-24.11; + nixpkgs.url = github:NixOS/nixpkgs/nixos-25.05; pkgs-personal.url = github:KnairdA/pkgs/master; }; diff --git a/host/atlas.nix b/host/atlas.nix index 53a5201..2be2340 100644 --- a/host/atlas.nix +++ b/host/atlas.nix @@ -16,21 +16,35 @@ videoDrivers = [ "nvidia" ]; }; - hardware.nvidia.package = pkgs.linuxPackages.nvidia_x11; + hardware = { + nvidia = { + open = true; + package = pkgs.linuxPackages.nvidia_x11; + }; + + nvidia-container-toolkit.enable = true; + }; environment.systemPackages = with pkgs; [ nvtopPackages.full ]; - virtualisation.docker = { - enable = true; - enableNvidia = true; - autoPrune = { + virtualisation = { + docker = { enable = true; - dates = "daily"; + autoPrune = { + enable = true; + dates = "daily"; + }; }; + + libvirtd.enable = true; }; + users.users.common.extraGroups = [ "docker" ]; + users.groups.libvirtd.members = [ "common" ]; + + programs.virt-manager.enable = true; networking.wireguard.interfaces = { wg0 = { @@ -51,7 +65,7 @@ networking.firewall = { enable = true; - interfaces."wg0".allowedTCPPorts = [ 5900 8080 8888 ]; + interfaces."wg0".allowedTCPPorts = [ 5900 8000 8080 8888 ]; }; services.printing = { @@ -70,6 +84,11 @@ }; }; + systemd.services.gitlab-runner.serviceConfig = { + CPUWeight = "idle"; + CPUQuota = "800%"; + }; + users.users.gitlab-runner.isNormalUser = true; nix.settings.allowed-users = [ "gitlab-runner" ]; diff --git a/host/hardware/atlas.nix b/host/hardware/atlas.nix index 61bca06..d10479e 100644 --- a/host/hardware/atlas.nix +++ b/host/hardware/atlas.nix @@ -18,9 +18,15 @@ fsType = "ext4"; }; + fileSystems."/data" = { + device = "/dev/disk/by-uuid/02ff6829-07d1-4709-a4ba-6703a214bed4"; + fsType = "ext4"; + }; + boot.initrd.luks.devices = { "luks-f6c3a1a8-bc09-4fcd-a979-4fe82dc4dc71".device = "/dev/disk/by-uuid/f6c3a1a8-bc09-4fcd-a979-4fe82dc4dc71"; "luks-49b6b8ab-1d8f-43d3-ba58-d548316f197a".device = "/dev/disk/by-uuid/49b6b8ab-1d8f-43d3-ba58-d548316f197a"; + "data".device = "/dev/disk/by-uuid/0b324bed-660b-4b9c-b2a3-133ce2531dc7"; }; fileSystems."/boot" = { diff --git a/host/software/desktop/default.nix b/host/software/desktop/default.nix index 8aac8ad..615534f 100644 --- a/host/software/desktop/default.nix +++ b/host/software/desktop/default.nix @@ -45,6 +45,9 @@ ntfs3g ]; + programs.i3lock.enable = true; + security.pam.services.i3lock.enable = true; + boot.kernel.sysctl = { "kernel.perf_event_paranoid" = -1; # allow user to perform perf analysis }; |