From 5001195716b6525d48396fbdeb0469585011a765 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sun, 24 Aug 2025 11:50:57 +0200 Subject: [PATCH 1/5] Add PrismLauncher --- nixos/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/users.nix b/nixos/users.nix index 8603bf7..eeda4af 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -38,6 +38,7 @@ cloud-utils ansible-lint zed-editor + prismlauncher ]; }; From e29653e202975398378fd110856bc4eb38629bd8 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Mon, 22 Sep 2025 23:58:21 +0200 Subject: [PATCH 2/5] Add RuneLite --- nixos/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/users.nix b/nixos/users.nix index eeda4af..edea75f 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -39,6 +39,7 @@ ansible-lint zed-editor prismlauncher + runelite ]; }; From 06da4ff7fe8c4fe9d0d1bff5ae70849515a066cf Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 23 Sep 2025 00:52:13 +0200 Subject: [PATCH 3/5] Add OSRS Launcher Bolt --- nixos/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/users.nix b/nixos/users.nix index edea75f..4c2e139 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -40,6 +40,7 @@ zed-editor prismlauncher runelite + bolt-launcher ]; }; From f37c9d6f69b7bf2b75b3e55292d82286d85ace33 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 11 Nov 2025 23:44:02 +0100 Subject: [PATCH 4/5] Changes --- dotfiles/.gitconfig | 25 ++++++++++++------------- nixos/flake.nix | 1 + nixos/hardware/tongfang.nix | 33 +++++++++++++++++++-------------- nixos/modules/fonts.nix | 4 ++-- nixos/packages.nix | 1 + nixos/services.nix | 4 ++++ 6 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig index 675627d..eaf3eb8 100644 --- a/dotfiles/.gitconfig +++ b/dotfiles/.gitconfig @@ -1,8 +1,7 @@ [user] name = Bart van der Braak email = bart@vanderbraak.nl - # signingkey = 26ED0D75D89D9B61 - + signingkey = ~/.ssh/id_ed25519.pub [alias] p = push st = status @@ -13,29 +12,29 @@ gl = config --global -l aa = add . pushfwl = push --force-with-lease - [core] excludesfile = ~/.gitignore pager = delta editor = vim - [interactive] - diffFilter = delta --color-only - + diffFilter = delta --color-only [init] defaultBranch = main - +[gpg] + format = ssh +[gpg "ssh"] + allowedSignersFile = ~/.ssh/allowed_signers + signingKey = ~/.ssh/id_ed25519.pub + signingAlgorithm = ssh-ed25519 + signingNamespace = gitea [commit] - # gpgsign = true - + gpgsign = true [push] autoSetupRemote = true - [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true - -[includeIf "gitdir:~/Repos/projects.blender.org/"] - path = ~/.config/git/blender.gitconfig +[includeIf "gitdir:~/Repositories/blender.org/"] + path = ~/.config/git/blender.gitconfig diff --git a/nixos/flake.nix b/nixos/flake.nix index 431956e..b72dc50 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -18,6 +18,7 @@ ./services.nix ./modules/bootloader.nix ./modules/fonts.nix + ./modules/vpn.nix ]; }; qemu = nixpkgs.lib.nixosSystem { diff --git a/nixos/hardware/tongfang.nix b/nixos/hardware/tongfang.nix index f83ec22..0008d2d 100644 --- a/nixos/hardware/tongfang.nix +++ b/nixos/hardware/tongfang.nix @@ -29,24 +29,29 @@ in "sdhci_pci" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ + "kvm-amd" + "crypto_simd" + "cryptd" + ]; boot.extraModulePackages = [ yt6801 ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/292e05de-6ddb-4a31-bc8a-92314b13d5c8"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/CEF6-7DAA"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" + boot.initrd.luks.devices."luks-bbe16a5b-ae1e-4297-a250-ebb8e950e12c".device = "/dev/disk/by-uuid/bbe16a5b-ae1e-4297-a250-ebb8e950e12c"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/28FA-4261"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/f4aac953-a60d-478a-84bc-ac659360ca03"; } ]; - }; - - swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix index 3dd534d..d4f91d1 100644 --- a/nixos/modules/fonts.nix +++ b/nixos/modules/fonts.nix @@ -4,11 +4,11 @@ let fontSources = { sf-pro = { url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"; - hash = "sha256-IccB0uWWfPCidHYX6sAusuEZX906dVYo8IaqeX7/O88="; + hash = "sha256-Lk14U5iLc03BrzO5IdjUwORADqwxKSSg6rS3OlH9aa4="; }; sf-compact = { url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"; - hash = "sha256-PlraM6SwH8sTxnVBo6Lqt9B6tAZDC//VCPwr/PNcnlk="; + hash = "sha256-CMNP+sL5nshwK0lGBERp+S3YinscCGTi1LVZVl+PuOM="; }; sf-mono = { url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"; diff --git a/nixos/packages.nix b/nixos/packages.nix index 8c61d1a..658c094 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -44,5 +44,6 @@ in powershell git-lfs ruff + meld ]; } diff --git a/nixos/services.nix b/nixos/services.nix index 2db948b..6df7d41 100644 --- a/nixos/services.nix +++ b/nixos/services.nix @@ -8,6 +8,10 @@ wayland.enable = true; }; services.desktopManager.plasma6.enable = true; + qt = { + enable = true; + platformTheme = "kde"; + }; # Audio system with PipeWire # Enable PipeWire and ALSA support From 9b092cd3dfceac08345fe9adfa9f81da8730f928 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 9 Dec 2025 22:28:53 +0100 Subject: [PATCH 5/5] Add OpenBao --- nixos/modules/devops-tools.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/devops-tools.nix b/nixos/modules/devops-tools.nix index 21122c8..ad0baf8 100644 --- a/nixos/modules/devops-tools.nix +++ b/nixos/modules/devops-tools.nix @@ -4,6 +4,7 @@ environment.systemPackages = with pkgs; [ azure-cli opentofu + bao curl go-task sops