bartvdbraak/dotfiles
1
0
Fork 0
mirror of https://github.com/bartvdbraak/dotfiles.git synced 2025-04-28 15:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: bartvdbraak:9e754a026e5542874e6b7dbccc20a26e88df4051
Branches Tags
bartvdbraak:main
bartvdbraak:gentoo
bartvdbraak:bigrefactor
...
compare: bartvdbraak:49e409a751949a229473d42161dda6adb02a6360
Branches Tags
bartvdbraak:main
bartvdbraak:gentoo
bartvdbraak:bigrefactor

4 commits
9e754a026e ... 49e409a751

Author SHA1 Message Date
Bart van der Braak
49e409a751
Add Gentoo-specific configs from ws-bart (#9) 2025-01-22 11:26:51 +01:00
Bart van der Braak
e993042ff6 Use nixfmt to format all .nix files 2025-01-22 11:14:58 +01:00
Bart van der Braak
454d2b9341 Add custom bootloader 2025-01-22 11:05:55 +01:00
Bart van der Braak
91b4f46f3b Don't enable Docker on boot 2025-01-22 09:56:32 +01:00
61 changed files with 260 additions and 228 deletions
Show stats Expand all files Collapse all files

2
dotfiles/.bash_aliases
View file

@ -1,6 +1,6 @@
alias ll='ls -la'
alias nrs='sudo nixos-rebuild --use-remote-sudo switch'
alias nrb='sudo nixos-rebuild --use-remote-sudo boot'
alias ngc='sudo nix-collect-garbage --delete-older-than 14d'
alias nfmt="find . -type f -name '*.nix' -exec nixfmt {} \;"
alias code='codium'
alias rgf='rg --files | rg'

1
gentoo/portage/package.accept_keywords/awscli Normal file
View file

@ -0,0 +1 @@
app-admin/awscli-bin ~amd64

1
gentoo/portage/package.accept_keywords/firefox-dev Normal file
View file

@ -0,0 +1 @@
www-client/firefox-developer-bin ~amd64

3
gentoo/portage/package.accept_keywords/ghostty Normal file
View file

@ -0,0 +1,3 @@
dev-lang/zig ~amd64
x11-terms/ghostty ~amd64
app-eselect/eselect-zig ~amd64

2
gentoo/portage/package.accept_keywords/git-filter-repo Normal file
View file

@ -0,0 +1,2 @@
dev-vcs/git-filter-repo ~amd64

1
gentoo/portage/package.accept_keywords/insomnia Normal file
View file

@ -0,0 +1 @@
dev-util/insomnia-bin ~amd64

1
gentoo/portage/package.accept_keywords/just Normal file
View file

@ -0,0 +1 @@
dev-build/just ~amd64

1
gentoo/portage/package.accept_keywords/k9scli Normal file
View file

@ -0,0 +1 @@
sys-cluster/k9scli ~amd64

1
gentoo/portage/package.accept_keywords/logseq Normal file
View file

@ -0,0 +1 @@
app-editors/logseq-desktop-bin ~amd64

1
gentoo/portage/package.accept_keywords/opentofu Normal file
View file

@ -0,0 +1 @@
app-admin/opentofu ~amd64

1
gentoo/portage/package.accept_keywords/wezterm Normal file
View file

@ -0,0 +1 @@
x11-terms/wezterm ~amd64

1
gentoo/portage/package.accept_keywords/zen-browser Normal file
View file

@ -0,0 +1 @@
www-client/zen-bin ~amd64

5
gentoo/portage/package.use/ghostty Normal file
View file

@ -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

2
gentoo/portage/package.use/iputils Normal file
View file

@ -0,0 +1,2 @@
net-misc/iputils tracepath

12
nixos/configuration.nix
View file

@ -1,4 +1,9 @@
{ config, pkgs, inputs, ... }:
{
config,
pkgs,
inputs,
...
}:
{
# Bootloader and EFI settings
@ -48,7 +53,10 @@
# Enable Nix Flakes and experimental features
nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
# System state version
system.stateVersion = "24.11";

104
nixos/flake.nix
View file

@ -5,7 +5,8 @@
zen-browser.url = "github:0xc000022070/zen-browser-flake";
};
outputs = { nixpkgs, ... } @ inputs:
outputs =
{ nixpkgs, ... }@inputs:
{
nixosConfigurations = {
tongfang = nixpkgs.lib.nixosSystem {
@ -16,96 +17,23 @@
./users.nix
./packages.nix
./services.nix
./modules/bootloader.nix
];
};
qemu = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
./hardware/qemu.nix
# tongfang = nixpkgs.lib.nixosSystem {
# specialArgs = { inherit inputs; };
# modules = [
# ./hardware/tongfang.nix
# ./modules/kde.nix
# ./modules/battery.nix
# ./modules/bluetooth.nix
# ./modules/bootloader.nix
# ./modules/configuration.nix
# ./modules/creative-tools.nix
# ./modules/devops-tools.nix
# ./modules/display-manager.nix
# ./modules/environment-variables.nix
# ./modules/firewall.nix
# ./modules/fonts.nix
# ./modules/gc.nix
# ./modules/greeter.nix
# ./modules/info-fetchers.nix
# ./modules/internationalisation.nix
# ./modules/keyboard.nix
# ./modules/linux-kernel.nix
# ./modules/lsp.nix
# ./modules/networking.nix
# ./modules/nix-settings.nix
# ./modules/nixpkgs.nix
# ./modules/open-ssh.nix
# ./modules/printing.nix
# ./modules/programming-languages.nix
# ./modules/screen.nix
# ./modules/services.nix
# ./modules/sound.nix
# ./modules/terminal-utils.nix
# ./modules/theme.nix
# ./modules/time.nix
# ./modules/usb.nix
# ./modules/users.nix
# ./modules/utils.nix
# ./modules/virtualisation.nix
# ./modules/vpn.nix
# ./modules/work.nix
# ];
# };
# qemu = nixpkgs.lib.nixosSystem {
# specialArgs = { inherit inputs; };
# modules = [
# ./hardware/qemu.nix
# ./modules/kde.nix
# # ./modules/battery.nix
# # ./modules/bluetooth.nix
# # ./modules/bootloader.nix
# ./modules/configuration.nix
# # ./modules/creative-tools.nix
# # ./modules/devops-tools.nix
# ./modules/display-manager.nix
# # ./modules/environment-variables.nix
# # ./modules/firewall.nix
# # ./modules/fonts.nix
# # ./modules/gc.nix
# ./modules/greeter.nix
# # ./modules/info-fetchers.nix
# # ./modules/internationalisation.nix
# # ./modules/keyboard.nix
# # ./modules/linux-kernel.nix
# # ./modules/lsp.nix
# ./modules/networking.nix
# ./modules/nix-settings.nix
# # ./modules/nixpkgs.nix
# # ./modules/open-ssh.nix
# # ./modules/printing.nix
# # ./modules/programming-languages.nix
# # ./modules/screen.nix
# # ./modules/services.nix
# # ./modules/sound.nix
# # ./modules/terminal-utils.nix
# # ./modules/theme.nix
# # ./modules/time.nix
# # ./modules/usb.nix
# ./modules/users.nix
# # ./modules/utils.nix
# # ./modules/virtualisation.nix
# # ./modules/vpn.nix
# # ./modules/work.nix
# ];
# };
./modules/kde.nix
./modules/configuration.nix
./modules/display-manager.nix
./modules/greeter.nix
./modules/networking.nix
./modules/nix-settings.nix
./modules/users.nix
];
};
};
};
}

