dotfiles/.bash_aliases

@@ -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 nfmt="find . -type f -name '*.nix' -exec nixfmt {} \;"
+alias ngc='sudo nix-collect-garbage --delete-older-than 14d'
 alias code='codium'
 alias rgf='rg --files | rg'

gentoo/portage/package.accept_keywords/awscli

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

gentoo/portage/package.accept_keywords/firefox-dev

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

gentoo/portage/package.accept_keywords/ghostty

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

gentoo/portage/package.accept_keywords/git-filter-repo

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

gentoo/portage/package.accept_keywords/insomnia

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

gentoo/portage/package.accept_keywords/just

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

gentoo/portage/package.accept_keywords/k9scli

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

gentoo/portage/package.accept_keywords/logseq

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

gentoo/portage/package.accept_keywords/opentofu

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

gentoo/portage/package.accept_keywords/wezterm

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

gentoo/portage/package.accept_keywords/zen-browser

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

gentoo/portage/package.use/ghostty

@@ -1,5 +0,0 @@
-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

gentoo/portage/package.use/iputils

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

nixos/configuration.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, inputs, ... }:
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
 
 {
   # Bootloader and EFI settings
@@ -41,7 +36,7 @@
   # Optimization & Garbage Collection
 
   # Optimize Nix-Store During Rebuilds
-  # NOTE: Optimizes during builds - results in slower builds
+    # NOTE: Optimizes during builds - results in slower builds
   nix.settings.auto-optimise-store = true;
 
   # Purge Unused Nix-Store Entries
@@ -53,10 +48,7 @@
 
   # Enable Nix Flakes and experimental features
   nixpkgs.config.allowUnfree = true;
-  nix.settings.experimental-features = [
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    "nix-command"
-    "flakes"
-  ];
 
   # System state version
   system.stateVersion = "24.11";

nixos/flake.nix

@@ -5,35 +5,107 @@
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
   };
 
-  outputs =
+  outputs = { nixpkgs, ... } @ inputs:
-    { nixpkgs, ... }@inputs:
+  {
-    {
+    nixosConfigurations = {
-      nixosConfigurations = {
+      tongfang = nixpkgs.lib.nixosSystem {
-        tongfang = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs; };
-          specialArgs = { inherit inputs; };
+        modules = [
-          modules = [
+          ./hardware/tongfang.nix
-            ./hardware/tongfang.nix
+          ./configuration.nix
-            ./configuration.nix
+          ./users.nix
-            ./users.nix
+          ./packages.nix
-            ./packages.nix
+          ./services.nix
-            ./services.nix
+        ];
-            ./modules/bootloader.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
-          ];
-        };
       };
+
+      # 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
+      #   ];
+      # };
     };
+  };
 }

nixos/hardware/qemu.nix

@@ -1,34 +1,22 @@
 # 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 = [
+  imports =
-    (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
-  ];
+    ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
-    "ahci"
-    "xhci_pci"
-    "virtio_pci"
-    "sr_mod"
-    "virtio_blk"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/d6b08f23-97da-4e41-b70c-90fcc35db534";
+    { device = "/dev/disk/by-uuid/d6b08f23-97da-4e41-b70c-90fcc35db534";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
   swapDevices = [ ];
 

nixos/hardware/tongfang.nix

@@ -1,13 +1,7 @@
 # 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 {
@@ -16,35 +10,25 @@ let
   };
 in
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+    ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "sdhci_pci" ];
-    "nvme"
-    "xhci_pci"
-    "thunderbolt"
-    "usb_storage"
-    "sd_mod"
-    "sdhci_pci"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ yt6801 ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a";
+    { device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/CEF6-7DAA";
+    { device = "/dev/disk/by-uuid/CEF6-7DAA";
-    fsType = "vfat";
+      fsType = "vfat";
-    options = [
+      options = [ "fmask=0077" "dmask=0077" ];
-      "fmask=0077"
+    };
-      "dmask=0077"
-    ];
-  };
 
   swapDevices = [ ];
 

nixos/modules/bootloader.nix

@@ -1,32 +1,17 @@
-{ pkgs, ... }:
+{ pkgs,  ... }:
 
 {
   # Bootloader options
-  boot = {
+  boot.loader.systemd-boot.enable = true;
-    # Enable Plymouth
+  boot.loader.efi.canTouchEfiVariables = true;
-    plymouth = {
+  boot.loader.timeout = 2;
-      enable = true;
+  boot.initrd.enable = true;
-      font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
+  boot.initrd.systemd.enable = true;
-      themePackages = with pkgs; [
+  boot.consoleLogLevel = 3;
-        (adi1090x-plymouth-themes.override {
+  boot.plymouth = {
-          selected_themes = [ "motion" ];
+    enable = true;
-        })
+    font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
-      ];
+    themePackages = [ pkgs.nixos-bgrt-plymouth ];
-      theme = "motion";
+    theme = "nixos-bgrt";
-    };
-
-    # 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;
   };
 }

nixos/modules/nix-settings.nix

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

nixos/modules/programming-languages.nix

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

nixos/modules/theme.nix

@@ -34,7 +34,7 @@
 
   # Override packages
   nixpkgs.config.packageOverrides = pkgs: {
-    colloid-icon-theme = pkgs.colloid-icon-theme.override { colorVariants = [ "teal" ]; };
+    colloid-icon-theme = pkgs.colloid-icon-theme.override { colorVariants = ["teal"]; };
     catppuccin-gtk = pkgs.catppuccin-gtk.override {
       accents = [ "teal" ]; # You can specify multiple accents here to output multiple themes 
       size = "standard";

nixos/modules/users.nix

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

nixos/packages.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, inputs, config, ... }:
-  pkgs,
-  inputs,
-  config,
-  ...
-}:
 
 let
   customWallpaper = pkgs.fetchurl {
@@ -12,29 +7,26 @@ let
   };
 in
 {
-  environment.systemPackages =
+  environment.systemPackages = with pkgs; with inputs; [
-    with pkgs;
+    inputs.zen-browser.packages."${system}".default
-    with inputs;
+    firefox
-    [
+    git
-      inputs.zen-browser.packages."${system}".default
+    vim
-      firefox
+    wget
-      git
+    curl
-      vim
+    fzf
-      wget
+    jq
-      curl
+    unzip
-      fzf
+    silver-searcher
-      jq
+    ripgrep
-      unzip
+    wl-clipboard-rs
-      silver-searcher
+    networkmanager-openvpn
-      ripgrep
+    (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" ''
-      wl-clipboard-rs
+    [General]
-      networkmanager-openvpn
+    background=${customWallpaper}
-      (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" ''
+    '')
-        [General]
+    dig
-        background=${customWallpaper}
+    zig
-      '')
+    spotify
-      dig
+  ];
-      zig
-      spotify
-    ];
 }

nixos/services.nix

@@ -13,9 +13,9 @@
   # Enable PipeWire and ALSA support
   services.pipewire = {
     enable = true;
-    alsa.enable = true; # Enable ALSA support
+    alsa.enable = true;       # Enable ALSA support
     alsa.support32Bit = true; # Support for 32-bit applications
-    pulse.enable = true; # Enable PulseAudio compatibility layer
+    pulse.enable = true;      # Enable PulseAudio compatibility layer
   };
   
   # Enable libinput for input device handling

nixos/users.nix

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