From 6fc80401977ed269f271413b98b22f8b2013db92 Mon Sep 17 00:00:00 2001 From: Lgmrszd Date: Thu, 27 Feb 2025 23:59:14 +0400 Subject: [PATCH 1/6] laptop: Reconfigure mounts --- hosts/laptop/configuration.nix | 7 ------- hosts/laptop/hardware-configuration.nix | 12 +++++++++--- hosts/laptop/mounts.nix | 17 ----------------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index bf732ef..de879a4 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -69,13 +69,6 @@ in boot.supportedFilesystems = [ "ntfs" ]; - # btrfs options - fileSystems = { - "/".options = [ "compress=zstd" ]; - "/home".options = [ "compress=zstd" ]; - "/nix".options = [ "compress=zstd" "noatime" ]; - }; - boot.kernel.sysctl."kernel.sysrq" = 244; boot.plymouth = { diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix index 848ea97..8b69dbb 100644 --- a/hosts/laptop/hardware-configuration.nix +++ b/hosts/laptop/hardware-configuration.nix @@ -21,19 +21,25 @@ in fileSystems."/" = { device = root; fsType = "btrfs"; - options = [ "subvol=root" ]; + options = [ "compress=zstd" "subvol=root" ]; }; fileSystems."/nix" = { device = root; fsType = "btrfs"; - options = [ "subvol=nix" ]; + options = [ "compress=zstd" "noatime" "subvol=nix" ]; }; fileSystems."/home" = { device = root; fsType = "btrfs"; - options = [ "subvol=home" ]; + options = [ "compress=zstd" "subvol=home" ]; + }; + + fileSystems."/steamlibrary" = + { device = root; + fsType = "btrfs"; + options = [ "compress=zstd" "subvol=steamlibrary" ]; }; fileSystems."/boot" = diff --git a/hosts/laptop/mounts.nix b/hosts/laptop/mounts.nix index b3ad404..273b946 100644 --- a/hosts/laptop/mounts.nix +++ b/hosts/laptop/mounts.nix @@ -13,21 +13,4 @@ options = "defaults,exec,noauto,prealloc,uid=1000,gid=100"; } ]; - - systemd.automounts = [ - { - where = "/mounts/my_data"; - wantedBy = ["multi-user.target"]; - automountConfig = { - TimeoutIdleSec = 901; - }; - } - { - where = "/mounts/windows"; - wantedBy = ["multi-user.target"]; - automountConfig = { - TimeoutIdleSec = 901; - }; - } - ]; } From 8d1c53369146add8aec94d04ea72b26045408d1b Mon Sep 17 00:00:00 2001 From: Lgmrszd Date: Fri, 28 Feb 2025 00:00:11 +0400 Subject: [PATCH 2/6] laptop: remove input leap user unit --- hosts/laptop/home/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/hosts/laptop/home/default.nix b/hosts/laptop/home/default.nix index 14df2e9..0b6163b 100644 --- a/hosts/laptop/home/default.nix +++ b/hosts/laptop/home/default.nix @@ -181,23 +181,6 @@ monero-gui ]; - - systemd.user.services.app-input-leap-client = { - Unit = { - Description = "input-leap client"; - After = [ "graphical-session-pre.target" "network.target" ]; - PartOf = [ "graphical-session.target" ]; - }; - Service = { - Type = "simple"; - ExecStart = "${pkgs.input-leap}/bin/input-leapc -f --debug DEBUG --name lgm-nixos --disable-crypto [wandering-nomad.lan]:24800"; - Restart = "always"; - }; - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - }; - # Email stuff programs.thunderbird = { From a4bfec80b2db61e1f9dc4992c9a6c4803d6a4aac Mon Sep 17 00:00:00 2001 From: Lgmrszd Date: Fri, 28 Feb 2025 00:01:00 +0400 Subject: [PATCH 3/6] laptop: enable podman --- hosts/laptop/configuration.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index de879a4..78087f3 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -173,8 +173,18 @@ in programs.gamemode.enable = true; - # VirtualBox + # Virtualisation virtualisation.docker.enable = true; + + virtualisation.containers.enable = true; + virtualisation = { + podman = { + enable = true; + dockerCompat = false; + defaultNetwork.settings.dns_enabled = true; + }; + }; + virtualisation.waydroid.enable = true; virtualisation.virtualbox.host.enable = true; virtualisation.virtualbox.host.package = pkgs.virtualbox; @@ -319,7 +329,7 @@ in users.users.lgm = { isNormalUser = true; description = "lgm"; - extraGroups = [ "networkmanager" "wheel" "adbusers" "docker" "wireshark"]; + extraGroups = [ "networkmanager" "wheel" "adbusers" "docker" "podman" "wireshark"]; shell = pkgs.fish; }; From d24ae32af296bdf3bee60b0adbb8cae4ece6ac93 Mon Sep 17 00:00:00 2001 From: Lgmrszd Date: Fri, 28 Feb 2025 00:02:32 +0400 Subject: [PATCH 4/6] add docker-compose on all hosts (required for podman compose) --- hosts/laptop/configuration.nix | 2 ++ hosts/vps1/configuration.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 78087f3..da23fed 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -391,6 +391,8 @@ in kdiskmark + docker-compose + (let base = pkgs.appimageTools.defaultFhsEnvArgs; in pkgs.buildFHSEnv (base // { name = "fhs"; diff --git a/hosts/vps1/configuration.nix b/hosts/vps1/configuration.nix index b9e0afd..d67918a 100644 --- a/hosts/vps1/configuration.nix +++ b/hosts/vps1/configuration.nix @@ -150,6 +150,7 @@ in vim tmux sops + docker-compose ]; users.users.lgm = { From 6ff6a577ceb0cd85fc03b30016d71fbe4f43b732 Mon Sep 17 00:00:00 2001 From: Lgmrszd Date: Fri, 28 Feb 2025 00:58:32 +0400 Subject: [PATCH 5/6] swap docker-compose for podman-compose --- hosts/laptop/configuration.nix | 2 +- hosts/vps1/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index da23fed..9a14dd5 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -391,7 +391,7 @@ in kdiskmark - docker-compose + podman-compose (let base = pkgs.appimageTools.defaultFhsEnvArgs; in pkgs.buildFHSEnv (base // { diff --git a/hosts/vps1/configuration.nix b/hosts/vps1/configuration.nix index d67918a..50b65a3 100644 --- a/hosts/vps1/configuration.nix +++ b/hosts/vps1/configuration.nix @@ -150,7 +150,7 @@ in vim tmux sops - docker-compose + podman-compose ]; users.users.lgm = { From 15f2eb9eb53ee94d1e12a245afc536f87f0f7204 Mon Sep 17 00:00:00 2001 From: Lgmrszd Date: Fri, 28 Feb 2025 01:44:52 +0400 Subject: [PATCH 6/6] vps1: add make --- hosts/vps1/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/vps1/configuration.nix b/hosts/vps1/configuration.nix index 50b65a3..5f53599 100644 --- a/hosts/vps1/configuration.nix +++ b/hosts/vps1/configuration.nix @@ -151,6 +151,7 @@ in tmux sops podman-compose + gnumake ]; users.users.lgm = {