From 4187e3dc512b32de3babb11324798fb43768172b Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Thu, 11 Jan 2024 07:24:44 +0100 Subject: [PATCH] Various tweaks - update flakes - use overlay2 as docker volume driver for no btrfs dep - add xwayland --- flake.lock | 70 ++++++++++++++++++------------------- home-mods/shell/default.nix | 2 +- os-mods/desktop/gaming.nix | 1 + os-mods/network/default.nix | 5 +++ os-mods/virt/default.nix | 2 +- 5 files changed, 43 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 72ee429..9200b23 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1703606540, - "narHash": "sha256-3hAf+mcr6iZj7dGL3UBPSlHpi7iukAQx3Um2Px4DyDs=", + "lastModified": 1704905878, + "narHash": "sha256-C4Pe+gYO5MvGmJu6pZ/bx3XDXOiDTwz/Mg3tOLl48mI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "80d0d925101f84a36db5c2b85cb69266e0d95391", + "rev": "2925308ed46c247527d2d38678db0da566c91f62", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1703532766, - "narHash": "sha256-ojjW3cuNmqL5uqDWohwLoO8dYpheM5+AfgsNmGIMwG8=", + "lastModified": 1704741201, + "narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=", "owner": "nix-community", "repo": "disko", - "rev": "1b191113874dee97796749bb21eac3d84735c70a", + "rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1703367386, - "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", + "lastModified": 1704099619, + "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", + "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851", "type": "github" }, "original": { @@ -273,11 +273,11 @@ ] }, "locked": { - "lastModified": 1703387252, - "narHash": "sha256-XKJqGj0BaEn/zyctEnkgVIh6Ba1rgTRc+UBi9EU8Y54=", + "lastModified": 1704596958, + "narHash": "sha256-BK3Ohsz7m8X6qVKFxDtr8KVcHipfr5hYE9PDIJevHbQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f4340c1a42c38d79293ba69bfd839fbd6268a538", + "rev": "f46800ac5a6e9f892fe36e50821c5d85794ecc62", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { @@ -344,12 +344,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", - "revCount": 562218, + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "revCount": 567746, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.562218%2Brev-6df37dc6a77654682fe9f071c62b4242b5342e04/018c99c5-83a2-762d-ae43-a38f3be5b2d9/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.567746%2Brev-317484b1ead87b9c1b8ac5261a8d2dd748a0492d/018cf30b-2ac5-7f74-8197-15b6091e04ca/source.tar.gz" }, "original": { "type": "tarball", @@ -392,11 +392,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703499205, - "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -424,11 +424,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703467016, - "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { @@ -478,11 +478,11 @@ "osx-kvm": "osx-kvm" }, "locked": { - "lastModified": 1702844255, - "narHash": "sha256-6ALVEDkLgy36bXtDDGij5AU5HUeI3TR86YMlf8pUG8A=", + "lastModified": 1703952818, + "narHash": "sha256-2QxCnUVT9OMrNpp3itBYE75+DzkrKSXz+BAt6Qc9Ooo=", "owner": "matthewcroughan", "repo": "nixtheplanet", - "rev": "3f14942a14b3f2a4bc6831a74d7bea4b669c7849", + "rev": "fa0c25456185df578f29b8fe878648ed4620eb55", "type": "github" }, "original": { @@ -493,11 +493,11 @@ }, "nur": { "locked": { - "lastModified": 1703646418, - "narHash": "sha256-+O5UYPoboInEqQM0KeNVTz8Dff2dTxDwZOSRTgdOejM=", + "lastModified": 1704926790, + "narHash": "sha256-cvIgvBUvwD4pVQQ0n30b9v52+L27zldSBZzPY5dL2tw=", "owner": "nix-community", "repo": "NUR", - "rev": "4b648583aa2718a55740bd6f7e2916c9771762c8", + "rev": "45a706bce225239a923b84019d693ba3d656c8ee", "type": "github" }, "original": { @@ -532,11 +532,11 @@ ] }, "locked": { - "lastModified": 1703264118, - "narHash": "sha256-YzwzOqSDNLFcG2HulMw0k5reDhBPysq9AT1D8Y0Rky8=", + "lastModified": 1704927112, + "narHash": "sha256-AKTE0TczctkgAj3FGnslPrDZP0A9FDlRITv+aV2Agsg=", "owner": "pjones", "repo": "plasma-manager", - "rev": "8e8f0852a49f9f776cbaf2156ebe8b4a8d4bf720", + "rev": "06ad8e693009a64b58156b8b55e347defe759970", "type": "github" }, "original": { diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix index af87730..433ecd4 100644 --- a/home-mods/shell/default.nix +++ b/home-mods/shell/default.nix @@ -8,7 +8,7 @@ let doomemacsSrc = builtins.fetchGit { url = "https://github.com/doomemacs/doomemacs"; ref = "master"; - rev = "f6851d56ef6baa5e7de8a1b2adea8c7a80f8f0fe"; + rev = "03d692f129633e3bf0bd100d91b3ebf3f77db6d1"; }; neofetchThemesSrc = builtins.fetchGit { url = "https://github.com/Chick2D/neofetch-themes"; diff --git a/os-mods/desktop/gaming.nix b/os-mods/desktop/gaming.nix index 42b59c0..7a3c493 100644 --- a/os-mods/desktop/gaming.nix +++ b/os-mods/desktop/gaming.nix @@ -8,6 +8,7 @@ remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; }; + programs.xwayland.enable = true; chaotic.steam.extraCompatPackages = with pkgs; [ proton-ge-custom diff --git a/os-mods/network/default.nix b/os-mods/network/default.nix index c18a4f2..acf55e0 100644 --- a/os-mods/network/default.nix +++ b/os-mods/network/default.nix @@ -44,6 +44,11 @@ ''; }; + netclient = { + enable = true; + package = pkgs.unstable-os.netclient; + }; + tailscale = { enable = true; useRoutingFeatures = "both"; diff --git a/os-mods/virt/default.nix b/os-mods/virt/default.nix index 03fdc30..55323d0 100644 --- a/os-mods/virt/default.nix +++ b/os-mods/virt/default.nix @@ -15,7 +15,7 @@ enable = true; package = pkgs.unstable-os.docker; - storageDriver = lib.mkDefault "btrfs"; + storageDriver = lib.mkDefault "overlay2"; }; virtualisation.libvirtd = {