From cd64f0b8265ab60e540c119061d85518efe6823d Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Mon, 25 Nov 2024 23:44:13 +0100 Subject: [PATCH 1/4] Updates, Inkscape and GIMP --- tongfang/nixos/flake.lock | 12 ++++++------ tongfang/nixos/users.nix | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tongfang/nixos/flake.lock b/tongfang/nixos/flake.lock index d5e603d..8602d38 100644 --- a/tongfang/nixos/flake.lock +++ b/tongfang/nixos/flake.lock @@ -14,11 +14,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1730432151, - "narHash": "sha256-2eQ6AIvqorTZuvLl6VQzFyuFMIMMp8qmzQkdGjozQwc=", + "lastModified": 1731411879, + "narHash": "sha256-bSvczDRlTAZtjJeGTfglDjopCuvogwGkZlI/pxDiWkU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "df7a5519a9c24419a56dd6903abcc72679978be6", + "rev": "b4c2f1c5e125f6300205f917e173aeabcb095bdd", "type": "github" }, "original": { diff --git a/tongfang/nixos/users.nix b/tongfang/nixos/users.nix index c2c7ddc..7545215 100644 --- a/tongfang/nixos/users.nix +++ b/tongfang/nixos/users.nix @@ -24,6 +24,8 @@ azure-cli sops blender + inkscape + gimp nixfmt-rfc-style ]; }; From f6b4184f6f65cfc3d282fee0c22e9961b74455c6 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 26 Nov 2024 12:32:24 +0100 Subject: [PATCH 2/4] Add `libvirtd` with `virt-manager` --- tongfang/nixos/users.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tongfang/nixos/users.nix b/tongfang/nixos/users.nix index 7545215..d84fff5 100644 --- a/tongfang/nixos/users.nix +++ b/tongfang/nixos/users.nix @@ -4,7 +4,7 @@ users.users.bart = { isNormalUser = true; description = "Bart van der Braak"; - extraGroups = [ "networkmanager" "wheel" "docker" ]; + extraGroups = [ "networkmanager" "wheel" "libvirtd" "docker" ]; packages = with pkgs; [ vscodium thunderbird @@ -51,6 +51,10 @@ programs.gnupg.agent.enable = true; programs.gnupg.dirmngr.enable = true; + # Add KVM support + virtualisation.libvirtd.enable = true; + programs.virt-manager.enable = true; + # Add Docker support virtualisation.docker.enable = true; virtualisation.docker.rootless = { From e563f2d3f854c611d11fdb559cb525e363937030 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 28 Nov 2024 10:05:18 +0100 Subject: [PATCH 3/4] Run update for Nix flakes --- tongfang/nixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tongfang/nixos/flake.lock b/tongfang/nixos/flake.lock index 8602d38..a7bc2bd 100644 --- a/tongfang/nixos/flake.lock +++ b/tongfang/nixos/flake.lock @@ -14,11 +14,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1731411879, - "narHash": "sha256-bSvczDRlTAZtjJeGTfglDjopCuvogwGkZlI/pxDiWkU=", + "lastModified": 1732757169, + "narHash": "sha256-CzpXDxU9Oq6STK3QYdme6l8QTRcOIcOQ/U08NrKt8D0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b4c2f1c5e125f6300205f917e173aeabcb095bdd", + "rev": "7ea856ec3fb1dc50dd6fc9c9cb9d46b46691fda7", "type": "github" }, "original": { From 1f2d94fe272178a793ba825a0f73781acbf5cead Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sun, 15 Dec 2024 13:00:39 +0100 Subject: [PATCH 4/4] Update Zen browser and 1Password --- tongfang/nixos/flake.lock | 12 ++++++------ tongfang/nixos/users.nix | 9 ++++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tongfang/nixos/flake.lock b/tongfang/nixos/flake.lock index a7bc2bd..2803852 100644 --- a/tongfang/nixos/flake.lock +++ b/tongfang/nixos/flake.lock @@ -14,11 +14,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1732757169, - "narHash": "sha256-CzpXDxU9Oq6STK3QYdme6l8QTRcOIcOQ/U08NrKt8D0=", + "lastModified": 1734232136, + "narHash": "sha256-rQd9jiPTGVchefiwJhx1xUlCLcnOCWQ7KlQ+Pkio9zU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7ea856ec3fb1dc50dd6fc9c9cb9d46b46691fda7", + "rev": "6acd5e9515e0d53347b7883ac02ac7ab4bd03a2c", "type": "github" }, "original": { diff --git a/tongfang/nixos/users.nix b/tongfang/nixos/users.nix index d84fff5..809111f 100644 --- a/tongfang/nixos/users.nix +++ b/tongfang/nixos/users.nix @@ -18,7 +18,6 @@ python3 gnumake gccgo - _1password-gui # nodejs_22 # corepack_22 azure-cli @@ -38,6 +37,14 @@ "electron-27.3.11" ]; + programs._1password.enable = true; + programs._1password-gui = { + enable = true; + # Certain features, including CLI integration and system authentication support, + # require enabling PolKit integration on some desktop environments (e.g. Plasma). + polkitPolicyOwners = [ "bart" ]; + }; + # SSH agent configuration programs.ssh.startAgent = true; programs.ssh.extraConfig = ''