bartvdbraak/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: bartvdbraak:main
Branches Tags
bartvdbraak:main
bartvdbraak:kairpods
bartvdbraak:gentoo
bartvdbraak:bigrefactor
..
compare: bartvdbraak:gentoo
Branches Tags
bartvdbraak:main
bartvdbraak:kairpods
bartvdbraak:gentoo
bartvdbraak:bigrefactor

1 commit
main ... gentoo

Author SHA1 Message Date
Bart van der Braak
8f5d927a41 Add Gentoo-specific configs from ws-bart 2025-01-22 11:25:05 +01:00
15 changed files with 93 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dotfiles/.bashrc
View file

@ -29,10 +29,6 @@ function ngc {
bind '"\e[A": history-search-backward' bind '"\e[A": history-search-backward'
bind '"\e[B": history-search-forward' 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 HISTSIZE=10000
export HISTFILESIZE=10000 export HISTFILESIZE=10000
@ -49,4 +45,4 @@ PS1='\[\033[0;33m\][\u@\h:\w]\$\[\033[0m\] '
RIPGREP_CONFIG_PATH=~/.ripgreprc RIPGREP_CONFIG_PATH=~/.ripgreprc
# Disable ctrl+s # Disable ctrl+s
stty -ixon stty -ixon

0
dotfiles/.config/ghostty/config → dotfiles/.config/ghosty/config
View file

26
dotfiles/.gitconfig
View file

@ -1,7 +1,8 @@
[user] [user]
name = Bart van der Braak name = Bart van der Braak
email = bart@vanderbraak.nl email = bart@vanderbraak.nl
signingkey = ~/.ssh/id_ed25519.pub # signingkey = 26ED0D75D89D9B61
[alias] [alias]
p = push p = push
st = status st = status
@ -12,29 +13,28 @@
gl = config --global -l gl = config --global -l
aa = add . aa = add .
pushfwl = push --force-with-lease pushfwl = push --force-with-lease
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
pager = delta pager = delta
editor = vim
[interactive] [interactive]
diffFilter = delta --color-only diffFilter = delta --color-only
[init] [init]
defaultBranch = main defaultBranch = main
[gpg]
format = ssh
[gpg "ssh"]
allowedSignersFile = ~/.ssh/allowed_signers
signingKey = ~/.ssh/id_ed25519.pub
signingAlgorithm = ssh-ed25519
signingNamespace = gitea
[commit] [commit]
gpgsign = true # gpgsign = true
[push] [push]
autoSetupRemote = true autoSetupRemote = true
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[includeIf "gitdir:~/Repositories/blender.org/"]
path = ~/.config/git/blender.gitconfig [includeIf "gitdir:~/Repos/projects.blender.org/"]
path = ~/.config/git/blender.gitconfig

2
dotfiles/.nix-channels
View file

@ -1 +1 @@
https://nixos.org/channels/nixos-25.05 nixos https://nixos.org/channels/nixos-unstable nixos

2
dotfiles/symlink.sh
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
dotfiles_home="${1:-$(dirname "$(realpath "$0")")}" 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." echo "Dotfiles have been recursively copied and symlinked from $dotfiles_home to $HOME."

11
nixos/configuration.nix
View file

@ -28,7 +28,16 @@
LC_TELEPHONE = "nl_NL.UTF-8"; LC_TELEPHONE = "nl_NL.UTF-8";
LC_TIME = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8";
}; };
# Fonts configuration
fonts = {
enableDefaultPackages = true;
packages = with pkgs; [
jetbrains-mono
nerdfonts
];
};
# Optimization & Garbage Collection # Optimization & Garbage Collection
# Optimize Nix-Store During Rebuilds # Optimize Nix-Store During Rebuilds

50
nixos/flake.lock generated
View file

@ -1,49 +1,24 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1749727998, "lastModified": 0,
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=",
"owner": "NixOS", "path": "/nix/store/zd5dgszslv09jzybcpf25gpl12s6r2d9-source",
"repo": "nixpkgs", "type": "path"
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
"type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "nixos-25.05", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1743448293, "lastModified": 1735471104,
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,15 +36,14 @@
}, },
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1749745531, "lastModified": 1737404254,
"narHash": "sha256-+nnmuYVhQPbELuW2lZCWpTAJo955Qng/SCcLVO/RP6c=", "narHash": "sha256-L8Lxp/WVdy9gKO2cXptphdP8cMsnGvZF5Noj8N3jLzI=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "50ec60bcf3528db062700673f61f86d82ca6cda0", "rev": "f8ef9c97ac2f49d5c04dbf3b3d80a0490c05fefb",
"type": "github" "type": "github"
}, },
"original": { "original": {

58
nixos/flake.nix
View file

@ -2,38 +2,38 @@
description = "Bart's NixOS Configuration"; description = "Bart's NixOS Configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
zen-browser.url = "github:0xc000022070/zen-browser-flake"; zen-browser.url = "github:0xc000022070/zen-browser-flake";
}; };
outputs = { nixpkgs, ... }@inputs: { outputs =
nixosConfigurations = { { nixpkgs, ... }@inputs:
tongfang = nixpkgs.lib.nixosSystem { {
specialArgs = { inherit inputs; }; nixosConfigurations = {
modules = [ tongfang = nixpkgs.lib.nixosSystem {
./hardware/tongfang.nix specialArgs = { inherit inputs; };
./configuration.nix modules = [
./users.nix ./hardware/tongfang.nix
./packages.nix ./configuration.nix
./services.nix ./users.nix
./modules/bootloader.nix ./packages.nix
./modules/fonts.nix ./services.nix
./modules/vpn.nix ./modules/bootloader.nix
]; ];
}; };
qemu = nixpkgs.lib.nixosSystem { qemu = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./hardware/qemu.nix ./hardware/qemu.nix
./modules/kde.nix
./modules/configuration.nix ./modules/kde.nix
./modules/display-manager.nix ./modules/configuration.nix
./modules/greeter.nix ./modules/display-manager.nix
./modules/networking.nix ./modules/greeter.nix
./modules/nix-settings.nix ./modules/networking.nix
./modules/users.nix ./modules/nix-settings.nix
]; ./modules/users.nix
];
};
}; };
}; };
};
} }

