From 8f5d927a4151e1e300115cb849642af3674f5c4c Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Wed, 22 Jan 2025 11:25:05 +0100 Subject: [PATCH 01/31] Add Gentoo-specific configs from `ws-bart` --- gentoo/portage/package.accept_keywords/awscli | 1 + gentoo/portage/package.accept_keywords/firefox-dev | 1 + gentoo/portage/package.accept_keywords/ghostty | 3 +++ gentoo/portage/package.accept_keywords/git-filter-repo | 2 ++ gentoo/portage/package.accept_keywords/insomnia | 1 + gentoo/portage/package.accept_keywords/just | 1 + gentoo/portage/package.accept_keywords/k9scli | 1 + gentoo/portage/package.accept_keywords/logseq | 1 + gentoo/portage/package.accept_keywords/opentofu | 1 + gentoo/portage/package.accept_keywords/wezterm | 1 + gentoo/portage/package.accept_keywords/zen-browser | 1 + gentoo/portage/package.use/ghostty | 5 +++++ gentoo/portage/package.use/iputils | 2 ++ 13 files changed, 21 insertions(+) create mode 100644 gentoo/portage/package.accept_keywords/awscli create mode 100644 gentoo/portage/package.accept_keywords/firefox-dev create mode 100644 gentoo/portage/package.accept_keywords/ghostty create mode 100644 gentoo/portage/package.accept_keywords/git-filter-repo create mode 100644 gentoo/portage/package.accept_keywords/insomnia create mode 100644 gentoo/portage/package.accept_keywords/just create mode 100644 gentoo/portage/package.accept_keywords/k9scli create mode 100644 gentoo/portage/package.accept_keywords/logseq create mode 100644 gentoo/portage/package.accept_keywords/opentofu create mode 100644 gentoo/portage/package.accept_keywords/wezterm create mode 100644 gentoo/portage/package.accept_keywords/zen-browser create mode 100644 gentoo/portage/package.use/ghostty create mode 100644 gentoo/portage/package.use/iputils diff --git a/gentoo/portage/package.accept_keywords/awscli b/gentoo/portage/package.accept_keywords/awscli new file mode 100644 index 0000000..fe66843 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/awscli @@ -0,0 +1 @@ +app-admin/awscli-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/firefox-dev b/gentoo/portage/package.accept_keywords/firefox-dev new file mode 100644 index 0000000..cfc77c9 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/firefox-dev @@ -0,0 +1 @@ +www-client/firefox-developer-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/ghostty b/gentoo/portage/package.accept_keywords/ghostty new file mode 100644 index 0000000..ec5a2e4 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/ghostty @@ -0,0 +1,3 @@ +dev-lang/zig ~amd64 +x11-terms/ghostty ~amd64 +app-eselect/eselect-zig ~amd64 diff --git a/gentoo/portage/package.accept_keywords/git-filter-repo b/gentoo/portage/package.accept_keywords/git-filter-repo new file mode 100644 index 0000000..012f216 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/git-filter-repo @@ -0,0 +1,2 @@ +dev-vcs/git-filter-repo ~amd64 + diff --git a/gentoo/portage/package.accept_keywords/insomnia b/gentoo/portage/package.accept_keywords/insomnia new file mode 100644 index 0000000..198f073 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/insomnia @@ -0,0 +1 @@ +dev-util/insomnia-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/just b/gentoo/portage/package.accept_keywords/just new file mode 100644 index 0000000..6953a92 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/just @@ -0,0 +1 @@ +dev-build/just ~amd64 diff --git a/gentoo/portage/package.accept_keywords/k9scli b/gentoo/portage/package.accept_keywords/k9scli new file mode 100644 index 0000000..714fa11 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/k9scli @@ -0,0 +1 @@ +sys-cluster/k9scli ~amd64 diff --git a/gentoo/portage/package.accept_keywords/logseq b/gentoo/portage/package.accept_keywords/logseq new file mode 100644 index 0000000..4c3426a --- /dev/null +++ b/gentoo/portage/package.accept_keywords/logseq @@ -0,0 +1 @@ +app-editors/logseq-desktop-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/opentofu b/gentoo/portage/package.accept_keywords/opentofu new file mode 100644 index 0000000..795c0ef --- /dev/null +++ b/gentoo/portage/package.accept_keywords/opentofu @@ -0,0 +1 @@ +app-admin/opentofu ~amd64 diff --git a/gentoo/portage/package.accept_keywords/wezterm b/gentoo/portage/package.accept_keywords/wezterm new file mode 100644 index 0000000..f836117 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/wezterm @@ -0,0 +1 @@ +x11-terms/wezterm ~amd64 diff --git a/gentoo/portage/package.accept_keywords/zen-browser b/gentoo/portage/package.accept_keywords/zen-browser new file mode 100644 index 0000000..9aa731d --- /dev/null +++ b/gentoo/portage/package.accept_keywords/zen-browser @@ -0,0 +1 @@ +www-client/zen-bin ~amd64 diff --git a/gentoo/portage/package.use/ghostty b/gentoo/portage/package.use/ghostty new file mode 100644 index 0000000..9b54264 --- /dev/null +++ b/gentoo/portage/package.use/ghostty @@ -0,0 +1,5 @@ +media-libs/harfbuzz abi_x86_32 +media-gfx/graphite2 abi_x86_32 +x11-libs/pixman abi_x86_32 +x11-libs/cairo abi_x86_32 +dev-libs/lzo abi_x86_32 diff --git a/gentoo/portage/package.use/iputils b/gentoo/portage/package.use/iputils new file mode 100644 index 0000000..16cd47d --- /dev/null +++ b/gentoo/portage/package.use/iputils @@ -0,0 +1,2 @@ +net-misc/iputils tracepath + From 49e409a751949a229473d42161dda6adb02a6360 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Wed, 22 Jan 2025 11:26:51 +0100 Subject: [PATCH 02/31] Add Gentoo-specific configs from `ws-bart` (#9) --- gentoo/portage/package.accept_keywords/awscli | 1 + gentoo/portage/package.accept_keywords/firefox-dev | 1 + gentoo/portage/package.accept_keywords/ghostty | 3 +++ gentoo/portage/package.accept_keywords/git-filter-repo | 2 ++ gentoo/portage/package.accept_keywords/insomnia | 1 + gentoo/portage/package.accept_keywords/just | 1 + gentoo/portage/package.accept_keywords/k9scli | 1 + gentoo/portage/package.accept_keywords/logseq | 1 + gentoo/portage/package.accept_keywords/opentofu | 1 + gentoo/portage/package.accept_keywords/wezterm | 1 + gentoo/portage/package.accept_keywords/zen-browser | 1 + gentoo/portage/package.use/ghostty | 5 +++++ gentoo/portage/package.use/iputils | 2 ++ 13 files changed, 21 insertions(+) create mode 100644 gentoo/portage/package.accept_keywords/awscli create mode 100644 gentoo/portage/package.accept_keywords/firefox-dev create mode 100644 gentoo/portage/package.accept_keywords/ghostty create mode 100644 gentoo/portage/package.accept_keywords/git-filter-repo create mode 100644 gentoo/portage/package.accept_keywords/insomnia create mode 100644 gentoo/portage/package.accept_keywords/just create mode 100644 gentoo/portage/package.accept_keywords/k9scli create mode 100644 gentoo/portage/package.accept_keywords/logseq create mode 100644 gentoo/portage/package.accept_keywords/opentofu create mode 100644 gentoo/portage/package.accept_keywords/wezterm create mode 100644 gentoo/portage/package.accept_keywords/zen-browser create mode 100644 gentoo/portage/package.use/ghostty create mode 100644 gentoo/portage/package.use/iputils diff --git a/gentoo/portage/package.accept_keywords/awscli b/gentoo/portage/package.accept_keywords/awscli new file mode 100644 index 0000000..fe66843 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/awscli @@ -0,0 +1 @@ +app-admin/awscli-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/firefox-dev b/gentoo/portage/package.accept_keywords/firefox-dev new file mode 100644 index 0000000..cfc77c9 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/firefox-dev @@ -0,0 +1 @@ +www-client/firefox-developer-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/ghostty b/gentoo/portage/package.accept_keywords/ghostty new file mode 100644 index 0000000..ec5a2e4 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/ghostty @@ -0,0 +1,3 @@ +dev-lang/zig ~amd64 +x11-terms/ghostty ~amd64 +app-eselect/eselect-zig ~amd64 diff --git a/gentoo/portage/package.accept_keywords/git-filter-repo b/gentoo/portage/package.accept_keywords/git-filter-repo new file mode 100644 index 0000000..012f216 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/git-filter-repo @@ -0,0 +1,2 @@ +dev-vcs/git-filter-repo ~amd64 + diff --git a/gentoo/portage/package.accept_keywords/insomnia b/gentoo/portage/package.accept_keywords/insomnia new file mode 100644 index 0000000..198f073 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/insomnia @@ -0,0 +1 @@ +dev-util/insomnia-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/just b/gentoo/portage/package.accept_keywords/just new file mode 100644 index 0000000..6953a92 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/just @@ -0,0 +1 @@ +dev-build/just ~amd64 diff --git a/gentoo/portage/package.accept_keywords/k9scli b/gentoo/portage/package.accept_keywords/k9scli new file mode 100644 index 0000000..714fa11 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/k9scli @@ -0,0 +1 @@ +sys-cluster/k9scli ~amd64 diff --git a/gentoo/portage/package.accept_keywords/logseq b/gentoo/portage/package.accept_keywords/logseq new file mode 100644 index 0000000..4c3426a --- /dev/null +++ b/gentoo/portage/package.accept_keywords/logseq @@ -0,0 +1 @@ +app-editors/logseq-desktop-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/opentofu b/gentoo/portage/package.accept_keywords/opentofu new file mode 100644 index 0000000..795c0ef --- /dev/null +++ b/gentoo/portage/package.accept_keywords/opentofu @@ -0,0 +1 @@ +app-admin/opentofu ~amd64 diff --git a/gentoo/portage/package.accept_keywords/wezterm b/gentoo/portage/package.accept_keywords/wezterm new file mode 100644 index 0000000..f836117 --- /dev/null +++ b/gentoo/portage/package.accept_keywords/wezterm @@ -0,0 +1 @@ +x11-terms/wezterm ~amd64 diff --git a/gentoo/portage/package.accept_keywords/zen-browser b/gentoo/portage/package.accept_keywords/zen-browser new file mode 100644 index 0000000..9aa731d --- /dev/null +++ b/gentoo/portage/package.accept_keywords/zen-browser @@ -0,0 +1 @@ +www-client/zen-bin ~amd64 diff --git a/gentoo/portage/package.use/ghostty b/gentoo/portage/package.use/ghostty new file mode 100644 index 0000000..9b54264 --- /dev/null +++ b/gentoo/portage/package.use/ghostty @@ -0,0 +1,5 @@ +media-libs/harfbuzz abi_x86_32 +media-gfx/graphite2 abi_x86_32 +x11-libs/pixman abi_x86_32 +x11-libs/cairo abi_x86_32 +dev-libs/lzo abi_x86_32 diff --git a/gentoo/portage/package.use/iputils b/gentoo/portage/package.use/iputils new file mode 100644 index 0000000..16cd47d --- /dev/null +++ b/gentoo/portage/package.use/iputils @@ -0,0 +1,2 @@ +net-misc/iputils tracepath + From a692174c0aa81cc9d2af276999700d0c1103044d Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Fri, 24 Jan 2025 10:46:36 +0100 Subject: [PATCH 03/31] Add Bash and Git config changes --- dotfiles/.bashrc | 6 +++++- nixos/packages.nix | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index 7c39654..a658705 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -29,6 +29,10 @@ function ngc { bind '"\e[A": history-search-backward' bind '"\e[B": history-search-forward' +bind "set completion-ignore-case on" +bind "set completion-map-case on" +bind "set show-all-if-ambiguous on" + export HISTSIZE=10000 export HISTFILESIZE=10000 @@ -45,4 +49,4 @@ PS1='\[\033[0;33m\][\u@\h:\w]\$\[\033[0m\] ' RIPGREP_CONFIG_PATH=~/.ripgreprc # Disable ctrl+s -stty -ixon \ No newline at end of file +stty -ixon diff --git a/nixos/packages.nix b/nixos/packages.nix index ae5599d..a4f1a1b 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -24,6 +24,7 @@ in curl fzf jq + delta unzip silver-searcher ripgrep From 6ab03d4cb5f4c9b4f328121d25b7e57ac2a9000d Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sun, 26 Jan 2025 22:26:33 +0100 Subject: [PATCH 04/31] Make VIM default editor --- dotfiles/.gitconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig index 71123ff..675627d 100644 --- a/dotfiles/.gitconfig +++ b/dotfiles/.gitconfig @@ -17,6 +17,7 @@ [core] excludesfile = ~/.gitignore pager = delta + editor = vim [interactive] diffFilter = delta --color-only @@ -37,4 +38,4 @@ required = true [includeIf "gitdir:~/Repos/projects.blender.org/"] - path = ~/.config/git/blender.gitconfig \ No newline at end of file + path = ~/.config/git/blender.gitconfig From cce1e33c23dbc95068bc6721a419345cc1d95998 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 6 Feb 2025 14:13:22 +0100 Subject: [PATCH 05/31] Ollama and update --- nixos/flake.lock | 6 +++--- nixos/modules/ollama.nix | 16 ++++++++++++++++ nixos/users.nix | 4 ---- 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 nixos/modules/ollama.nix diff --git a/nixos/flake.lock b/nixos/flake.lock index e38ab50..6c155df 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1737404254, - "narHash": "sha256-L8Lxp/WVdy9gKO2cXptphdP8cMsnGvZF5Noj8N3jLzI=", + "lastModified": 1738804720, + "narHash": "sha256-3bAR5ALk5AoFt4BlsQRdjSV6VVH6lbgtYdElb0A+qDc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f8ef9c97ac2f49d5c04dbf3b3d80a0490c05fefb", + "rev": "7868f1c54b7f8e09be194aaa0934791596df1ea1", "type": "github" }, "original": { diff --git a/nixos/modules/ollama.nix b/nixos/modules/ollama.nix new file mode 100644 index 0000000..630b521 --- /dev/null +++ b/nixos/modules/ollama.nix @@ -0,0 +1,16 @@ +{ ... }: + +{ + # Add Ollama and OpenWebUI + services.ollama = { + enable = true; + loadModels = [ deepseek-r1:32b ]; + acceleration = "rocm"; + rocmOverrideGfx = "11.0.0"; + environmentVariables = { + HSA_OVERRIDE_GFX_VERSION = "11.0.0"; + }; + }; + + services.open-webui.enable = true; +} diff --git a/nixos/users.nix b/nixos/users.nix index 7142b56..f1866e8 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -71,9 +71,5 @@ virtualisation.docker = { enable = true; enableOnBoot = false; - rootless = { - enable = true; - setSocketVariable = true; - }; }; } From 619995114504b1f9d6fa9907f85243d2c620297d Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 6 Feb 2025 14:14:12 +0100 Subject: [PATCH 06/31] Add ungoogled chromium --- nixos/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/users.nix b/nixos/users.nix index f1866e8..88f42e2 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -12,6 +12,7 @@ ]; packages = with pkgs; [ vscodium + ungoogled-chromium thunderbird fastfetch ghostty From 28e93cba13fb9c738cf8f5760f87b5ec1449401d Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Mon, 10 Feb 2025 22:45:49 +0100 Subject: [PATCH 07/31] Add cloud-utils and Apple Fonts --- nixos/flake.lock | 6 ++-- nixos/flake.nix | 2 +- nixos/modules/apple-fonts.nix | 67 +++++++++++++++++++++++++++++++++++ nixos/users.nix | 1 + 4 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 nixos/modules/apple-fonts.nix diff --git a/nixos/flake.lock b/nixos/flake.lock index 6c155df..d990e26 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1738804720, - "narHash": "sha256-3bAR5ALk5AoFt4BlsQRdjSV6VVH6lbgtYdElb0A+qDc=", + "lastModified": 1739161281, + "narHash": "sha256-cMM5E5EzEnfQFdBurCVqCi9mhsmRCeaEJB4iskPsQ1o=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7868f1c54b7f8e09be194aaa0934791596df1ea1", + "rev": "0e962f036e6e2a9dde28f37d80104c7ea477a801", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index 177fc98..82e21a9 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -18,13 +18,13 @@ ./packages.nix ./services.nix ./modules/bootloader.nix + ./modules/apple-fonts.nix ]; }; qemu = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ ./hardware/qemu.nix - ./modules/kde.nix ./modules/configuration.nix ./modules/display-manager.nix diff --git a/nixos/modules/apple-fonts.nix b/nixos/modules/apple-fonts.nix new file mode 100644 index 0000000..f4100ba --- /dev/null +++ b/nixos/modules/apple-fonts.nix @@ -0,0 +1,67 @@ +{ pkgs, ... }: + +let + # Define Apple font sources + fontSources = { + sf-pro = { + url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"; + hash = "sha256-IccB0uWWfPCidHYX6sAusuEZX906dVYo8IaqeX7/O88="; + }; + sf-compact = { + url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"; + hash = "sha256-PlraM6SwH8sTxnVBo6Lqt9B6tAZDC//VCPwr/PNcnlk="; + }; + sf-mono = { + url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"; + hash = "sha256-bUoLeOOqzQb5E/ZCzq0cfbSvNO1IhW1xcaLgtV2aeUU="; + }; + sf-arabic = { + url = "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"; + hash = "sha256-J2DGLVArdwEsSVF8LqOS7C1MZH/gYJhckn30jRBRl7k="; + }; + ny = { + url = "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"; + hash = "sha256-HC7ttFJswPMm+Lfql49aQzdWR2osjFYHJTdgjtuI+PQ="; + }; + }; + + # Function to create Apple font packages + makeAppleFont = name: pkgName: source: + pkgs.stdenv.mkDerivation { + inherit name; + + src = pkgs.fetchurl { + inherit (source) url hash; + }; + + version = "0.3.0"; + + unpackPhase = '' + undmg $src + 7z x '${pkgName}' + 7z x 'Payload~' + ''; + + buildInputs = [ + pkgs.undmg + pkgs.p7zip + ]; + setSourceRoot = "sourceRoot=`pwd`"; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/fonts/truetype + find -name \*.otf -exec mv {} $out/share/fonts/opentype/ \; + find -name \*.ttf -exec mv {} $out/share/fonts/truetype/ \; + ''; + }; + +in { + environment.systemPackages = [ + (makeAppleFont "sf-pro" "SF Pro Fonts.pkg" fontSources.sf-pro) + (makeAppleFont "sf-compact" "SF Compact Fonts.pkg" fontSources.sf-compact) + (makeAppleFont "sf-mono" "SF Mono Fonts.pkg" fontSources.sf-mono) + (makeAppleFont "sf-arabic" "SF Arabic Fonts.pkg" fontSources.sf-arabic) + (makeAppleFont "ny" "NY Fonts.pkg" fontSources.ny) + ]; +} diff --git a/nixos/users.nix b/nixos/users.nix index 88f42e2..8465ce4 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -32,6 +32,7 @@ inkscape gimp nixfmt-rfc-style + cloud-utils ]; }; From cd52bf52580d5b5c7e9705d3979c46b87fc641de Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Wed, 12 Feb 2025 00:26:25 +0100 Subject: [PATCH 08/31] Oops my symlinks were broken --- dotfiles/.config/{ghosty => ghostty}/config | 0 dotfiles/symlink.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename dotfiles/.config/{ghosty => ghostty}/config (100%) diff --git a/dotfiles/.config/ghosty/config b/dotfiles/.config/ghostty/config similarity index 100% rename from dotfiles/.config/ghosty/config rename to dotfiles/.config/ghostty/config diff --git a/dotfiles/symlink.sh b/dotfiles/symlink.sh index bf32ac6..9066139 100755 --- a/dotfiles/symlink.sh +++ b/dotfiles/symlink.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash dotfiles_home="${1:-$(dirname "$(realpath "$0")")}" -cp -rsf "$dotfiles_home" $HOME +cp -rsf "$dotfiles_home"/. $HOME echo "Dotfiles have been recursively copied and symlinked from $dotfiles_home to $HOME." From 452ac32dd0d1dd6710a505b84030feebc504e388 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 20 Feb 2025 19:36:42 +0100 Subject: [PATCH 09/31] Add Noto fonts --- nixos/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index ce521e2..3741f52 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -35,6 +35,8 @@ packages = with pkgs; [ jetbrains-mono nerdfonts + noto-fonts + noto-fonts-emoji ]; }; From 82a474f3db94990f50b7541b8c7494984bd2552c Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 25 Feb 2025 13:03:26 +0100 Subject: [PATCH 10/31] Add exFAT, remove broken fzf-tab --- nixos/packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/packages.nix b/nixos/packages.nix index a4f1a1b..9d39d10 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -37,5 +37,7 @@ in dig zig spotify + exfat + exfatprogs ]; } From 4e59f0b4d68c8c7d88f1e1ddb9fc3a8738e38f5a Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sun, 2 Mar 2025 20:49:55 +0100 Subject: [PATCH 11/31] add cinny --- nixos/users.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/users.nix b/nixos/users.nix index 8465ce4..46ee9f6 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -19,6 +19,7 @@ neovim logseq element-desktop + cinny-desktop go-task opentofu python3 @@ -42,6 +43,9 @@ nixpkgs.config.permittedInsecurePackages = [ # Workaround for electron dependency in Logseq "electron-27.3.11" + # Workaround for Cinny to work + "cinny-unwrapped-4.2.3" + "cinny-4.2.3" ]; programs._1password.enable = true; From 9d40808a6e017741f2a1484cf04070b289f26119 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 6 Mar 2025 21:14:58 +0100 Subject: [PATCH 12/31] Add KRDC --- nixos/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/packages.nix b/nixos/packages.nix index 9d39d10..10c41a4 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -39,5 +39,6 @@ in spotify exfat exfatprogs + remmina ]; } From 89889a0010a6c446cc1860073b88032cca2642b4 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 13 Mar 2025 12:33:38 +0100 Subject: [PATCH 13/31] Add s3cmd --- nixos/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/packages.nix b/nixos/packages.nix index 10c41a4..8e95f42 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -40,5 +40,6 @@ in exfat exfatprogs remmina + s3cmd ]; } From 8d648cafae420b3c6e507c5112bb78be93f915f9 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sun, 16 Mar 2025 12:29:47 +0100 Subject: [PATCH 14/31] Consolidate all fonts config --- nixos/configuration.nix | 13 +---- nixos/flake.nix | 2 +- nixos/modules/apple-fonts.nix | 67 ----------------------- nixos/modules/fonts.nix | 100 +++++++++++++++++++++++++++++++--- 4 files changed, 95 insertions(+), 87 deletions(-) delete mode 100644 nixos/modules/apple-fonts.nix diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3741f52..e7f2111 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -28,18 +28,7 @@ LC_TELEPHONE = "nl_NL.UTF-8"; LC_TIME = "en_US.UTF-8"; }; - - # Fonts configuration - fonts = { - enableDefaultPackages = true; - packages = with pkgs; [ - jetbrains-mono - nerdfonts - noto-fonts - noto-fonts-emoji - ]; - }; - + # Optimization & Garbage Collection # Optimize Nix-Store During Rebuilds diff --git a/nixos/flake.nix b/nixos/flake.nix index 82e21a9..5c68a28 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -18,7 +18,7 @@ ./packages.nix ./services.nix ./modules/bootloader.nix - ./modules/apple-fonts.nix + ./modules/fonts.nix ]; }; qemu = nixpkgs.lib.nixosSystem { diff --git a/nixos/modules/apple-fonts.nix b/nixos/modules/apple-fonts.nix deleted file mode 100644 index f4100ba..0000000 --- a/nixos/modules/apple-fonts.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ pkgs, ... }: - -let - # Define Apple font sources - fontSources = { - sf-pro = { - url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"; - hash = "sha256-IccB0uWWfPCidHYX6sAusuEZX906dVYo8IaqeX7/O88="; - }; - sf-compact = { - url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"; - hash = "sha256-PlraM6SwH8sTxnVBo6Lqt9B6tAZDC//VCPwr/PNcnlk="; - }; - sf-mono = { - url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"; - hash = "sha256-bUoLeOOqzQb5E/ZCzq0cfbSvNO1IhW1xcaLgtV2aeUU="; - }; - sf-arabic = { - url = "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"; - hash = "sha256-J2DGLVArdwEsSVF8LqOS7C1MZH/gYJhckn30jRBRl7k="; - }; - ny = { - url = "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"; - hash = "sha256-HC7ttFJswPMm+Lfql49aQzdWR2osjFYHJTdgjtuI+PQ="; - }; - }; - - # Function to create Apple font packages - makeAppleFont = name: pkgName: source: - pkgs.stdenv.mkDerivation { - inherit name; - - src = pkgs.fetchurl { - inherit (source) url hash; - }; - - version = "0.3.0"; - - unpackPhase = '' - undmg $src - 7z x '${pkgName}' - 7z x 'Payload~' - ''; - - buildInputs = [ - pkgs.undmg - pkgs.p7zip - ]; - setSourceRoot = "sourceRoot=`pwd`"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/fonts/truetype - find -name \*.otf -exec mv {} $out/share/fonts/opentype/ \; - find -name \*.ttf -exec mv {} $out/share/fonts/truetype/ \; - ''; - }; - -in { - environment.systemPackages = [ - (makeAppleFont "sf-pro" "SF Pro Fonts.pkg" fontSources.sf-pro) - (makeAppleFont "sf-compact" "SF Compact Fonts.pkg" fontSources.sf-compact) - (makeAppleFont "sf-mono" "SF Mono Fonts.pkg" fontSources.sf-mono) - (makeAppleFont "sf-arabic" "SF Arabic Fonts.pkg" fontSources.sf-arabic) - (makeAppleFont "ny" "NY Fonts.pkg" fontSources.ny) - ]; -} diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix index 5e91d21..bc81e47 100644 --- a/nixos/modules/fonts.nix +++ b/nixos/modules/fonts.nix @@ -1,10 +1,96 @@ { pkgs, ... }: -{ - # Fonts - fonts.packages = with pkgs; [ - jetbrains-mono - nerd-font-patcher - noto-fonts-color-emoji - ]; +let + fontSources = { + sf-pro = { + url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"; + hash = "sha256-IccB0uWWfPCidHYX6sAusuEZX906dVYo8IaqeX7/O88="; + }; + sf-compact = { + url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"; + hash = "sha256-PlraM6SwH8sTxnVBo6Lqt9B6tAZDC//VCPwr/PNcnlk="; + }; + sf-mono = { + url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"; + hash = "sha256-bUoLeOOqzQb5E/ZCzq0cfbSvNO1IhW1xcaLgtV2aeUU="; + }; + sf-arabic = { + url = "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"; + hash = "sha256-J2DGLVArdwEsSVF8LqOS7C1MZH/gYJhckn30jRBRl7k="; + }; + ny = { + url = "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"; + hash = "sha256-HC7ttFJswPMm+Lfql49aQzdWR2osjFYHJTdgjtuI+PQ="; + }; + }; + + makeAppleFont = name: pkgName: source: + pkgs.stdenv.mkDerivation { + inherit name; + + src = pkgs.fetchurl { + inherit (source) url hash; + }; + + version = "0.3.0"; + + unpackPhase = '' + undmg $src + 7z x '${pkgName}' + 7z x 'Payload~' + ''; + + buildInputs = [ + pkgs.undmg + pkgs.p7zip + ]; + setSourceRoot = "sourceRoot=`pwd`"; + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/fonts/truetype + find -name \*.otf -exec mv {} $out/share/fonts/opentype/ \; + find -name \*.ttf -exec mv {} $out/share/fonts/truetype/ \; + ''; + }; + + appleColorEmoji = pkgs.stdenv.mkDerivation { + name = "apple-color-emoji"; + + src = pkgs.fetchurl { + url = "https://github.com/samuelngs/apple-emoji-linux/releases/download/v17.4/AppleColorEmoji.ttf"; + hash = "sha256-SG3JQLybhY/fMX+XqmB/BKhQSBB0N1VRqa+H6laVUPE="; + }; + unpackPhase = ":"; + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp $src $out/share/fonts/truetype/AppleColorEmoji.ttf + ''; + }; + +in { + fonts = { + enableDefaultPackages = true; + packages = with pkgs; [ + jetbrains-mono + nerdfonts + noto-fonts + noto-fonts-emoji + (makeAppleFont "sf-pro" "SF Pro Fonts.pkg" fontSources.sf-pro) + (makeAppleFont "sf-compact" "SF Compact Fonts.pkg" fontSources.sf-compact) + (makeAppleFont "sf-mono" "SF Mono Fonts.pkg" fontSources.sf-mono) + (makeAppleFont "sf-arabic" "SF Arabic Fonts.pkg" fontSources.sf-arabic) + (makeAppleFont "ny" "NY Fonts.pkg" fontSources.ny) + appleColorEmoji + ]; + fontconfig = { + defaultFonts = { + serif = [ "SF Pro" ]; + sansSerif = [ "SF Pro" ]; + monospace = [ "JetBrainsMono Nerd Font Mono" ]; + emoji = [ "Apple Color Emoji" ]; + }; + useEmbeddedBitmaps = true; + }; + }; } + From 4aebe4cd429fb2703bd429b7544621f4fdcb1ee4 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 18 Mar 2025 21:37:08 +0100 Subject: [PATCH 15/31] Add Powershell --- nixos/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/packages.nix b/nixos/packages.nix index 8e95f42..2b40f40 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -41,5 +41,6 @@ in exfatprogs remmina s3cmd + powershell ]; } From d61c94a0f2818a02bbf0e8b2f87d0275689cde56 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Wed, 2 Apr 2025 10:36:52 +0200 Subject: [PATCH 16/31] add me to `dialout`group for nanokvm serial --- nixos/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/users.nix b/nixos/users.nix index 46ee9f6..edbf37d 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -9,6 +9,7 @@ "wheel" "libvirtd" "docker" + "dialout" # for nanokvm usb ]; packages = with pkgs; [ vscodium From 0a09b8dec9e1394df5d5024c9879e9b5d70421fe Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 6 May 2025 22:32:50 +0200 Subject: [PATCH 17/31] Git LFS and `ruff` --- nixos/packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/packages.nix b/nixos/packages.nix index 2b40f40..8c61d1a 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -42,5 +42,7 @@ in remmina s3cmd powershell + git-lfs + ruff ]; } From dfc71710fd0a7cb4bc9ed34852431f48266c0cca Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sat, 10 May 2025 13:03:51 +0200 Subject: [PATCH 18/31] Add Zed and Ansible Lint --- nixos/users.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/users.nix b/nixos/users.nix index edbf37d..e07aa2c 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -35,6 +35,8 @@ gimp nixfmt-rfc-style cloud-utils + ansible-lint + zed-editor ]; }; From 4ef536448ce895bfb044fb61f7f9f06f97b600d1 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sat, 24 May 2025 10:06:27 +0200 Subject: [PATCH 19/31] Add Signal Desktop --- nixos/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/users.nix b/nixos/users.nix index e07aa2c..9e8db39 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -21,6 +21,7 @@ logseq element-desktop cinny-desktop + signal-desktop go-task opentofu python3 From 452f1a735aba76afde33c6776844d57b2aa5c748 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sat, 24 May 2025 10:16:37 +0200 Subject: [PATCH 20/31] Upgrade to 25.05 channel --- dotfiles/.nix-channels | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/.nix-channels b/dotfiles/.nix-channels index a363345..ed1b4d9 100644 --- a/dotfiles/.nix-channels +++ b/dotfiles/.nix-channels @@ -1 +1 @@ -https://nixos.org/channels/nixos-unstable nixos \ No newline at end of file +https://nixos.org/channels/nixos-25.05 nixos From 249bf0fbc22536a7b35de96b83f0ec239ab7258b Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sat, 24 May 2025 11:00:32 +0200 Subject: [PATCH 21/31] Update flakes to use new locked versions --- nixos/flake.lock | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index d990e26..7f84575 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743604125, + "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 0, @@ -14,11 +35,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -36,14 +57,15 @@ }, "zen-browser": { "inputs": { + "home-manager": "home-manager", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1739161281, - "narHash": "sha256-cMM5E5EzEnfQFdBurCVqCi9mhsmRCeaEJB4iskPsQ1o=", + "lastModified": 1748060564, + "narHash": "sha256-KTceiwnQm5MFAjtQtSp2/lkodwSd2jub/wCYfVGIFKI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0e962f036e6e2a9dde28f37d80104c7ea477a801", + "rev": "1963b92737b62652fa85e1dfc57d5f4c6d28aea4", "type": "github" }, "original": { From 5ce17a639f8eeb704fd45f34a65357fccc3a12b4 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sat, 24 May 2025 15:46:43 +0200 Subject: [PATCH 22/31] Update flake to use 25.05 --- nixos/flake.lock | 22 +++++++++++-------- nixos/flake.nix | 57 ++++++++++++++++++++++++------------------------ 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 7f84575..612c5f8 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -23,14 +23,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=", - "path": "/nix/store/zd5dgszslv09jzybcpf25gpl12s6r2d9-source", - "type": "path" + "lastModified": 1747953325, + "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { @@ -61,11 +65,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1748060564, - "narHash": "sha256-KTceiwnQm5MFAjtQtSp2/lkodwSd2jub/wCYfVGIFKI=", + "lastModified": 1748090150, + "narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1963b92737b62652fa85e1dfc57d5f4c6d28aea4", + "rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index 5c68a28..431956e 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -2,38 +2,37 @@ description = "Bart's NixOS Configuration"; inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; }; - outputs = - { nixpkgs, ... }@inputs: - { - nixosConfigurations = { - tongfang = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ - ./hardware/tongfang.nix - ./configuration.nix - ./users.nix - ./packages.nix - ./services.nix - ./modules/bootloader.nix - ./modules/fonts.nix - ]; - }; - qemu = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ - ./hardware/qemu.nix - ./modules/kde.nix - ./modules/configuration.nix - ./modules/display-manager.nix - ./modules/greeter.nix - ./modules/networking.nix - ./modules/nix-settings.nix - ./modules/users.nix - ]; - }; + outputs = { nixpkgs, ... }@inputs: { + nixosConfigurations = { + tongfang = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; + modules = [ + ./hardware/tongfang.nix + ./configuration.nix + ./users.nix + ./packages.nix + ./services.nix + ./modules/bootloader.nix + ./modules/fonts.nix + ]; + }; + qemu = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; + modules = [ + ./hardware/qemu.nix + ./modules/kde.nix + ./modules/configuration.nix + ./modules/display-manager.nix + ./modules/greeter.nix + ./modules/networking.nix + ./modules/nix-settings.nix + ./modules/users.nix + ]; }; }; + }; } From 57cd8d8ff5bab392c1e7348d6525e4617b118c14 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Sat, 24 May 2025 17:23:21 +0200 Subject: [PATCH 23/31] Update `nerd-fonts` to only include Jet Brains Mono --- nixos/modules/fonts.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix index bc81e47..0f0be9c 100644 --- a/nixos/modules/fonts.nix +++ b/nixos/modules/fonts.nix @@ -72,8 +72,7 @@ in { enableDefaultPackages = true; packages = with pkgs; [ jetbrains-mono - nerdfonts - noto-fonts + noto-fonts.JetBrainsMono noto-fonts-emoji (makeAppleFont "sf-pro" "SF Pro Fonts.pkg" fontSources.sf-pro) (makeAppleFont "sf-compact" "SF Compact Fonts.pkg" fontSources.sf-compact) From cf0f0ffbfb1e319ac8813408786e2411e3a0a79d Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 12 Jun 2025 20:36:41 +0200 Subject: [PATCH 24/31] Fix fonts --- nixos/modules/fonts.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix index 0f0be9c..3dd534d 100644 --- a/nixos/modules/fonts.nix +++ b/nixos/modules/fonts.nix @@ -72,7 +72,6 @@ in { enableDefaultPackages = true; packages = with pkgs; [ jetbrains-mono - noto-fonts.JetBrainsMono noto-fonts-emoji (makeAppleFont "sf-pro" "SF Pro Fonts.pkg" fontSources.sf-pro) (makeAppleFont "sf-compact" "SF Compact Fonts.pkg" fontSources.sf-compact) From cb9436049295e17a527c6400057bc60a65f5e192 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 12 Jun 2025 20:37:11 +0200 Subject: [PATCH 25/31] Update Flake lockfile --- nixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 612c5f8..a138c02 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747953325, - "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1748090150, - "narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=", + "lastModified": 1749745531, + "narHash": "sha256-+nnmuYVhQPbELuW2lZCWpTAJo955Qng/SCcLVO/RP6c=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d", + "rev": "50ec60bcf3528db062700673f61f86d82ca6cda0", "type": "github" }, "original": { From a2defe1792d94cdc706b94b91cac2cc27ec6e217 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Wed, 6 Aug 2025 23:09:41 +0200 Subject: [PATCH 26/31] Swap `gccgo` with `go` --- nixos/users.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/users.nix b/nixos/users.nix index 9e8db39..8603bf7 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -26,7 +26,7 @@ opentofu python3 gnumake - gccgo + go nodejs_22 corepack_22 azure-cli 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 27/31] 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 28/31] 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 29/31] 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 30/31] 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 31/31] 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