From 9e620c6fb0c034c5a861b9a43ca80fab3011ced4 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 8 Dec 2022 21:17:05 +0100 Subject: [PATCH] flake update --- flake.lock | 36 +++++++++---------- .../hosts/olympus/wireguard/configuration.nix | 13 +++---- nixos/hosts/thalassa/aoife/configuration.nix | 18 ++++++++-- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 8297a18..2c103c6 100644 --- a/flake.lock +++ b/flake.lock @@ -378,11 +378,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1670280307, - "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=", + "lastModified": 1670513770, + "narHash": "sha256-muL74fsbGA8K8WlZSPNWddOiuBnC54kAajncX6nXrh4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2af0d07678fc15612345e0dd55337550dcf6465f", + "rev": "054d9e3187ca00479e8036dc0e92900a384f30fd", "type": "github" }, "original": { @@ -399,11 +399,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1670358704, - "narHash": "sha256-zBClR9FjbV3So2xDoQci6aKjsnkFVtrD1Ipnd1dY1oo=", + "lastModified": 1670525568, + "narHash": "sha256-YS6d6b8XBbKoY9uoSFSzP5Vm0nEOmvcxFwU4UJUEfAQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "993c382e74faddefeb62b3ab7a7281bd9a69990b", + "rev": "be6e1a33b1d37ce3639ceb5c40fce581c77fd54a", "type": "github" }, "original": { @@ -526,11 +526,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1670289122, - "narHash": "sha256-xdKDX9EWGqTgApkypMk8CmGq4e2niY4ZT+swXNDpbW8=", + "lastModified": 1670461926, + "narHash": "sha256-80badJ32j8eWPTgWO7m5SZT+uEUZDmhrr5cNstPWsDw=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "f9528054a98195df5c93674edadc1a9632c5f659", + "rev": "b2444f924ab432f8590b12de042ad394bbe8ed83", "type": "github" }, "original": { @@ -711,11 +711,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1670242877, - "narHash": "sha256-jBLh7dRHnbfvPPA9znOC6oQfKrCPJ0El8Zoe0BqnCjQ=", + "lastModified": 1670332253, + "narHash": "sha256-O5SmhlIUt1s+vK4NXeGYqwcBIMwbBPAEZ3GHE3XT28c=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "6e51c97f1c849efdfd4f3b78a4870e6aa2da4198", + "rev": "1c9ffcf70786f0966982ce0fc76ec05df2e1dec2", "type": "github" }, "original": { @@ -765,11 +765,11 @@ "nmdSrc": "nmdSrc" }, "locked": { - "lastModified": 1670208577, - "narHash": "sha256-hDa+hqAWlTaEvT5iCyy2hLPHS9uybbSkeSlqyvXJjKM=", + "lastModified": 1670519577, + "narHash": "sha256-unss17EdnkL3Y3a9Rg3qAyY13TP7FDDTgAP/8pr+SbA=", "owner": "pta2002", "repo": "nixvim", - "rev": "472e10f069c57da281ef178b28423f7f6b2529c2", + "rev": "a7fbb812242d1223fcca8c0a270eb87a82f98f17", "type": "github" }, "original": { @@ -796,11 +796,11 @@ }, "nur": { "locked": { - "lastModified": 1670315682, - "narHash": "sha256-/v0RgZZIjvsFuJbJLUlzRbzSlYFXq3olgJTuJBNtcoY=", + "lastModified": 1670519174, + "narHash": "sha256-cllJKMqAYsUhKdTlRn1NB83dWeRk2BSauHZQFZl0LgU=", "owner": "nix-community", "repo": "NUR", - "rev": "af814db16c89385c65e758608296440555f61ccc", + "rev": "ecfbb03d9d32c8af6756f7ca9634c53767fcee77", "type": "github" }, "original": { diff --git a/nixos/hosts/olympus/wireguard/configuration.nix b/nixos/hosts/olympus/wireguard/configuration.nix index 4f36fea..4983169 100644 --- a/nixos/hosts/olympus/wireguard/configuration.nix +++ b/nixos/hosts/olympus/wireguard/configuration.nix @@ -3,8 +3,8 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { lib, config, pkgs, inputs, ... }: -let vs = config.vault-secrets.secrets; in -{ +let vs = config.vault-secrets.secrets; +in { imports = [ ]; # This value determines the NixOS release from which the default @@ -20,14 +20,11 @@ let vs = config.vault-secrets.secrets; in environment.noXlibs = lib.mkForce false; - networking.firewall.allowedUDPPorts = [ - config.networking.wireguard.interfaces.wg0.listenPort - ]; + networking.firewall.allowedUDPPorts = + [ config.networking.wireguard.interfaces.wg0.listenPort ]; networking.firewall.checkReversePath = false; - vault-secrets.secrets.wireguard = { - services = [ "wireguard-wg0" ]; - }; + vault-secrets.secrets.wireguard = { services = [ "wireguard-wg0" ]; }; networking.nat = { enable = true; diff --git a/nixos/hosts/thalassa/aoife/configuration.nix b/nixos/hosts/thalassa/aoife/configuration.nix index b0549cf..fc3fcc3 100644 --- a/nixos/hosts/thalassa/aoife/configuration.nix +++ b/nixos/hosts/thalassa/aoife/configuration.nix @@ -16,7 +16,8 @@ efi.canTouchEfiVariables = true; efi.efiSysMountPoint = "/boot/efi"; }; - kernel = { sysctl = { "fs.inotify.max_user_watches" = 524288; }; }; + kernel.sysctl = { "fs.inotify.max_user_watches" = 524288; }; + initrd.kernelModules = [ "amdgpu" ]; }; fileSystems."/".options = [ "compress=zstd" ]; @@ -44,8 +45,18 @@ LC_TIME = "nl_NL.UTF-8"; }; + hardware.opengl.driSupport = true; + hardware.opengl.extraPackages = with pkgs; [ + amdvlk + rocm-opencl-icd + rocm-opencl-runtime + ]; + systemd.tmpfiles.rules = + [ "L+ /opt/rocm/hip - - - - ${pkgs.hip}" ]; + # Enable the X11 windowing system. services.xserver.enable = true; + services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.excludePackages = [ pkgs.xterm ]; # Enable the GNOME Desktop Environment. @@ -107,10 +118,13 @@ }; environment.systemPackages = with pkgs; [ - gnome3.gnome-tweaks + gnome.gnome-tweaks + gnome.gnome-boxes wireguard-tools ]; + networking.firewall.checkReversePath = false; + # Define a user account. Don't forget to set a password with ‘passwd’. users.users.victor = { isNormalUser = true;