33
nixos/hardware/tongfang.nix
View file

@ -29,29 +29,24 @@ in
"sdhci_pci" "sdhci_pci"
]; ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ boot.kernelModules = [ "kvm-amd" ];
"kvm-amd"
"crypto_simd"
"cryptd"
];
boot.extraModulePackages = [ yt6801 ]; boot.extraModulePackages = [ yt6801 ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/292e05de-6ddb-4a31-bc8a-92314b13d5c8"; device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a";
fsType = "ext4"; fsType = "ext4";
}; };
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/CEF6-7DAA";
fileSystems."/boot" = fsType = "vfat";
{ device = "/dev/disk/by-uuid/28FA-4261"; options = [
fsType = "vfat"; "fmask=0077"
options = [ "fmask=0077" "dmask=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 # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

1
nixos/modules/devops-tools.nix
View file

@ -4,7 +4,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
azure-cli azure-cli
opentofu opentofu
bao
curl curl
go-task go-task
sops sops

98
nixos/modules/fonts.nix
View file

@ -1,94 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
let {
fontSources = { # Fonts
sf-pro = { fonts.packages = with pkgs; [
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"; jetbrains-mono
hash = "sha256-Lk14U5iLc03BrzO5IdjUwORADqwxKSSg6rS3OlH9aa4="; nerd-font-patcher
}; noto-fonts-color-emoji
sf-compact = { ];
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg";
hash = "sha256-CMNP+sL5nshwK0lGBERp+S3YinscCGTi1LVZVl+PuOM=";
};
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
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;
};
};
} }

16
nixos/modules/ollama.nix
View file

@ -1,16 +0,0 @@
{ ... }:
{
# 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;
}

9
nixos/packages.nix
View file

@ -24,7 +24,6 @@ in
curl curl
fzf fzf
jq jq
delta
unzip unzip
silver-searcher silver-searcher
ripgrep ripgrep
@ -37,13 +36,5 @@ in
dig dig
zig zig
spotify spotify
exfat
exfatprogs
remmina
s3cmd
powershell
git-lfs
ruff
meld
]; ];
} }

4
nixos/services.nix
View file

@ -8,10 +8,6 @@
wayland.enable = true; wayland.enable = true;
}; };
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
qt = {
enable = true;
platformTheme = "kde";
};
# Audio system with PipeWire # Audio system with PipeWire
# Enable PipeWire and ALSA support # Enable PipeWire and ALSA support

19
nixos/users.nix
View file

@ -9,24 +9,20 @@
"wheel" "wheel"
"libvirtd" "libvirtd"
"docker" "docker"
"dialout" # for nanokvm usb
]; ];
packages = with pkgs; [ packages = with pkgs; [
vscodium vscodium
ungoogled-chromium
thunderbird thunderbird
fastfetch fastfetch
ghostty ghostty
neovim neovim
logseq logseq
element-desktop element-desktop
cinny-desktop
signal-desktop
go-task go-task
opentofu opentofu
python3 python3
gnumake gnumake
go gccgo
nodejs_22 nodejs_22
corepack_22 corepack_22
azure-cli azure-cli
@ -35,12 +31,6 @@
inkscape inkscape
gimp gimp
nixfmt-rfc-style nixfmt-rfc-style
cloud-utils
ansible-lint
zed-editor
prismlauncher
runelite
bolt-launcher
]; ];
}; };
@ -50,9 +40,6 @@
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
# Workaround for electron dependency in Logseq # Workaround for electron dependency in Logseq
"electron-27.3.11" "electron-27.3.11"
# Workaround for Cinny to work
"cinny-unwrapped-4.2.3"
"cinny-4.2.3"
]; ];
programs._1password.enable = true; programs._1password.enable = true;
@ -84,5 +71,9 @@
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
enableOnBoot = false; enableOnBoot = false;
rootless = {
enable = true;
setSocketVariable = true;
};
}; };
} }