From 813cc599f07603b33e8c19b16abd9ba8404aa669 Mon Sep 17 00:00:00 2001 From: Veneficium <85629831+veneficium42@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:34:21 +0200 Subject: [PATCH] chore: reformat using nixd and nixfmt-rfc-style --- flake.nix | 36 ++++++++----- homeManagerModules/cliPrograms/bun.nix | 3 +- homeManagerModules/cliPrograms/fastfetch.nix | 3 +- homeManagerModules/cliPrograms/git.nix | 3 +- homeManagerModules/cliPrograms/hyfetch.nix | 3 +- homeManagerModules/cliPrograms/pass.nix | 8 ++- .../desktopPrograms/amberol.nix | 3 +- .../desktopPrograms/essentials/firefox.nix | 3 +- .../desktopPrograms/vesktop.nix | 3 +- .../desktopPrograms/vscodium.nix | 52 +++++++++++-------- homeManagerModules/starship.nix | 3 +- homeManagerModules/zsh.nix | 3 +- hosts/main-homelab/configuration.nix | 21 ++++---- hosts/main-homelab/hardware-configuration.nix | 46 ++++++++++------ hosts/main-laptop/configuration.nix | 29 +++++++---- hosts/main-laptop/hardware-configuration.nix | 41 ++++++++------- hosts/main-laptop/home.nix | 7 +-- nixosModules/default.nix | 48 ++++++++--------- nixosModules/drivers/gpu/amd.nix | 3 +- nixosModules/drivers/gpu/disableNvidia.nix | 12 ++++- nixosModules/drivers/gpu/nvidia.nix | 3 +- nixosModules/drivers/ipod.nix | 12 +++-- nixosModules/drivers/samsung-printer.nix | 8 ++- nixosModules/locale.nix | 3 +- nixosModules/programs/docker.nix | 7 ++- nixosModules/programs/gnupg.nix | 3 +- nixosModules/programs/powertop.nix | 3 +- nixosModules/programs/tailscale.nix | 7 ++- nixosModules/services/fstrim.nix | 7 ++- nixosModules/services/gnome.nix | 19 ++++++- nixosModules/services/openssh.nix | 4 +- nixosModules/services/pam.nix | 3 +- nixosModules/services/pipewire.nix | 3 +- nixosModules/services/printing.nix | 3 +- nixosModules/services/switcheroo.nix | 3 +- nixosModules/services/tlp.nix | 7 ++- nixosModules/users/fedfer.nix | 13 ++++- nixosModules/users/veneficium.nix | 8 ++- 38 files changed, 280 insertions(+), 166 deletions(-) diff --git a/flake.nix b/flake.nix index 8533000..c9abc88 100644 --- a/flake.nix +++ b/flake.nix @@ -10,21 +10,31 @@ nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; }; - outputs = inputs@{ self, nixpkgs, home-manager, ... }: + outputs = + inputs@{ + self, + nixpkgs, + home-manager, + ... + }: let - pkgs = system: import nixpkgs { - inherit system; - overlays = [ - inputs.nix-vscode-extensions.overlays.default - ]; - config = { allowUnfree = true; }; - }; + pkgs = + system: + import nixpkgs { + inherit system; + overlays = [ inputs.nix-vscode-extensions.overlays.default ]; + config = { + allowUnfree = true; + }; + }; in { nixosConfigurations = { fedfer-main-laptop-nixos = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - specialArgs = { pkgs = (pkgs system); }; + specialArgs = { + pkgs = (pkgs system); + }; modules = [ ./hosts/main-laptop/configuration.nix home-manager.nixosModules.home-manager @@ -39,10 +49,10 @@ veneficium-main-homelab-nixos = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - specialArgs = { pkgs = (pkgs system); }; - modules = [ - ./hosts/main-homelab/configuration.nix - ]; + specialArgs = { + pkgs = (pkgs system); + }; + modules = [ ./hosts/main-homelab/configuration.nix ]; }; }; }; diff --git a/homeManagerModules/cliPrograms/bun.nix b/homeManagerModules/cliPrograms/bun.nix index 05cab2e..42fde89 100644 --- a/homeManagerModules/cliPrograms/bun.nix +++ b/homeManagerModules/cliPrograms/bun.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ programs.bun = { enable = true; enableGitIntegration = true; diff --git a/homeManagerModules/cliPrograms/fastfetch.nix b/homeManagerModules/cliPrograms/fastfetch.nix index ffe3d2b..89376d5 100644 --- a/homeManagerModules/cliPrograms/fastfetch.nix +++ b/homeManagerModules/cliPrograms/fastfetch.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ programs.fastfetch = { enable = true; #todo add fastfetch config diff --git a/homeManagerModules/cliPrograms/git.nix b/homeManagerModules/cliPrograms/git.nix index 68ccf39..7473852 100644 --- a/homeManagerModules/cliPrograms/git.nix +++ b/homeManagerModules/cliPrograms/git.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ programs.git = { enable = true; userEmail = "85629831+veneficium42@users.noreply.github.com"; diff --git a/homeManagerModules/cliPrograms/hyfetch.nix b/homeManagerModules/cliPrograms/hyfetch.nix index f32539b..fa41050 100644 --- a/homeManagerModules/cliPrograms/hyfetch.nix +++ b/homeManagerModules/cliPrograms/hyfetch.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ imports = [ ./fastfetch.nix ]; programs.hyfetch = { enable = true; diff --git a/homeManagerModules/cliPrograms/pass.nix b/homeManagerModules/cliPrograms/pass.nix index 38b1d27..545e2de 100644 --- a/homeManagerModules/cliPrograms/pass.nix +++ b/homeManagerModules/cliPrograms/pass.nix @@ -1,6 +1,10 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ programs.password-store = { enable = true; - package = pkgs.pass-wayland.withExtensions (exts: [ exts.pass-checkup exts.pass-audit ]); + package = pkgs.pass-wayland.withExtensions (exts: [ + exts.pass-checkup + exts.pass-audit + ]); }; } diff --git a/homeManagerModules/desktopPrograms/amberol.nix b/homeManagerModules/desktopPrograms/amberol.nix index 8123ef0..afc32d6 100644 --- a/homeManagerModules/desktopPrograms/amberol.nix +++ b/homeManagerModules/desktopPrograms/amberol.nix @@ -1,3 +1,4 @@ -{ ... }: { +{ ... }: +{ services.amberol.enable = true; } diff --git a/homeManagerModules/desktopPrograms/essentials/firefox.nix b/homeManagerModules/desktopPrograms/essentials/firefox.nix index 5522f88..924956d 100644 --- a/homeManagerModules/desktopPrograms/essentials/firefox.nix +++ b/homeManagerModules/desktopPrograms/essentials/firefox.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ #todo config programs.firefox = { enable = true; diff --git a/homeManagerModules/desktopPrograms/vesktop.nix b/homeManagerModules/desktopPrograms/vesktop.nix index f3dec30..9eae666 100644 --- a/homeManagerModules/desktopPrograms/vesktop.nix +++ b/homeManagerModules/desktopPrograms/vesktop.nix @@ -1,3 +1,4 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ home.packages = [ pkgs.vesktop ]; } diff --git a/homeManagerModules/desktopPrograms/vscodium.nix b/homeManagerModules/desktopPrograms/vscodium.nix index 16dd5e2..a862124 100644 --- a/homeManagerModules/desktopPrograms/vscodium.nix +++ b/homeManagerModules/desktopPrograms/vscodium.nix @@ -1,8 +1,10 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ #The VSCoderrrrrrrr #codepilled nixmaxxer #god I love tumblr #tumblrpilled mememaxxer + programs.vscode = { enable = true; package = pkgs.vscodium; @@ -10,29 +12,40 @@ enableExtensionUpdateCheck = false; mutableExtensionsDir = false; - extensions = with pkgs.vscode-extensions; [ - ms-vscode.cpptools - ms-vscode.live-server - mhutchie.git-graph - pkief.material-icon-theme - pkief.material-product-icons - oderwat.indent-rainbow - bierner.markdown-emoji - bierner.emojisense - jnoortheen.nix-ide - rust-lang.rust-analyzer - biomejs.biome - ] ++ (with pkgs.open-vsx; [ - jeanp413.open-remote-ssh - antfu.unocss - ]); + extensions = + with pkgs.vscode-extensions; + [ + ms-vscode.cpptools + ms-vscode.live-server + mhutchie.git-graph + pkief.material-icon-theme + pkief.material-product-icons + oderwat.indent-rainbow + bierner.markdown-emoji + bierner.emojisense + jnoortheen.nix-ide + rust-lang.rust-analyzer + biomejs.biome + ] + ++ (with pkgs.open-vsx; [ + jeanp413.open-remote-ssh + antfu.unocss + ]); userSettings = { "workbench.iconTheme" = "material-icon-theme"; "workbench.productIconTheme" = "material-product-icons"; + + "terminal.integrated.fontFamily" = "FiraCode Nerd Font"; + "terminal.integrated.fontSize" = 14; + "terminal.integrated.fontWeight" = 500; + "editor.fontFamily" = "FiraCode Nerd Font Mono"; + "editor.fontLigatures" = true; + "editor.formatOnSave" = true; "workbench.sideBar.location" = "right"; "workbench.startupEditor" = "welcomePageInEmptyWorkbench"; + "nix.enableLanguageServer" = true; "nix.serverPath" = "nixd"; "nix.serverSettings" = { @@ -44,11 +57,6 @@ }; "C_Cpp.clang_format_fallbackStyle" = "LLVM"; - "editor.fontFamily" = "FiraCode Nerd Font Mono"; - "editor.fontLigatures" = true; - "terminal.integrated.fontFamily" = "FiraCode Nerd Font"; - "terminal.integrated.fontSize" = 14; - "terminal.integrated.fontWeight" = 500; }; }; } diff --git a/homeManagerModules/starship.nix b/homeManagerModules/starship.nix index a9e085a..cad8372 100644 --- a/homeManagerModules/starship.nix +++ b/homeManagerModules/starship.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ programs.starship = { enable = true; enableZshIntegration = true; diff --git a/homeManagerModules/zsh.nix b/homeManagerModules/zsh.nix index b861566..9bb46df 100644 --- a/homeManagerModules/zsh.nix +++ b/homeManagerModules/zsh.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ #todo config programs.zsh = { enable = true; diff --git a/hosts/main-homelab/configuration.nix b/hosts/main-homelab/configuration.nix index 8249ce3..8f95638 100644 --- a/hosts/main-homelab/configuration.nix +++ b/hosts/main-homelab/configuration.nix @@ -1,11 +1,11 @@ -{ pkgs, lib, ... }: { +{ pkgs, lib, ... }: +{ - imports = - [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ../../nixosModules/default.nix - ]; + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ../../nixosModules/default.nix + ]; settings = { users.veneficium.enable = lib.mkForce true; @@ -49,9 +49,12 @@ nixpkgs.config.allowUnfree = true; #enable flakes - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; #DO NOT CHANGE THIS! IMPORTANT! DO NOT CHANGE THIS! - system.stateVersion = "24.05"; #DO NOT CHANGE THIS! + system.stateVersion = "24.05"; # DO NOT CHANGE THIS! } diff --git a/hosts/main-homelab/hardware-configuration.nix b/hosts/main-homelab/hardware-configuration.nix index 7126628..1d094c1 100644 --- a/hosts/main-homelab/hardware-configuration.nix +++ b/hosts/main-homelab/hardware-configuration.nix @@ -1,31 +1,43 @@ # 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 + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "vmd" + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/58d4396b-d87c-419b-ac35-c4d282ef05b1"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/58d4396b-d87c-419b-ac35-c4d282ef05b1"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/F5D9-1046"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/F5D9-1046"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; swapDevices = [ ]; diff --git a/hosts/main-laptop/configuration.nix b/hosts/main-laptop/configuration.nix index bba53ad..e18384e 100644 --- a/hosts/main-laptop/configuration.nix +++ b/hosts/main-laptop/configuration.nix @@ -1,9 +1,17 @@ -{ lib, pkgs, ... }: { - imports = - [ - ./hardware-configuration.nix - ../../nixosModules/default.nix - ]; +{ lib, pkgs, ... }: +{ + imports = [ + ./hardware-configuration.nix + ../../nixosModules/default.nix + ]; + + virtualisation.libvirtd.enable = true; + programs.virt-manager.enable = true; + #required by virt-manager + programs.dconf.enable = true; + + virtualisation.virtualbox.host.enable = true; + users.extraGroups.vboxusers.members = [ "fedfer" ]; settings = { users.fedfer.enable = lib.mkForce true; @@ -59,7 +67,7 @@ }; #remove various bloat - services.xserver.excludePackages = with pkgs; [ xterm ]; + services.xserver.excludePackages = with pkgs; [ xterm ]; hardware = { bluetooth = { @@ -85,8 +93,11 @@ ]; #enable flakes - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; - system.stateVersion = "23.11"; #DO NOT CHANGE THIS! + system.stateVersion = "23.11"; # DO NOT CHANGE THIS! } diff --git a/hosts/main-laptop/hardware-configuration.nix b/hosts/main-laptop/hardware-configuration.nix index c6f7cfd..91541f5 100644 --- a/hosts/main-laptop/hardware-configuration.nix +++ b/hosts/main-laptop/hardware-configuration.nix @@ -1,33 +1,38 @@ # 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, modulesPath, ... }: +{ + config, + lib, + modulesPath, + ... +}: { - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "usbhid" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { - device = "/dev/disk/by-label/nixos"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { - device = "/dev/disk/by-label/BOOT"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-label/BOOT"; + fsType = "vfat"; + }; - swapDevices = - [{ device = "/dev/disk/by-label/swap"; }]; + swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; # 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 diff --git a/hosts/main-laptop/home.nix b/hosts/main-laptop/home.nix index 2ee8d31..f5b8f6e 100644 --- a/hosts/main-laptop/home.nix +++ b/hosts/main-laptop/home.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ imports = [ ../../homeManagerModules/zsh.nix @@ -47,6 +48,6 @@ nixpkgs.config.allowUnfree = true; - home.stateVersion = "23.11"; #DO NOT CHANGE - programs.home-manager.enable = true; #DO NOT CHANGE + home.stateVersion = "23.11"; # DO NOT CHANGE + programs.home-manager.enable = true; # DO NOT CHANGE } diff --git a/nixosModules/default.nix b/nixosModules/default.nix index 75711de..863eec3 100644 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -1,31 +1,31 @@ -{ lib, ... }: { - imports = - [ - ./locale.nix +{ lib, ... }: +{ + imports = [ + ./locale.nix - ./users/fedfer.nix - ./users/veneficium.nix + ./users/fedfer.nix + ./users/veneficium.nix - ./drivers/samsung-printer.nix - ./drivers/ipod.nix - ./drivers/gpu/amd.nix - ./drivers/gpu/nvidia.nix - ./drivers/gpu/disableNvidia.nix + ./drivers/samsung-printer.nix + ./drivers/ipod.nix + ./drivers/gpu/amd.nix + ./drivers/gpu/nvidia.nix + ./drivers/gpu/disableNvidia.nix - ./services/gnome.nix - ./services/pipewire.nix - ./services/printing.nix - ./services/fstrim.nix - ./services/tlp.nix - ./services/switcheroo.nix - ./services/pam.nix - ./services/openssh.nix + ./services/gnome.nix + ./services/pipewire.nix + ./services/printing.nix + ./services/fstrim.nix + ./services/tlp.nix + ./services/switcheroo.nix + ./services/pam.nix + ./services/openssh.nix - ./programs/docker.nix - ./programs/tailscale.nix - ./programs/powertop.nix - ./programs/gnupg.nix - ]; + ./programs/docker.nix + ./programs/tailscale.nix + ./programs/powertop.nix + ./programs/gnupg.nix + ]; settings = { users.fedfer.enable = lib.mkDefault false; diff --git a/nixosModules/drivers/gpu/amd.nix b/nixosModules/drivers/gpu/amd.nix index 5c59ca9..cc74410 100644 --- a/nixosModules/drivers/gpu/amd.nix +++ b/nixosModules/drivers/gpu/amd.nix @@ -1,4 +1,5 @@ -{ lib, config, ... }: { +{ lib, config, ... }: +{ options.settings.drivers.gpu.amd = { enable = lib.mkEnableOption "enable AMD gpu drivers"; diff --git a/nixosModules/drivers/gpu/disableNvidia.nix b/nixosModules/drivers/gpu/disableNvidia.nix index 078e11d..761909e 100644 --- a/nixosModules/drivers/gpu/disableNvidia.nix +++ b/nixosModules/drivers/gpu/disableNvidia.nix @@ -1,4 +1,5 @@ -{ lib, config, ... }: { +{ lib, config, ... }: +{ options = { settings.drivers.gpu.nvidia.forceDisable = lib.mkEnableOption "force disable all nvidia drivers"; @@ -20,6 +21,13 @@ # Remove NVIDIA VGA/3D controller devices ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1" ''; - boot.blacklistedKernelModules = [ "nouveau" "nvidia" "nvidia_uvm" "nvidiafb" "nvidia_drm" "nvidia_modeset" ]; + boot.blacklistedKernelModules = [ + "nouveau" + "nvidia" + "nvidia_uvm" + "nvidiafb" + "nvidia_drm" + "nvidia_modeset" + ]; }; } diff --git a/nixosModules/drivers/gpu/nvidia.nix b/nixosModules/drivers/gpu/nvidia.nix index bd70256..7ab98c7 100644 --- a/nixosModules/drivers/gpu/nvidia.nix +++ b/nixosModules/drivers/gpu/nvidia.nix @@ -1,4 +1,5 @@ -{ lib, config, ... }: { +{ lib, config, ... }: +{ options.settings.drivers.gpu.nvidia = { enable = lib.mkEnableOption "Enable Nvidia proprietary drivers"; diff --git a/nixosModules/drivers/ipod.nix b/nixosModules/drivers/ipod.nix index b927fbf..1a8995c 100644 --- a/nixosModules/drivers/ipod.nix +++ b/nixosModules/drivers/ipod.nix @@ -1,4 +1,10 @@ -{ lib, config, pkgs, ... }: { +{ + lib, + config, + pkgs, + ... +}: +{ options.settings.drivers.ipod = { enable = lib.mkEnableOption "Enable necessary software for ipod communication"; @@ -7,9 +13,7 @@ config = lib.mkIf config.settings.drivers.ipod.enable { services.usbmuxd.enable = true; - environment.systemPackages = with pkgs; [ - libimobiledevice - ]; + environment.systemPackages = with pkgs; [ libimobiledevice ]; }; } diff --git a/nixosModules/drivers/samsung-printer.nix b/nixosModules/drivers/samsung-printer.nix index b7e1b77..b473887 100644 --- a/nixosModules/drivers/samsung-printer.nix +++ b/nixosModules/drivers/samsung-printer.nix @@ -1,4 +1,10 @@ -{ lib, config, pkgs, ... }: { +{ + lib, + config, + pkgs, + ... +}: +{ #use driver compatible with samsung M2020 printer options.settings.drivers.printer = { M2020.enable = lib.mkEnableOption "use the appropriate driver for the samsung M2020 printer"; diff --git a/nixosModules/locale.nix b/nixosModules/locale.nix index 209e6dc..e257311 100644 --- a/nixosModules/locale.nix +++ b/nixosModules/locale.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ time.timeZone = "Europe/Rome"; diff --git a/nixosModules/programs/docker.nix b/nixosModules/programs/docker.nix index e941b21..1482838 100644 --- a/nixosModules/programs/docker.nix +++ b/nixosModules/programs/docker.nix @@ -1,9 +1,8 @@ -{ lib, config, ... }: { +{ lib, config, ... }: +{ options.settings.programs.docker = { enable = lib.mkEnableOption "enables docker"; }; - config = lib.mkIf config.settings.programs.docker.enable { - virtualisation.docker.enable = true; - }; + config = lib.mkIf config.settings.programs.docker.enable { virtualisation.docker.enable = true; }; } diff --git a/nixosModules/programs/gnupg.nix b/nixosModules/programs/gnupg.nix index ca25e33..f4928a5 100644 --- a/nixosModules/programs/gnupg.nix +++ b/nixosModules/programs/gnupg.nix @@ -1,4 +1,5 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.programs.gnupg = { enable = lib.mkEnableOption "enable gnuPG"; ssh = lib.mkEnableOption "enable gnuPG ssh integration"; diff --git a/nixosModules/programs/powertop.nix b/nixosModules/programs/powertop.nix index 1de1e87..a651ddd 100644 --- a/nixosModules/programs/powertop.nix +++ b/nixosModules/programs/powertop.nix @@ -1,4 +1,5 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.programs.powertop = { enable = lib.mkEnableOption "enables powertop"; }; diff --git a/nixosModules/programs/tailscale.nix b/nixosModules/programs/tailscale.nix index 6eff0ba..8d4c55f 100644 --- a/nixosModules/programs/tailscale.nix +++ b/nixosModules/programs/tailscale.nix @@ -1,9 +1,8 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.programs.tailscale = { enable = lib.mkEnableOption "enable tailscale"; }; - config = lib.mkIf config.settings.programs.tailscale.enable { - services.tailscale.enable = true; - }; + config = lib.mkIf config.settings.programs.tailscale.enable { services.tailscale.enable = true; }; } diff --git a/nixosModules/services/fstrim.nix b/nixosModules/services/fstrim.nix index b3d018c..9ca073e 100644 --- a/nixosModules/services/fstrim.nix +++ b/nixosModules/services/fstrim.nix @@ -1,9 +1,8 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.services.fstrim = { enable = lib.mkEnableOption "enables fstrim"; }; - config = lib.mkIf config.settings.services.fstrim.enable { - services.fstrim.enable = true; - }; + config = lib.mkIf config.settings.services.fstrim.enable { services.fstrim.enable = true; }; } diff --git a/nixosModules/services/gnome.nix b/nixosModules/services/gnome.nix index 0cb1358..1755eb4 100644 --- a/nixosModules/services/gnome.nix +++ b/nixosModules/services/gnome.nix @@ -1,4 +1,10 @@ -{ config, lib, pkgs, ... }: { +{ + config, + lib, + pkgs, + ... +}: +{ options.settings.gnome = { enable = lib.mkEnableOption "enable gnome de"; }; @@ -21,6 +27,15 @@ hardware.pulseaudio.enable = false; # remove various bloat - environment.gnome.excludePackages = with pkgs; [ gnome-contacts gnome-maps gnome-music gnome-weather gnome-tour epiphany totem yelp ]; + environment.gnome.excludePackages = with pkgs; [ + gnome-contacts + gnome-maps + gnome-music + gnome-weather + gnome-tour + epiphany + totem + yelp + ]; }; } diff --git a/nixosModules/services/openssh.nix b/nixosModules/services/openssh.nix index 3de15b8..44889c5 100644 --- a/nixosModules/services/openssh.nix +++ b/nixosModules/services/openssh.nix @@ -1,10 +1,10 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.services.openssh = { enable = lib.mkEnableOption "enable openSSH"; usePAM = lib.mkEnableOption "use PAM for ssh authentication"; }; - #further move these options into settings config = lib.mkIf config.settings.services.openssh.enable { services.openssh = { diff --git a/nixosModules/services/pam.nix b/nixosModules/services/pam.nix index 90165b2..f38d370 100644 --- a/nixosModules/services/pam.nix +++ b/nixosModules/services/pam.nix @@ -1,4 +1,5 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.services.pam = { enable = lib.mkEnableOption "enables PAM"; sshd = { diff --git a/nixosModules/services/pipewire.nix b/nixosModules/services/pipewire.nix index d850aed..d3d8f03 100644 --- a/nixosModules/services/pipewire.nix +++ b/nixosModules/services/pipewire.nix @@ -1,4 +1,5 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.services.audio = { enable = lib.mkEnableOption "enable sound through pipewire and its compat layers"; }; diff --git a/nixosModules/services/printing.nix b/nixosModules/services/printing.nix index 100983a..d91d21b 100644 --- a/nixosModules/services/printing.nix +++ b/nixosModules/services/printing.nix @@ -1,4 +1,5 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.services.printing = { enable = lib.mkEnableOption "enable printing"; }; diff --git a/nixosModules/services/switcheroo.nix b/nixosModules/services/switcheroo.nix index ccd1884..5f5a49e 100644 --- a/nixosModules/services/switcheroo.nix +++ b/nixosModules/services/switcheroo.nix @@ -1,4 +1,5 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.services.switcheroo = { enable = lib.mkEnableOption "enable switcheroo-control for nvidia optimus management"; }; diff --git a/nixosModules/services/tlp.nix b/nixosModules/services/tlp.nix index c0c7ad3..1a4a79d 100644 --- a/nixosModules/services/tlp.nix +++ b/nixosModules/services/tlp.nix @@ -1,9 +1,8 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.services.tlp = { enable = lib.mkEnableOption "enables tlp for power management"; }; - config = lib.mkIf config.settings.services.tlp.enable { - services.tlp.enable = true; - }; + config = lib.mkIf config.settings.services.tlp.enable { services.tlp.enable = true; }; } diff --git a/nixosModules/users/fedfer.nix b/nixosModules/users/fedfer.nix index 1665fd9..19e91e0 100644 --- a/nixosModules/users/fedfer.nix +++ b/nixosModules/users/fedfer.nix @@ -1,5 +1,11 @@ #need to move stuff to home-manager -{ pkgs, config, lib, ... }: { +{ + pkgs, + config, + lib, + ... +}: +{ options.settings.users.fedfer = { enable = lib.mkEnableOption "enables user FedFer"; }; @@ -8,7 +14,10 @@ users.users.fedfer = { isNormalUser = true; description = "FedFer"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ + "networkmanager" + "wheel" + ]; shell = pkgs.zsh; }; }; diff --git a/nixosModules/users/veneficium.nix b/nixosModules/users/veneficium.nix index 70bce60..4a0443a 100644 --- a/nixosModules/users/veneficium.nix +++ b/nixosModules/users/veneficium.nix @@ -1,4 +1,5 @@ -{ config, lib, ... }: { +{ config, lib, ... }: +{ options.settings.users.veneficium = { enable = lib.mkEnableOption "enables user Veneficium"; }; @@ -7,7 +8,10 @@ users.users.veneficium = { isNormalUser = true; description = "Veneficium"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ + "networkmanager" + "wheel" + ]; }; }; }