mirror of
https://github.com/bartvdbraak/dotfiles.git
synced 2025-04-27 06:31:20 +00:00
Use nixfmt
to format all .nix files
This commit is contained in:
parent
454d2b9341
commit
e993042ff6
48 changed files with 206 additions and 140 deletions
|
@ -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,4 +1,9 @@
|
|||
{ config, pkgs, inputs, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# Bootloader and EFI settings
|
||||
|
@ -36,7 +41,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
|
||||
|
@ -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";
|
||||
|
|
|
@ -5,34 +5,35 @@
|
|||
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
|
||||
];
|
||||
};
|
||||
qemu = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./hardware/qemu.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
|
||||
];
|
||||
};
|
||||
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
|
||||
];
|
||||
./modules/kde.nix
|
||||
./modules/configuration.nix
|
||||
./modules/display-manager.nix
|
||||
./modules/greeter.nix
|
||||
./modules/networking.nix
|
||||
./modules/nix-settings.nix
|
||||
./modules/users.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,22 +1,34 @@
|
|||
# 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";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/d6b08f23-97da-4e41-b70c-90fcc35db534";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
|
|
|
@ -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,25 +16,35 @@ 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";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/CEF6-7DAA";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/CEF6-7DAA";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# Bootloader options
|
||||
|
|
|
@ -3,6 +3,9 @@
|
|||
{
|
||||
# Nix Configuration
|
||||
nix.settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
};
|
||||
}
|
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, inputs, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
customWallpaper = pkgs.fetchurl {
|
||||
|
@ -7,26 +12,29 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
environment.systemPackages = with pkgs; with inputs; [
|
||||
inputs.zen-browser.packages."${system}".default
|
||||
firefox
|
||||
git
|
||||
vim
|
||||
wget
|
||||
curl
|
||||
fzf
|
||||
jq
|
||||
unzip
|
||||
silver-searcher
|
||||
ripgrep
|
||||
wl-clipboard-rs
|
||||
networkmanager-openvpn
|
||||
(pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" ''
|
||||
[General]
|
||||
background=${customWallpaper}
|
||||
'')
|
||||
dig
|
||||
zig
|
||||
spotify
|
||||
];
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
with inputs;
|
||||
[
|
||||
inputs.zen-browser.packages."${system}".default
|
||||
firefox
|
||||
git
|
||||
vim
|
||||
wget
|
||||
curl
|
||||
fzf
|
||||
jq
|
||||
unzip
|
||||
silver-searcher
|
||||
ripgrep
|
||||
wl-clipboard-rs
|
||||
networkmanager-openvpn
|
||||
(pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" ''
|
||||
[General]
|
||||
background=${customWallpaper}
|
||||
'')
|
||||
dig
|
||||
zig
|
||||
spotify
|
||||
];
|
||||
}
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue