Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
| 8f5d927a41 |
15 changed files with 93 additions and 242 deletions
|
|
@ -29,10 +29,6 @@ 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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
[user]
|
||||
name = Bart van der Braak
|
||||
email = bart@vanderbraak.nl
|
||||
signingkey = ~/.ssh/id_ed25519.pub
|
||||
# signingkey = 26ED0D75D89D9B61
|
||||
|
||||
[alias]
|
||||
p = push
|
||||
st = status
|
||||
|
|
@ -12,29 +13,28 @@
|
|||
gl = config --global -l
|
||||
aa = add .
|
||||
pushfwl = push --force-with-lease
|
||||
|
||||
[core]
|
||||
excludesfile = ~/.gitignore
|
||||
pager = delta
|
||||
editor = vim
|
||||
|
||||
[interactive]
|
||||
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:~/Repositories/blender.org/"]
|
||||
|
||||
[includeIf "gitdir:~/Repos/projects.blender.org/"]
|
||||
path = ~/.config/git/blender.gitconfig
|
||||
|
|
@ -1 +1 @@
|
|||
https://nixos.org/channels/nixos-25.05 nixos
|
||||
https://nixos.org/channels/nixos-unstable nixos
|
||||
|
|
@ -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."
|
||||
|
|
|
|||
|
|
@ -29,6 +29,15 @@
|
|||
LC_TIME = "en_US.UTF-8";
|
||||
};
|
||||
|
||||
# Fonts configuration
|
||||
fonts = {
|
||||
enableDefaultPackages = true;
|
||||
packages = with pkgs; [
|
||||
jetbrains-mono
|
||||
nerdfonts
|
||||
];
|
||||
};
|
||||
|
||||
# Optimization & Garbage Collection
|
||||
|
||||
# Optimize Nix-Store During Rebuilds
|
||||
|
|
|
|||
50
nixos/flake.lock
generated
50
nixos/flake.lock
generated
|
|
@ -1,49 +1,24 @@
|
|||
{
|
||||
"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": 1749727998,
|
||||
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
|
||||
"type": "github"
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=",
|
||||
"path": "/nix/store/zd5dgszslv09jzybcpf25gpl12s6r2d9-source",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1743448293,
|
||||
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
|
||||
"lastModified": 1735471104,
|
||||
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
|
||||
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -61,15 +36,14 @@
|
|||
},
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749745531,
|
||||
"narHash": "sha256-+nnmuYVhQPbELuW2lZCWpTAJo955Qng/SCcLVO/RP6c=",
|
||||
"lastModified": 1737404254,
|
||||
"narHash": "sha256-L8Lxp/WVdy9gKO2cXptphdP8cMsnGvZF5Noj8N3jLzI=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "50ec60bcf3528db062700673f61f86d82ca6cda0",
|
||||
"rev": "f8ef9c97ac2f49d5c04dbf3b3d80a0490c05fefb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,12 @@
|
|||
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: {
|
||||
outputs =
|
||||
{ nixpkgs, ... }@inputs:
|
||||
{
|
||||
nixosConfigurations = {
|
||||
tongfang = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs; };
|
||||
|
|
@ -17,14 +18,13 @@
|
|||
./packages.nix
|
||||
./services.nix
|
||||
./modules/bootloader.nix
|
||||
./modules/fonts.nix
|
||||
./modules/vpn.nix
|
||||
];
|
||||
};
|
||||
qemu = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./hardware/qemu.nix
|
||||
|
||||
./modules/kde.nix
|
||||
./modules/configuration.nix
|
||||
./modules/display-manager.nix
|
||||
|
|
|
|||
|
|
@ -29,29 +29,24 @@ in
|
|||
"sdhci_pci"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [
|
||||
"kvm-amd"
|
||||
"crypto_simd"
|
||||
"cryptd"
|
||||
];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ yt6801 ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/292e05de-6ddb-4a31-bc8a-92314b13d5c8";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a";
|
||||
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/28FA-4261";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/CEF6-7DAA";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
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
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
azure-cli
|
||||
opentofu
|
||||
bao
|
||||
curl
|
||||
go-task
|
||||
sops
|
||||
|
|
|
|||
|
|
@ -1,94 +1,10 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
fontSources = {
|
||||
sf-pro = {
|
||||
url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg";
|
||||
hash = "sha256-Lk14U5iLc03BrzO5IdjUwORADqwxKSSg6rS3OlH9aa4=";
|
||||
};
|
||||
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; [
|
||||
{
|
||||
# Fonts
|
||||
fonts.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
|
||||
nerd-font-patcher
|
||||
noto-fonts-color-emoji
|
||||
];
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
serif = [ "SF Pro" ];
|
||||
sansSerif = [ "SF Pro" ];
|
||||
monospace = [ "JetBrainsMono Nerd Font Mono" ];
|
||||
emoji = [ "Apple Color Emoji" ];
|
||||
};
|
||||
useEmbeddedBitmaps = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -24,7 +24,6 @@ in
|
|||
curl
|
||||
fzf
|
||||
jq
|
||||
delta
|
||||
unzip
|
||||
silver-searcher
|
||||
ripgrep
|
||||
|
|
@ -37,13 +36,5 @@ in
|
|||
dig
|
||||
zig
|
||||
spotify
|
||||
exfat
|
||||
exfatprogs
|
||||
remmina
|
||||
s3cmd
|
||||
powershell
|
||||
git-lfs
|
||||
ruff
|
||||
meld
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,10 +8,6 @@
|
|||
wayland.enable = true;
|
||||
};
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme = "kde";
|
||||
};
|
||||
|
||||
# Audio system with PipeWire
|
||||
# Enable PipeWire and ALSA support
|
||||
|
|
|
|||
|
|
@ -9,24 +9,20 @@
|
|||
"wheel"
|
||||
"libvirtd"
|
||||
"docker"
|
||||
"dialout" # for nanokvm usb
|
||||
];
|
||||
packages = with pkgs; [
|
||||
vscodium
|
||||
ungoogled-chromium
|
||||
thunderbird
|
||||
fastfetch
|
||||
ghostty
|
||||
neovim
|
||||
logseq
|
||||
element-desktop
|
||||
cinny-desktop
|
||||
signal-desktop
|
||||
go-task
|
||||
opentofu
|
||||
python3
|
||||
gnumake
|
||||
go
|
||||
gccgo
|
||||
nodejs_22
|
||||
corepack_22
|
||||
azure-cli
|
||||
|
|
@ -35,12 +31,6 @@
|
|||
inkscape
|
||||
gimp
|
||||
nixfmt-rfc-style
|
||||
cloud-utils
|
||||
ansible-lint
|
||||
zed-editor
|
||||
prismlauncher
|
||||
runelite
|
||||
bolt-launcher
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -50,9 +40,6 @@
|
|||
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;
|
||||
|
|
@ -84,5 +71,9 @@
|
|||
virtualisation.docker = {
|
||||
enable = true;
|
||||
enableOnBoot = false;
|
||||
rootless = {
|
||||
enable = true;
|
||||
setSocketVariable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue