diff --git a/home/common/automount.nix b/home/common/automount.nix index f872fd0..81fc5df 100644 --- a/home/common/automount.nix +++ b/home/common/automount.nix @@ -1,5 +1,3 @@ -{ ... }: - -{ +{...}: { services.udiskie.enable = true; } diff --git a/home/common/core.nix b/home/common/core.nix index b2bf392..fcc26c5 100644 --- a/home/common/core.nix +++ b/home/common/core.nix @@ -1,6 +1,4 @@ -{ inputs, ... }: - -{ +{inputs, ...}: { home.username = "nezia"; home.homeDirectory = "/home/nezia"; programs.home-manager.enable = true; diff --git a/home/common/mime.nix b/home/common/mime.nix index 01563b5..29af8f3 100644 --- a/home/common/mime.nix +++ b/home/common/mime.nix @@ -1,16 +1,15 @@ -{ ... }: -{ +{...}: { xdg.mimeApps = { enable = true; defaultApplications = { - "default-web-browser" = [ "firefox.desktop" ]; - "text/html" = [ "firefox.desktop" ]; - "x-scheme-handler/http" = [ "firefox.desktop" ]; - "x-scheme-handler/https" = [ "firefox.desktop" ]; - "x-scheme-handler/about" = [ "firefox.desktop" ]; - "x-scheme-handler/unknown" = [ "firefox.desktop" ]; - "application/pdf" = [ "org.gnome.Evince.desktop" ]; - "audio/wav" = [ "rhythmbox" ]; + "default-web-browser" = ["firefox.desktop"]; + "text/html" = ["firefox.desktop"]; + "x-scheme-handler/http" = ["firefox.desktop"]; + "x-scheme-handler/https" = ["firefox.desktop"]; + "x-scheme-handler/about" = ["firefox.desktop"]; + "x-scheme-handler/unknown" = ["firefox.desktop"]; + "application/pdf" = ["org.gnome.Evince.desktop"]; + "audio/wav" = ["rhythmbox"]; }; }; } diff --git a/home/common/programs/git.nix b/home/common/programs/git.nix index 02676a0..31cb7ec 100644 --- a/home/common/programs/git.nix +++ b/home/common/programs/git.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { programs.git = { enable = true; userName = "Anthony Rodriguez"; diff --git a/home/common/programs/gnupg.nix b/home/common/programs/gnupg.nix index 5b3df83..3ada3ee 100644 --- a/home/common/programs/gnupg.nix +++ b/home/common/programs/gnupg.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { programs.gpg = { enable = true; publicKeys = [ diff --git a/home/common/programs/miscellaneous.nix b/home/common/programs/miscellaneous.nix index dc8a01b..b03a845 100644 --- a/home/common/programs/miscellaneous.nix +++ b/home/common/programs/miscellaneous.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { programs.fzf.enable = true; programs.fastfetch.enable = true; home.packages = with pkgs; [ diff --git a/home/common/programs/tmux.nix b/home/common/programs/tmux.nix index b141ff6..404e3e1 100644 --- a/home/common/programs/tmux.nix +++ b/home/common/programs/tmux.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { programs.tmux = { enable = true; prefix = "C-space"; diff --git a/home/common/shell/direnv.nix b/home/common/shell/direnv.nix index f620b3c..dd5b52f 100644 --- a/home/common/shell/direnv.nix +++ b/home/common/shell/direnv.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { programs = { direnv = { enable = true; diff --git a/home/common/shell/fish.nix b/home/common/shell/fish.nix index 4375390..b0e8514 100644 --- a/home/common/shell/fish.nix +++ b/home/common/shell/fish.nix @@ -1,14 +1,11 @@ -{ pkgs, ... }: - -let +{pkgs, ...}: let catppuccin-fish = pkgs.fetchFromGitHub { owner = "catppuccin"; repo = "fish"; rev = "a3b9eb5eaf2171ba1359fe98f20d226c016568cf"; hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng="; }; -in -{ +in { programs.fish = { enable = true; interactiveShellInit = '' diff --git a/home/common/shell/starship.nix b/home/common/shell/starship.nix index da47f59..ba5adfc 100644 --- a/home/common/shell/starship.nix +++ b/home/common/shell/starship.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { programs.starship = { enable = true; enableTransience = true; diff --git a/home/common/shell/zellij.nix b/home/common/shell/zellij.nix index a837f72..0cee4c9 100644 --- a/home/common/shell/zellij.nix +++ b/home/common/shell/zellij.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { programs.zellij = { enable = true; settings = { diff --git a/home/common/shell/zoxide.nix b/home/common/shell/zoxide.nix index 20db39b..9f66920 100644 --- a/home/common/shell/zoxide.nix +++ b/home/common/shell/zoxide.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { programs.zoxide = { enable = true; enableBashIntegration = false; diff --git a/home/desktop/gaming/default.nix b/home/desktop/gaming/default.nix index 4d27f15..90b0f18 100644 --- a/home/desktop/gaming/default.nix +++ b/home/desktop/gaming/default.nix @@ -1,7 +1,4 @@ -{ pkgs, ... }: - -{ - +{pkgs, ...}: { home.packages = with pkgs; [ protonup-qt bottles diff --git a/hosts/common/sops.nix b/hosts/common/sops.nix index c895dbd..13a487c 100644 --- a/hosts/common/sops.nix +++ b/hosts/common/sops.nix @@ -1,10 +1,12 @@ -{ hostname, username, ... }: - { + hostname, + username, + ... +}: { sops.defaultSopsFile = ../../secrets/secrets.yaml; sops.defaultSopsFormat = "yaml"; sops.age.keyFile = "/home/${username}/.config/sops/age/keys.txt"; - sops.secrets."syncthing/${hostname}/key" = { }; - sops.secrets."syncthing/${hostname}/cert" = { }; + sops.secrets."syncthing/${hostname}/key" = {}; + sops.secrets."syncthing/${hostname}/cert" = {}; } diff --git a/hosts/common/syncthing/default.nix b/hosts/common/syncthing/default.nix index 0556e94..18753f1 100644 --- a/hosts/common/syncthing/default.nix +++ b/hosts/common/syncthing/default.nix @@ -3,14 +3,11 @@ username, hostname, ... -}: - -let +}: let homeDir = "/home/${username}"; devices = import ./devices.nix; - otherDevices = builtins.removeAttrs devices [ hostname ]; -in -{ + otherDevices = builtins.removeAttrs devices [hostname]; +in { services = { syncthing = { enable = true; diff --git a/hosts/common/syncthing/devices.nix b/hosts/common/syncthing/devices.nix index 310dc69..87a0950 100644 --- a/hosts/common/syncthing/devices.nix +++ b/hosts/common/syncthing/devices.nix @@ -1,4 +1,4 @@ -# TODO: add to sops directly instead of relying on another nix file +# TODO: add to sops directly instead of relying on another nix file { "vamos" = { id = "UO6JWVU-MTLZGVQ-Z3QAFYH-6PW2QR6-SBOVM6P-S6JXR2S-A7VYAU2-RLRXEQY"; diff --git a/hosts/common/system/boot.nix b/hosts/common/system/boot.nix index f5cbe7a..20196dc 100644 --- a/hosts/common/system/boot.nix +++ b/hosts/common/system/boot.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { boot = { loader = { timeout = 0; diff --git a/hosts/common/system/core.nix b/hosts/common/system/core.nix index b397877..afae51a 100644 --- a/hosts/common/system/core.nix +++ b/hosts/common/system/core.nix @@ -1,6 +1,4 @@ -{ hostname, ... }: - -{ +{hostname, ...}: { networking.hostName = hostname; networking.networkmanager.enable = true; diff --git a/hosts/common/system/default.nix b/hosts/common/system/default.nix index 1079104..62d1a51 100644 --- a/hosts/common/system/default.nix +++ b/hosts/common/system/default.nix @@ -1,5 +1,4 @@ _: { - imports = [ ./core.nix ./boot.nix diff --git a/hosts/common/system/locale.nix b/hosts/common/system/locale.nix index c25c500..2b98ae7 100644 --- a/hosts/common/system/locale.nix +++ b/hosts/common/system/locale.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { # Set your time zone. time.timeZone = "Europe/Paris"; @@ -18,5 +16,4 @@ LC_TELEPHONE = "fr_CH.UTF-8"; LC_TIME = "fr_CH.UTF-8"; }; - } diff --git a/hosts/common/system/misc.nix b/hosts/common/system/misc.nix index f49e53c..829ba8d 100644 --- a/hosts/common/system/misc.nix +++ b/hosts/common/system/misc.nix @@ -1,8 +1,6 @@ -{ ... }: - -{ +{...}: { # fix direnv integration with fish - environment.pathsToLink = [ "/share/fish" ]; + environment.pathsToLink = ["/share/fish"]; programs.gnupg.agent = { enable = true; diff --git a/hosts/common/system/nh.nix b/hosts/common/system/nh.nix index 160fc43..76208da 100644 --- a/hosts/common/system/nh.nix +++ b/hosts/common/system/nh.nix @@ -1,6 +1,4 @@ -{ username, ... }: - -{ +{username, ...}: { programs.nh = { enable = true; clean.enable = true; @@ -10,5 +8,4 @@ environment.sessionVariables = { FLAKE = "/home/${username}/.dotfiles"; }; - } diff --git a/hosts/common/system/packages.nix b/hosts/common/system/packages.nix index 8cd50a1..0f2eee1 100644 --- a/hosts/common/system/packages.nix +++ b/hosts/common/system/packages.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { environment.systemPackages = with pkgs; [ vim git diff --git a/hosts/common/system/printing.nix b/hosts/common/system/printing.nix index 0b3da41..f58819f 100644 --- a/hosts/common/system/printing.nix +++ b/hosts/common/system/printing.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { # setup printing service services.printing.enable = true; diff --git a/hosts/solaire/hardware-configuration.nix b/hosts/solaire/hardware-configuration.nix index c588a5c..9c2aa35 100644 --- a/hosts/solaire/hardware-configuration.nix +++ b/hosts/solaire/hardware-configuration.nix @@ -7,9 +7,7 @@ pkgs, modulesPath, ... -}: - -{ +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -22,9 +20,9 @@ "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; fileSystems."/" = { device = "/dev/disk/by-label/NIXROOT"; @@ -40,7 +38,7 @@ ]; }; - swapDevices = [ ]; + swapDevices = []; # 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/vamos/hardware-configuration.nix b/hosts/vamos/hardware-configuration.nix index ab8109a..8d08381 100644 --- a/hosts/vamos/hardware-configuration.nix +++ b/hosts/vamos/hardware-configuration.nix @@ -7,9 +7,7 @@ pkgs, modulesPath, ... -}: - -{ +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -30,7 +28,7 @@ "cryptd" ]; boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/39d0e0c6-ea32-4ee4-ac76-b28fbff687f8"; - boot.extraModulePackages = [ ]; + boot.extraModulePackages = []; fileSystems."/" = { device = "/dev/disk/by-uuid/4ef04567-9633-45b9-addc-55c3020f45b7"; @@ -46,7 +44,7 @@ ]; }; - swapDevices = [ ]; + swapDevices = []; # 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/modules/docker.nix b/modules/docker.nix index 28a22e1..8374591 100644 --- a/modules/docker.nix +++ b/modules/docker.nix @@ -3,11 +3,9 @@ lib, username, ... -}: -let +}: let cfg = config.modules.docker; -in -{ +in { options.modules.docker.enable = lib.mkEnableOption "docker module"; config = lib.mkIf cfg.enable { virtualisation.docker = { @@ -17,6 +15,6 @@ in setSocketVariable = true; }; }; - users.users.${username}.extraGroups = [ "docker" ]; + users.users.${username}.extraGroups = ["docker"]; }; } diff --git a/modules/gnome.nix b/modules/gnome.nix index 9f567e7..0548a43 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -4,12 +4,10 @@ pkgs, username, ... -}: -let +}: let cfg = config.modules.gnome; stylixEnabled = config.modules.stylix.enable or false; -in -{ +in { options = { modules.gnome = { enable = lib.mkEnableOption "Enable Gnome"; @@ -21,7 +19,7 @@ in displayManager.gdm.enable = true; desktopManager.gnome = { enable = true; - extraGSettingsOverridePackages = [ pkgs.mutter ]; + extraGSettingsOverridePackages = [pkgs.mutter]; extraGSettingsOverrides = '' [org.gnome.mutter] experimental-features=['scale-monitor-framebuffer'] @@ -30,8 +28,7 @@ in }; environment.gnome.excludePackages = ( - with pkgs; - [ + with pkgs; [ gnome-console gnome-photos gnome-tour @@ -86,7 +83,7 @@ in ]; }; "org/gnome/desktop/input-sources" = { - xkb-options = [ "compose:ralt" ]; + xkb-options = ["compose:ralt"]; }; "org/gnome/desktop/interface" = { enable-hot-corners = false; @@ -119,7 +116,6 @@ in ]; }; }; - }; home.packages = with pkgs.gnomeExtensions; [ appindicator diff --git a/modules/nvidia.nix b/modules/nvidia.nix index 80a09a6..69120bb 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -1,23 +1,24 @@ -{ config, lib, ... }: -let - cfg = config.modules.nvidia; -in { + config, + lib, + ... +}: let + cfg = config.modules.nvidia; +in { options = { modules.nvidia = { enable = lib.mkEnableOption "Enable the Nvidia module"; }; }; config = lib.mkIf cfg.enable { - services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { - # Modesetting is required. modesetting.enable = true; # Nvidia power management. Experimental, and can cause sleep/suspend to fail. # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead # of just the bare essentials. powerManagement.enable = false; @@ -27,9 +28,9 @@ in # Use the NVidia open source kernel module (not to be confused with the # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus # Only available from driver 515.43.04+ # Currently alpha-quality/buggy, so false is currently the recommended setting. open = false; diff --git a/modules/pipewire.nix b/modules/pipewire.nix index a9117e6..62a3da1 100644 --- a/modules/pipewire.nix +++ b/modules/pipewire.nix @@ -1,9 +1,10 @@ -{ config, lib, ... }: - -let - cfg = config.modules.pipewire; -in { + config, + lib, + ... +}: let + cfg = config.modules.pipewire; +in { options.modules.pipewire.enable = lib.mkEnableOption "pipewire module"; options.modules.pipewire.latencyFix.enable = lib.mkEnableOption "enable latency fixes"; config = lib.mkIf cfg.enable { @@ -22,10 +23,9 @@ in services.pipewire.extraConfig.pipewire."92-low-latency" = lib.mkIf cfg.latencyFix.enable { "context.properties" = { "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ 48000 ]; + "default.clock.allowed-rates" = [48000]; "default.clock.quantum" = 2048; "default.clock.min-quantum" = 1024; - }; }; }; diff --git a/modules/stylix.nix b/modules/stylix.nix index 769bc45..c8ca771 100644 --- a/modules/stylix.nix +++ b/modules/stylix.nix @@ -3,11 +3,9 @@ lib, pkgs, ... -}: -let +}: let cfg = config.modules.stylix; -in -{ +in { options = { modules.stylix = { enable = lib.mkEnableOption "Enable the stylix module"; @@ -33,7 +31,7 @@ in name = "Noto Sans"; }; monospace = lib.mkDefault { - package = pkgs.nerdfonts.override { fonts = [ "IntelOneMono" ]; }; + package = pkgs.nerdfonts.override {fonts = ["IntelOneMono"];}; name = "IntoneMono Nerd Font"; }; emoji = { diff --git a/modules/wezterm.nix b/modules/wezterm.nix index aff019d..a98d82e 100644 --- a/modules/wezterm.nix +++ b/modules/wezterm.nix @@ -4,11 +4,9 @@ inputs, username, ... -}: -let +}: let cfg = config.modules.wezterm; -in -{ +in { options = { modules.wezterm = { enable = lib.mkEnableOption "enable wezterm";