24
nixos/hardware/qemu.nix
View file

@ -1,20 +1,32 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
boot.initrd.availableKernelModules = [
"ahci"
"xhci_pci"
"virtio_pci"
"sr_mod"
"virtio_blk"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/d6b08f23-97da-4e41-b70c-90fcc35db534";
fileSystems."/" = {
device = "/dev/disk/by-uuid/d6b08f23-97da-4e41-b70c-90fcc35db534";
fsType = "ext4";
};

34
nixos/hardware/tongfang.nix
View file

@ -1,7 +1,13 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
let
yt6801 = import ./yt6801.nix {
@ -10,24 +16,34 @@ let
};
in
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"thunderbolt"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ yt6801 ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a";
fileSystems."/" = {
device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/CEF6-7DAA";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/CEF6-7DAA";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [ ];

33
nixos/modules/bootloader.nix
View file

@ -2,16 +2,31 @@
{
# Bootloader options
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.timeout = 2;
boot.initrd.enable = true;
boot.initrd.systemd.enable = true;
boot.consoleLogLevel = 3;
boot.plymouth = {
boot = {
# Enable Plymouth
plymouth = {
enable = true;
font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
themePackages = [ pkgs.nixos-bgrt-plymouth ];
theme = "nixos-bgrt";
themePackages = with pkgs; [
(adi1090x-plymouth-themes.override {
selected_themes = [ "motion" ];
})
];
theme = "motion";
};
# Enable "Silent Boot"
consoleLogLevel = 0;
initrd.verbose = false;
kernelParams = [
"quiet"
"splash"
"boot.shell_on_fail"
"loglevel=3"
"rd.systemd.show_status=false"
"rd.udev.log_level=3"
"udev.log_priority=3"
];
loader.timeout = 0;
};
}

5
nixos/modules/nix-settings.nix
View file

@ -3,6 +3,9 @@
{
# Nix Configuration
nix.settings = {
experimental-features = [ "nix-command" "flakes" ];
experimental-features = [
"nix-command"
"flakes"
];
};
}

8
nixos/modules/programming-languages.nix
View file

@ -3,7 +3,13 @@
{
environment.systemPackages = with pkgs; [
go
(python312Full.withPackages(ps: with ps; [ pygobject3 gobject-introspection pyqt6-sip]))
(python312Full.withPackages (
ps: with ps; [
pygobject3
gobject-introspection
pyqt6-sip
]
))
nodePackages_latest.nodejs
nodePackages_latest.pnpm
bun

9
nixos/modules/users.nix
View file

@ -5,7 +5,14 @@
users.users.bart = {
isNormalUser = true;
description = "Bart van der Braak";
extraGroups = [ "networkmanager" "input" "wheel" "video" "audio" "tss" ];
extraGroups = [
"networkmanager"
"input"
"wheel"
"video"
"audio"
"tss"
];
shell = pkgs.bash;
packages = with pkgs; [
spotify

12
nixos/packages.nix
View file

@ -1,4 +1,9 @@
{ pkgs, inputs, config, ... }:
{
pkgs,
inputs,
config,
...
}:
let
customWallpaper = pkgs.fetchurl {
@ -7,7 +12,10 @@ let
};
in
{
environment.systemPackages = with pkgs; with inputs; [
environment.systemPackages =
with pkgs;
with inputs;
[
inputs.zen-browser.packages."${system}".default
firefox
git

14
nixos/users.nix
View file

@ -4,7 +4,12 @@
users.users.bart = {
isNormalUser = true;
description = "Bart van der Braak";
extraGroups = [ "networkmanager" "wheel" "libvirtd" "docker" ];
extraGroups = [
"networkmanager"
"wheel"
"libvirtd"
"docker"
];
packages = with pkgs; [
vscodium
thunderbird
@ -63,9 +68,12 @@
programs.virt-manager.enable = true;
# Add Docker support
virtualisation.docker.enable = true;
virtualisation.docker.rootless = {
virtualisation.docker = {
enable = true;
enableOnBoot = false;
rootless = {
enable = true;
setSocketVariable = true;
};
};
}