From e993042ff66aa8a5ef450599aa130b5ca35c26eb Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Wed, 22 Jan 2025 11:14:58 +0100 Subject: [PATCH] Use `nixfmt` to format all .nix files --- dotfiles/.bash_aliases | 2 +- nixos/configuration.nix | 16 +++++-- nixos/flake.nix | 55 ++++++++++++------------ nixos/hardware/qemu.nix | 30 +++++++++---- nixos/hardware/tongfang.nix | 46 +++++++++++++------- nixos/hardware/yt6801.nix | 2 +- nixos/modules/battery.nix | 2 +- nixos/modules/bluetooth.nix | 2 +- nixos/modules/bootloader.nix | 4 +- nixos/modules/compilation.nix | 2 +- nixos/modules/configuration.nix | 2 +- nixos/modules/creative-tools.nix | 2 +- nixos/modules/devops-tools.nix | 2 +- nixos/modules/display-manager.nix | 2 +- nixos/modules/environment-variables.nix | 2 +- nixos/modules/firewall.nix | 4 +- nixos/modules/fonts.nix | 2 +- nixos/modules/gaming.nix | 2 +- nixos/modules/gc.nix | 2 +- nixos/modules/gnome.nix | 2 +- nixos/modules/greeter.nix | 2 +- nixos/modules/hyprland.nix | 2 +- nixos/modules/info-fetchers.nix | 2 +- nixos/modules/internationalisation.nix | 4 +- nixos/modules/kde.nix | 2 +- nixos/modules/keyboard.nix | 2 +- nixos/modules/linux-kernel.nix | 4 +- nixos/modules/lsp.nix | 4 +- nixos/modules/networking.nix | 4 +- nixos/modules/nix-settings.nix | 7 +++- nixos/modules/nixpkgs.nix | 2 +- nixos/modules/open-ssh.nix | 2 +- nixos/modules/printing.nix | 2 +- nixos/modules/programming-languages.nix | 10 ++++- nixos/modules/screen.nix | 2 +- nixos/modules/services.nix | 6 +-- nixos/modules/sound.nix | 2 +- nixos/modules/terminal-utils.nix | 2 +- nixos/modules/theme.nix | 6 +-- nixos/modules/time.nix | 2 +- nixos/modules/usb.nix | 2 +- nixos/modules/users.nix | 11 ++++- nixos/modules/virtualisation.nix | 2 +- nixos/modules/vpn.nix | 2 +- nixos/modules/work.nix | 2 +- nixos/packages.nix | 56 ++++++++++++++----------- nixos/services.nix | 10 ++--- nixos/users.nix | 9 +++- 48 files changed, 206 insertions(+), 140 deletions(-) diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index 5036b01..800406e 100644 --- a/dotfiles/.bash_aliases +++ b/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 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' \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/configuration.nix index ac30b54..ce521e2 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -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,8 +53,11 @@ # 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"; -} \ No newline at end of file +} diff --git a/nixos/flake.nix b/nixos/flake.nix index 36d1fb8..177fc98 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -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 + ]; + }; }; }; - }; } diff --git a/nixos/hardware/qemu.nix b/nixos/hardware/qemu.nix index aad58ac..c34ee3d 100644 --- a/nixos/hardware/qemu.nix +++ b/nixos/hardware/qemu.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 = [ ]; diff --git a/nixos/hardware/tongfang.nix b/nixos/hardware/tongfang.nix index f5a93ca..f83ec22 100644 --- a/nixos/hardware/tongfang.nix +++ b/nixos/hardware/tongfang.nix @@ -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 = [ ]; @@ -41,4 +57,4 @@ in nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} \ No newline at end of file +} diff --git a/nixos/hardware/yt6801.nix b/nixos/hardware/yt6801.nix index 22fd9ca..8c040ac 100644 --- a/nixos/hardware/yt6801.nix +++ b/nixos/hardware/yt6801.nix @@ -48,4 +48,4 @@ stdenv.mkDerivation { ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/nixos/modules/battery.nix b/nixos/modules/battery.nix index f38e347..c390d25 100644 --- a/nixos/modules/battery.nix +++ b/nixos/modules/battery.nix @@ -13,4 +13,4 @@ CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; }; }; -} \ No newline at end of file +} diff --git a/nixos/modules/bluetooth.nix b/nixos/modules/bluetooth.nix index f88ce92..0d92a82 100644 --- a/nixos/modules/bluetooth.nix +++ b/nixos/modules/bluetooth.nix @@ -9,4 +9,4 @@ environment.systemPackages = with pkgs; [ overskride ]; -} \ No newline at end of file +} diff --git a/nixos/modules/bootloader.nix b/nixos/modules/bootloader.nix index c86f6c6..94f827f 100644 --- a/nixos/modules/bootloader.nix +++ b/nixos/modules/bootloader.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, ... }: { # Bootloader options @@ -29,4 +29,4 @@ ]; loader.timeout = 0; }; -} \ No newline at end of file +} diff --git a/nixos/modules/compilation.nix b/nixos/modules/compilation.nix index 85307e9..11ba088 100644 --- a/nixos/modules/compilation.nix +++ b/nixos/modules/compilation.nix @@ -10,4 +10,4 @@ lldb musl ]; -} \ No newline at end of file +} diff --git a/nixos/modules/configuration.nix b/nixos/modules/configuration.nix index 1e88924..c7ac8e2 100644 --- a/nixos/modules/configuration.nix +++ b/nixos/modules/configuration.nix @@ -6,4 +6,4 @@ { system.stateVersion = "24.11"; -} \ No newline at end of file +} diff --git a/nixos/modules/creative-tools.nix b/nixos/modules/creative-tools.nix index b4871c6..8a5ef2a 100644 --- a/nixos/modules/creative-tools.nix +++ b/nixos/modules/creative-tools.nix @@ -6,4 +6,4 @@ inkscape gimp ]; -} \ No newline at end of file +} diff --git a/nixos/modules/devops-tools.nix b/nixos/modules/devops-tools.nix index fe9af53..21122c8 100644 --- a/nixos/modules/devops-tools.nix +++ b/nixos/modules/devops-tools.nix @@ -8,4 +8,4 @@ go-task sops ]; -} \ No newline at end of file +} diff --git a/nixos/modules/display-manager.nix b/nixos/modules/display-manager.nix index 54424fc..93c90a6 100644 --- a/nixos/modules/display-manager.nix +++ b/nixos/modules/display-manager.nix @@ -15,4 +15,4 @@ environment.systemPackages = with pkgs; [ greetd.tuigreet ]; -} \ No newline at end of file +} diff --git a/nixos/modules/environment-variables.nix b/nixos/modules/environment-variables.nix index c2e81d8..0a47745 100644 --- a/nixos/modules/environment-variables.nix +++ b/nixos/modules/environment-variables.nix @@ -5,4 +5,4 @@ environment.variables.SPOTIFY_PATH = "${pkgs.spotify}/"; environment.variables.JDK_PATH = "${pkgs.jdk11}/"; environment.variables.NODEJS_PATH = "${pkgs.nodePackages_latest.nodejs}/"; -} \ No newline at end of file +} diff --git a/nixos/modules/firewall.nix b/nixos/modules/firewall.nix index f5a4951..4684fc2 100644 --- a/nixos/modules/firewall.nix +++ b/nixos/modules/firewall.nix @@ -4,7 +4,7 @@ # Open ports in the firewall. networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [ ]; - networking.firewall.allowedUDPPorts = [ + networking.firewall.allowedUDPPorts = [ 5353 # Spotify Connect ]; -} \ No newline at end of file +} diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix index a21e678..5e91d21 100644 --- a/nixos/modules/fonts.nix +++ b/nixos/modules/fonts.nix @@ -7,4 +7,4 @@ nerd-font-patcher noto-fonts-color-emoji ]; -} \ No newline at end of file +} diff --git a/nixos/modules/gaming.nix b/nixos/modules/gaming.nix index 817b204..c7d53d9 100644 --- a/nixos/modules/gaming.nix +++ b/nixos/modules/gaming.nix @@ -3,4 +3,4 @@ { # Enable Steam programs.steam.enable = true; -} \ No newline at end of file +} diff --git a/nixos/modules/gc.nix b/nixos/modules/gc.nix index 80ef38a..683602b 100644 --- a/nixos/modules/gc.nix +++ b/nixos/modules/gc.nix @@ -13,4 +13,4 @@ dates = "weekly"; options = "--delete-older-than 14d"; }; -} \ No newline at end of file +} diff --git a/nixos/modules/gnome.nix b/nixos/modules/gnome.nix index 1f53d7b..b5b9b17 100644 --- a/nixos/modules/gnome.nix +++ b/nixos/modules/gnome.nix @@ -7,4 +7,4 @@ desktopManager.gnome.enable = true; displayManager.gdm.enable = true; }; -} \ No newline at end of file +} diff --git a/nixos/modules/greeter.nix b/nixos/modules/greeter.nix index 54424fc..93c90a6 100644 --- a/nixos/modules/greeter.nix +++ b/nixos/modules/greeter.nix @@ -15,4 +15,4 @@ environment.systemPackages = with pkgs; [ greetd.tuigreet ]; -} \ No newline at end of file +} diff --git a/nixos/modules/hyprland.nix b/nixos/modules/hyprland.nix index bda35ce..8a32db7 100644 --- a/nixos/modules/hyprland.nix +++ b/nixos/modules/hyprland.nix @@ -22,4 +22,4 @@ mpv # media player imv # image viewer ]; -} \ No newline at end of file +} diff --git a/nixos/modules/info-fetchers.nix b/nixos/modules/info-fetchers.nix index 7f4e4a1..9dca424 100644 --- a/nixos/modules/info-fetchers.nix +++ b/nixos/modules/info-fetchers.nix @@ -25,4 +25,4 @@ dig speedtest-rs ]; -} \ No newline at end of file +} diff --git a/nixos/modules/internationalisation.nix b/nixos/modules/internationalisation.nix index 46d0b97..6170a98 100644 --- a/nixos/modules/internationalisation.nix +++ b/nixos/modules/internationalisation.nix @@ -5,7 +5,7 @@ "en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" ]; - + i18n.defaultLocale = "en_US.UTF-8"; i18n.extraLocaleSettings = { @@ -27,4 +27,4 @@ hunspellDicts.en_US hunspellDicts.nl_NL ]; -} \ No newline at end of file +} diff --git a/nixos/modules/kde.nix b/nixos/modules/kde.nix index 94c883f..29f0685 100644 --- a/nixos/modules/kde.nix +++ b/nixos/modules/kde.nix @@ -8,4 +8,4 @@ wayland.enable = true; }; services.desktopManager.plasma6.enable = true; -} \ No newline at end of file +} diff --git a/nixos/modules/keyboard.nix b/nixos/modules/keyboard.nix index 0018809..14639e4 100644 --- a/nixos/modules/keyboard.nix +++ b/nixos/modules/keyboard.nix @@ -11,4 +11,4 @@ gtypist # typing tutor via # keyboard configurator ]; -} \ No newline at end of file +} diff --git a/nixos/modules/linux-kernel.nix b/nixos/modules/linux-kernel.nix index d795647..85a2ca0 100644 --- a/nixos/modules/linux-kernel.nix +++ b/nixos/modules/linux-kernel.nix @@ -3,7 +3,7 @@ { # Linux Kernel boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen; - boot.kernelParams = [ + boot.kernelParams = [ "splash" "quiet" "fbcon=nodefer" @@ -18,4 +18,4 @@ environment.systemPackages = with pkgs; [ policycoreutils ]; -} \ No newline at end of file +} diff --git a/nixos/modules/lsp.nix b/nixos/modules/lsp.nix index 31be33f..82742b6 100644 --- a/nixos/modules/lsp.nix +++ b/nixos/modules/lsp.nix @@ -27,5 +27,5 @@ terraform-ls ansible-language-server hyprls - ]; -} \ No newline at end of file + ]; +} diff --git a/nixos/modules/networking.nix b/nixos/modules/networking.nix index 8a8902f..c63f4dd 100644 --- a/nixos/modules/networking.nix +++ b/nixos/modules/networking.nix @@ -5,9 +5,9 @@ networking.hostName = "tongfang"; networking.networkmanager.enable = true; users.extraGroups.networkmanager.members = [ "bart" ]; - + environment.systemPackages = with pkgs; [ iwgtk impala ]; -} \ No newline at end of file +} diff --git a/nixos/modules/nix-settings.nix b/nixos/modules/nix-settings.nix index 7431c49..09e5ca3 100644 --- a/nixos/modules/nix-settings.nix +++ b/nixos/modules/nix-settings.nix @@ -3,6 +3,9 @@ { # Nix Configuration nix.settings = { - experimental-features = [ "nix-command" "flakes" ]; + experimental-features = [ + "nix-command" + "flakes" + ]; }; -} \ No newline at end of file +} diff --git a/nixos/modules/nixpkgs.nix b/nixos/modules/nixpkgs.nix index c8adab7..46f31d6 100644 --- a/nixos/modules/nixpkgs.nix +++ b/nixos/modules/nixpkgs.nix @@ -3,4 +3,4 @@ { # Allow unfree packages nixpkgs.config.allowUnfree = true; -} \ No newline at end of file +} diff --git a/nixos/modules/open-ssh.nix b/nixos/modules/open-ssh.nix index 8c7e20c..e723819 100644 --- a/nixos/modules/open-ssh.nix +++ b/nixos/modules/open-ssh.nix @@ -11,4 +11,4 @@ AllowUsers = [ "bart" ]; }; }; -} \ No newline at end of file +} diff --git a/nixos/modules/printing.nix b/nixos/modules/printing.nix index fcfebbd..76fd488 100644 --- a/nixos/modules/printing.nix +++ b/nixos/modules/printing.nix @@ -5,4 +5,4 @@ services.printing.enable = true; # Disable browsed: https://discourse.nixos.org/t/newly-announced-vulnerabilities-in-cups services.printing.browsed.enable = false; -} \ No newline at end of file +} diff --git a/nixos/modules/programming-languages.nix b/nixos/modules/programming-languages.nix index 0a224be..6c5a3a8 100644 --- a/nixos/modules/programming-languages.nix +++ b/nixos/modules/programming-languages.nix @@ -3,11 +3,17 @@ { 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 lua zig ]; -} \ No newline at end of file +} diff --git a/nixos/modules/screen.nix b/nixos/modules/screen.nix index 487fe93..3d5dd06 100644 --- a/nixos/modules/screen.nix +++ b/nixos/modules/screen.nix @@ -7,4 +7,4 @@ wlsunset brightnessctl ]; -} \ No newline at end of file +} diff --git a/nixos/modules/services.nix b/nixos/modules/services.nix index 170e56a..faa690c 100644 --- a/nixos/modules/services.nix +++ b/nixos/modules/services.nix @@ -5,7 +5,7 @@ systemd.packages = with pkgs; [ auto-cpufreq ]; - + # Enable Services programs.direnv.enable = true; services.upower.enable = true; @@ -21,7 +21,7 @@ services.mpd.enable = true; programs.thunar.enable = true; programs.xfconf.enable = true; - services.tumbler.enable = true; + services.tumbler.enable = true; services.fwupd.enable = true; services.auto-cpufreq.enable = true; # services.gnome.core-shell.enable = true; @@ -53,4 +53,4 @@ wlogout gifsicle ]; -} \ No newline at end of file +} diff --git a/nixos/modules/sound.nix b/nixos/modules/sound.nix index 749a758..ab183ea 100644 --- a/nixos/modules/sound.nix +++ b/nixos/modules/sound.nix @@ -22,4 +22,4 @@ pamixer pavucontrol ]; -} \ No newline at end of file +} diff --git a/nixos/modules/terminal-utils.nix b/nixos/modules/terminal-utils.nix index 6685bdc..4f04744 100644 --- a/nixos/modules/terminal-utils.nix +++ b/nixos/modules/terminal-utils.nix @@ -56,4 +56,4 @@ cava figlet ]; -} \ No newline at end of file +} diff --git a/nixos/modules/theme.nix b/nixos/modules/theme.nix index c5e953f..fb4142c 100644 --- a/nixos/modules/theme.nix +++ b/nixos/modules/theme.nix @@ -34,9 +34,9 @@ # 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 + accents = [ "teal" ]; # You can specify multiple accents here to output multiple themes size = "standard"; variant = "macchiato"; }; @@ -59,4 +59,4 @@ # xsettingsd # themechanger ]; -} \ No newline at end of file +} diff --git a/nixos/modules/time.nix b/nixos/modules/time.nix index 5d4dc50..3885f2c 100644 --- a/nixos/modules/time.nix +++ b/nixos/modules/time.nix @@ -4,4 +4,4 @@ # Set your time zone. time.hardwareClockInLocalTime = true; time.timeZone = "Europe/Amsterdam"; -} \ No newline at end of file +} diff --git a/nixos/modules/usb.nix b/nixos/modules/usb.nix index 63a70ff..73df29e 100644 --- a/nixos/modules/usb.nix +++ b/nixos/modules/usb.nix @@ -22,4 +22,4 @@ environment.systemPackages = with pkgs; [ usbutils ]; -} \ No newline at end of file +} diff --git a/nixos/modules/users.nix b/nixos/modules/users.nix index 4e6f0d7..431621d 100644 --- a/nixos/modules/users.nix +++ b/nixos/modules/users.nix @@ -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 @@ -16,4 +23,4 @@ # Change runtime directory size services.logind.extraConfig = "RuntimeDirectorySize=8G"; -} \ No newline at end of file +} diff --git a/nixos/modules/virtualisation.nix b/nixos/modules/virtualisation.nix index 1234fc2..8328bf9 100644 --- a/nixos/modules/virtualisation.nix +++ b/nixos/modules/virtualisation.nix @@ -20,4 +20,4 @@ lazydocker docker-credential-helpers ]; -} \ No newline at end of file +} diff --git a/nixos/modules/vpn.nix b/nixos/modules/vpn.nix index 67fd403..c9d8d8c 100644 --- a/nixos/modules/vpn.nix +++ b/nixos/modules/vpn.nix @@ -9,4 +9,4 @@ networkmanager-openvpn mullvad-closest ]; -} \ No newline at end of file +} diff --git a/nixos/modules/work.nix b/nixos/modules/work.nix index a3bc54f..f735f56 100644 --- a/nixos/modules/work.nix +++ b/nixos/modules/work.nix @@ -7,4 +7,4 @@ gnumake cmake ]; -} \ No newline at end of file +} diff --git a/nixos/packages.nix b/nixos/packages.nix index b1b23b2..ae5599d 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -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 - ]; -} \ No newline at end of file + 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 + ]; +} diff --git a/nixos/services.nix b/nixos/services.nix index 973c435..2db948b 100644 --- a/nixos/services.nix +++ b/nixos/services.nix @@ -13,17 +13,17 @@ # 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 services.libinput.enable = true; # Enable security-related service for realtime audio tasks security.rtkit.enable = true; - + # Enable to update some devices' firmware services.fwupd.enable = true; @@ -40,4 +40,4 @@ services.printing.enable = true; services.printing.browsed.enable = false; hardware.bluetooth.enable = true; -} \ No newline at end of file +} diff --git a/nixos/users.nix b/nixos/users.nix index 654d9ce..7142b56 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -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 @@ -71,4 +76,4 @@ setSocketVariable = true; }; }; -} \ No newline at end of file +}