From a4c34f9857230f0627c3587b7bd84b4c9267100c Mon Sep 17 00:00:00 2001 From: Roman Lubij Date: Mon, 23 Mar 2026 21:24:20 +0100 Subject: [PATCH] Reformat with alejandra --- common/default.nix | 13 +-- common/flakes/czkawka-master/flake.nix | 110 +++++++++++----------- common/flakes/fet/flake.nix | 17 ++-- common/hardware-configuration.nix | 3 +- common/modules/attic.nix | 3 +- common/modules/default.nix | 3 +- common/modules/flatpak.nix | 3 +- common/modules/gnome.nix | 3 +- common/modules/home/dconf/apps.nix | 7 +- common/modules/home/dconf/default.nix | 3 +- common/modules/home/dconf/extensions.nix | 5 +- common/modules/home/dconf/gnome.nix | 19 ++-- common/modules/home/default.nix | 3 +- common/modules/home/desktop-files.nix | 3 +- common/modules/home/starship.nix | 3 +- common/modules/home/zsh.nix | 3 +- common/modules/packages.nix | 16 ++-- common/modules/programs.nix | 5 +- common/modules/services.nix | 3 +- desktop/default.nix | 3 +- desktop/hardware-configuration.nix | 9 +- desktop/modules/default.nix | 3 +- desktop/modules/flatpak.nix | 3 +- desktop/modules/gdm-monitors.nix | 6 +- desktop/modules/gnome.nix | 3 +- desktop/modules/home/dconf/apps.nix | 5 +- desktop/modules/home/dconf/default.nix | 3 +- desktop/modules/home/dconf/extensions.nix | 5 +- desktop/modules/home/dconf/gnome.nix | 3 +- desktop/modules/home/default.nix | 3 +- desktop/modules/packages.nix | 3 +- desktop/modules/programs.nix | 3 +- desktop/modules/services.nix | 3 +- desktop/modules/vm.nix | 3 +- flake.nix | 107 ++++++++++----------- laptop/default.nix | 3 +- laptop/hardware-configuration.nix | 9 +- laptop/modules/default.nix | 3 +- laptop/modules/flatpak.nix | 3 +- laptop/modules/gnome.nix | 3 +- laptop/modules/home/dconf/apps.nix | 3 +- laptop/modules/home/dconf/default.nix | 3 +- laptop/modules/home/dconf/extensions.nix | 5 +- laptop/modules/home/dconf/gnome.nix | 3 +- laptop/modules/home/default.nix | 3 +- laptop/modules/packages.nix | 3 +- laptop/modules/programs.nix | 3 +- laptop/modules/services.nix | 5 +- 48 files changed, 193 insertions(+), 246 deletions(-) diff --git a/common/default.nix b/common/default.nix index 39db55e..95eea01 100644 --- a/common/default.nix +++ b/common/default.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { imports = [ ./modules ./hardware-configuration.nix @@ -123,16 +122,18 @@ pkgs.libheif.out ]; - pathsToLink = [ "share/thumbnailers" ]; + pathsToLink = ["share/thumbnailers"]; }; hardware = { bluetooth = { enable = true; package = pkgs.bluez.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ - "--enable-sixaxis" - ]; + configureFlags = + old.configureFlags + ++ [ + "--enable-sixaxis" + ]; }); powerOnBoot = true; diff --git a/common/flakes/czkawka-master/flake.nix b/common/flakes/czkawka-master/flake.nix index 15ed8aa..a15144a 100644 --- a/common/flakes/czkawka-master/flake.nix +++ b/common/flakes/czkawka-master/flake.nix @@ -14,72 +14,68 @@ }; }; - outputs = - { - self, - nixpkgs, - czkawka-src, - naersk, - }: - let - system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - naersk-lib = pkgs.callPackage naersk { }; + outputs = { + self, + nixpkgs, + czkawka-src, + naersk, + }: let + system = "x86_64-linux"; + pkgs = import nixpkgs {inherit system;}; + naersk-lib = pkgs.callPackage naersk {}; - nativeBuildInputs = with pkgs; [ - cargo - cmake - makeWrapper - pkg-config - rustc - ]; + nativeBuildInputs = with pkgs; [ + cargo + cmake + makeWrapper + pkg-config + rustc + ]; - runtimeLibs = with pkgs; [ - fontconfig - libglvnd - libX11 - libXcursor - libXi - libxkbcommon - libXrandr - wayland - ]; - in - { - packages.${system}.default = naersk-lib.buildPackage { - pname = "krokiet"; - version = "master"; - src = czkawka-src; + runtimeLibs = with pkgs; [ + fontconfig + libglvnd + libX11 + libXcursor + libXi + libxkbcommon + libXrandr + wayland + ]; + in { + packages.${system}.default = naersk-lib.buildPackage { + pname = "krokiet"; + version = "master"; + src = czkawka-src; - nativeBuildInputs = nativeBuildInputs; - buildInputs = runtimeLibs; + nativeBuildInputs = nativeBuildInputs; + buildInputs = runtimeLibs; - cargoBuildOptions = - x: - x - ++ [ - "-p" - "krokiet" - ]; - - buildAndCheckFeatures = [ - "winit_wayland" - "winit_x11" + cargoBuildOptions = x: + x + ++ [ + "-p" + "krokiet" ]; - RUSTFLAGS = "-C target-cpu=native"; - NIX_CFLAGS_COMPILE = "-march=native -mtune=native"; + buildAndCheckFeatures = [ + "winit_wayland" + "winit_x11" + ]; - postInstall = '' - wrapProgram $out/bin/krokiet \ - --prefix LD_LIBRARY_PATH : ${pkgs.lib.makeLibraryPath runtimeLibs} + RUSTFLAGS = "-C target-cpu=native"; + NIX_CFLAGS_COMPILE = "-march=native -mtune=native"; - install -Dm444 -t $out/share/applications data/io.github.qarmin.krokiet.desktop + postInstall = '' + wrapProgram $out/bin/krokiet \ + --prefix LD_LIBRARY_PATH : ${pkgs.lib.makeLibraryPath runtimeLibs} - install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/io.github.qarmin.krokiet.svg \ + install -Dm444 -t $out/share/applications data/io.github.qarmin.krokiet.desktop - install -Dm444 -t $out/share/metainfo data/io.github.qarmin.krokiet.metainfo.xml - ''; - }; + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/io.github.qarmin.krokiet.svg \ + + install -Dm444 -t $out/share/metainfo data/io.github.qarmin.krokiet.metainfo.xml + ''; }; + }; } diff --git a/common/flakes/fet/flake.nix b/common/flakes/fet/flake.nix index 6b334c7..e321886 100644 --- a/common/flakes/fet/flake.nix +++ b/common/flakes/fet/flake.nix @@ -6,18 +6,15 @@ flake-utils.url = "github:numtide/flake-utils"; }; - outputs = - { - self, - nixpkgs, - flake-utils, - }: + outputs = { + self, + nixpkgs, + flake-utils, + }: flake-utils.lib.eachDefaultSystem ( - system: - let + system: let pkgs = nixpkgs.legacyPackages.${system}; - in - { + in { packages.default = pkgs.stdenv.mkDerivation rec { pname = "fet"; version = "7.8.0"; diff --git a/common/hardware-configuration.nix b/common/hardware-configuration.nix index 7c315c7..677ce7e 100644 --- a/common/hardware-configuration.nix +++ b/common/hardware-configuration.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { boot = { kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest; diff --git a/common/modules/attic.nix b/common/modules/attic.nix index 0973c7d..04f34e9 100644 --- a/common/modules/attic.nix +++ b/common/modules/attic.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { nix.settings = { substituters = [ "https://attic.awroo.fun/my-config" diff --git a/common/modules/default.nix b/common/modules/default.nix index 3c4a335..beb943d 100644 --- a/common/modules/default.nix +++ b/common/modules/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./attic.nix ./flatpak.nix diff --git a/common/modules/flatpak.nix b/common/modules/flatpak.nix index dbb8aae..a0d8469 100644 --- a/common/modules/flatpak.nix +++ b/common/modules/flatpak.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { services.flatpak = { enable = true; update.auto.enable = true; diff --git a/common/modules/gnome.nix b/common/modules/gnome.nix index 9dbd4e0..240f2ad 100644 --- a/common/modules/gnome.nix +++ b/common/modules/gnome.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { environment = { gnome.excludePackages = with pkgs; [ decibels diff --git a/common/modules/home/dconf/apps.nix b/common/modules/home/dconf/apps.nix index 22339cf..9903248 100644 --- a/common/modules/home/dconf/apps.nix +++ b/common/modules/home/dconf/apps.nix @@ -1,9 +1,8 @@ -{ lib, ... }: -{ +{lib, ...}: { dconf.settings = { "org/virt-manager/virt-manager/connections" = { - autoconnect = [ "qemu:///system" ]; - uris = [ "qemu:///system" ]; + autoconnect = ["qemu:///system"]; + uris = ["qemu:///system"]; }; "org/gnome/Console" = { diff --git a/common/modules/home/dconf/default.nix b/common/modules/home/dconf/default.nix index 90dbf7b..cc37f85 100644 --- a/common/modules/home/dconf/default.nix +++ b/common/modules/home/dconf/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./apps.nix ./extensions.nix diff --git a/common/modules/home/dconf/extensions.nix b/common/modules/home/dconf/extensions.nix index 17a6d09..ad94a90 100644 --- a/common/modules/home/dconf/extensions.nix +++ b/common/modules/home/dconf/extensions.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{lib, ...}: { dconf.settings = { "org/gnome/shell/extensions/user-theme" = { name = "Flat-Remix-Darkest-fullPanel"; @@ -109,7 +108,7 @@ blur = false; brightness = 1.0; opacity = 217; - whitelist = [ "org.gnome.Console" ]; + whitelist = ["org.gnome.Console"]; }; "org/gnome/shell/extensions/blur-my-shell/coverflow-alt-tab" = { diff --git a/common/modules/home/dconf/gnome.nix b/common/modules/home/dconf/gnome.nix index 72086d4..9983fad 100644 --- a/common/modules/home/dconf/gnome.nix +++ b/common/modules/home/dconf/gnome.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{lib, ...}: { dconf.settings = { "org/gnome/desktop/interface" = { accent-color = "red"; @@ -33,13 +32,13 @@ }; "org/gnome/desktop/wm/keybindings" = { - move-to-workspace-left = [ "Left" ]; - move-to-workspace-right = [ "Right" ]; - switch-to-workspace-left = [ "Left" ]; - switch-to-workspace-right = [ "Right" ]; - switch-windows = [ "Tab" ]; - switch-windows-backward = [ "Tab" ]; - toggle-fullscreen = [ "F11" ]; + move-to-workspace-left = ["Left"]; + move-to-workspace-right = ["Right"]; + switch-to-workspace-left = ["Left"]; + switch-to-workspace-right = ["Right"]; + switch-windows = ["Tab"]; + switch-windows-backward = ["Tab"]; + toggle-fullscreen = ["F11"]; }; "org/gnome/desktop/wm/preferences" = { @@ -89,7 +88,7 @@ }; "org/gnome/desktop/app-folders" = { - folder-children = [ ]; + folder-children = []; }; "org/gnome/desktop/datetime" = { diff --git a/common/modules/home/default.nix b/common/modules/home/default.nix index 86af066..0b7fad3 100644 --- a/common/modules/home/default.nix +++ b/common/modules/home/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./dconf ./desktop-files.nix diff --git a/common/modules/home/desktop-files.nix b/common/modules/home/desktop-files.nix index d4786d7..3889cc0 100644 --- a/common/modules/home/desktop-files.nix +++ b/common/modules/home/desktop-files.nix @@ -2,8 +2,7 @@ config, pkgs, ... -}: -{ +}: { xdg.dataFile."applications/clion.desktop".text = '' [Desktop Entry] Type=Application diff --git a/common/modules/home/starship.nix b/common/modules/home/starship.nix index e82ea48..b3f68e1 100644 --- a/common/modules/home/starship.nix +++ b/common/modules/home/starship.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{lib, ...}: { programs.starship = { enable = true; settings = { diff --git a/common/modules/home/zsh.nix b/common/modules/home/zsh.nix index d16f9e0..1879870 100644 --- a/common/modules/home/zsh.nix +++ b/common/modules/home/zsh.nix @@ -1,5 +1,4 @@ -{ config, ... }: -{ +{config, ...}: { programs.zsh = { enable = true; enableCompletion = true; diff --git a/common/modules/packages.nix b/common/modules/packages.nix index f098ed2..fda5719 100644 --- a/common/modules/packages.nix +++ b/common/modules/packages.nix @@ -6,8 +6,7 @@ solaar-master, fet, ... -}: -{ +}: { nixpkgs = { config = { allowUnfree = true; @@ -153,12 +152,13 @@ vkbasalt vlc (vscode.fhsWithPackages ( - ps: with ps; [ - python3 - zlib - gcc - gnumake - ] + ps: + with ps; [ + python3 + zlib + gcc + gnumake + ] )) webp-pixbuf-loader wev diff --git a/common/modules/programs.nix b/common/modules/programs.nix index 3182ac5..360b4c2 100644 --- a/common/modules/programs.nix +++ b/common/modules/programs.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { programs = { dconf.profiles.gdm.databases = [ { @@ -79,7 +78,7 @@ nix-ld = { enable = true; - libraries = with pkgs; [ ]; + libraries = with pkgs; []; }; steam = { diff --git a/common/modules/services.nix b/common/modules/services.nix index 6c2ea85..4ff0cb0 100644 --- a/common/modules/services.nix +++ b/common/modules/services.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { services = { sshd.enable = true; displayManager.gdm.enable = true; diff --git a/desktop/default.nix b/desktop/default.nix index ad13f22..92d51dd 100644 --- a/desktop/default.nix +++ b/desktop/default.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { imports = [ ./hardware-configuration.nix ./modules diff --git a/desktop/hardware-configuration.nix b/desktop/hardware-configuration.nix index 6e417e3..01ccbe6 100644 --- a/desktop/hardware-configuration.nix +++ b/desktop/hardware-configuration.nix @@ -7,15 +7,14 @@ pkgs, modulesPath, ... -}: -{ +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { initrd = { - kernelModules = [ ]; + kernelModules = []; verbose = false; availableKernelModules = [ "nvme" @@ -36,7 +35,7 @@ pkgs.linuxKernel.packages.linux_xanmod_latest.zenpower ]; - blacklistedKernelModules = [ "k10temp" ]; + blacklistedKernelModules = ["k10temp"]; kernelParams = [ "amdgpu.seamless=1" @@ -180,7 +179,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/desktop/modules/default.nix b/desktop/modules/default.nix index ef12bda..4c010b3 100644 --- a/desktop/modules/default.nix +++ b/desktop/modules/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./flatpak.nix ./gdm-monitors.nix diff --git a/desktop/modules/flatpak.nix b/desktop/modules/flatpak.nix index bae0102..d9220f8 100644 --- a/desktop/modules/flatpak.nix +++ b/desktop/modules/flatpak.nix @@ -3,6 +3,5 @@ pkgs, lib, ... -}: -{ +}: { } diff --git a/desktop/modules/gdm-monitors.nix b/desktop/modules/gdm-monitors.nix index 3a14d4f..09fe72a 100644 --- a/desktop/modules/gdm-monitors.nix +++ b/desktop/modules/gdm-monitors.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -let +}: let gdmMonitorsXml = pkgs.writeText "gdm-monitor.xml" '' @@ -291,8 +290,7 @@ let ''; -in -{ +in { systemd.tmpfiles.rules = [ "L+ /run/gdm/.config/monitors.xml - - - - ${gdmMonitorsXml}" ]; diff --git a/desktop/modules/gnome.nix b/desktop/modules/gnome.nix index faa2563..2fcda9e 100644 --- a/desktop/modules/gnome.nix +++ b/desktop/modules/gnome.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { environment = { systemPackages = with pkgs.gnomeExtensions; [ control-monitor-brightness-and-volume-with-ddcutil diff --git a/desktop/modules/home/dconf/apps.nix b/desktop/modules/home/dconf/apps.nix index 58b55cc..f3b3c66 100644 --- a/desktop/modules/home/dconf/apps.nix +++ b/desktop/modules/home/dconf/apps.nix @@ -1,4 +1,3 @@ -{ ... }: -{ - dconf.settings = { }; +{...}: { + dconf.settings = {}; } diff --git a/desktop/modules/home/dconf/default.nix b/desktop/modules/home/dconf/default.nix index 4968ed9..5261d6c 100644 --- a/desktop/modules/home/dconf/default.nix +++ b/desktop/modules/home/dconf/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./apps.nix ./extensions.nix diff --git a/desktop/modules/home/dconf/extensions.nix b/desktop/modules/home/dconf/extensions.nix index 58b55cc..f3b3c66 100644 --- a/desktop/modules/home/dconf/extensions.nix +++ b/desktop/modules/home/dconf/extensions.nix @@ -1,4 +1,3 @@ -{ ... }: -{ - dconf.settings = { }; +{...}: { + dconf.settings = {}; } diff --git a/desktop/modules/home/dconf/gnome.nix b/desktop/modules/home/dconf/gnome.nix index 1b538c1..f8d77b2 100644 --- a/desktop/modules/home/dconf/gnome.nix +++ b/desktop/modules/home/dconf/gnome.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{lib, ...}: { dconf.settings = { "org/gnome/settings-daemon/plugins/media-keys" = { custom-keybindings = lib.mkAfter [ diff --git a/desktop/modules/home/default.nix b/desktop/modules/home/default.nix index fc53db3..96d9ea3 100644 --- a/desktop/modules/home/default.nix +++ b/desktop/modules/home/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./dconf ]; diff --git a/desktop/modules/packages.nix b/desktop/modules/packages.nix index 70b21ff..7524784 100644 --- a/desktop/modules/packages.nix +++ b/desktop/modules/packages.nix @@ -4,8 +4,7 @@ lib, czkawka-master, ... -}: -{ +}: { environment.systemPackages = with pkgs; [ amdgpu_top arch-install-scripts diff --git a/desktop/modules/programs.nix b/desktop/modules/programs.nix index d8c8fe0..632b0aa 100644 --- a/desktop/modules/programs.nix +++ b/desktop/modules/programs.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { programs = { ccache = { enable = true; diff --git a/desktop/modules/services.nix b/desktop/modules/services.nix index e50dbf0..3f74b78 100644 --- a/desktop/modules/services.nix +++ b/desktop/modules/services.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { environment.systemPackages = with pkgs; [ zram-generator ]; diff --git a/desktop/modules/vm.nix b/desktop/modules/vm.nix index d1c9e44..5e72a9a 100644 --- a/desktop/modules/vm.nix +++ b/desktop/modules/vm.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{lib, ...}: { virtualisation.vmVariant = { virtualisation = { memorySize = 8192; diff --git a/flake.nix b/flake.nix index df657bf..8480569 100644 --- a/flake.nix +++ b/flake.nix @@ -11,65 +11,62 @@ fet.url = "path:./common/flakes/fet"; }; - outputs = - { - self, - nixpkgs, - nix-flatpak, - home-manager, - ... - }@inputs: - let - specialArgs = { inherit (inputs) czkawka-master fet; }; - in - { - nixosConfigurations = { - epiquev2 = nixpkgs.lib.nixosSystem { - inherit specialArgs; - system = "x86_64-linux"; - modules = [ - ./common - ./desktop - nix-flatpak.nixosModules.nix-flatpak + outputs = { + self, + nixpkgs, + nix-flatpak, + home-manager, + ... + } @ inputs: let + specialArgs = {inherit (inputs) czkawka-master fet;}; + in { + nixosConfigurations = { + epiquev2 = nixpkgs.lib.nixosSystem { + inherit specialArgs; + system = "x86_64-linux"; + modules = [ + ./common + ./desktop + nix-flatpak.nixosModules.nix-flatpak - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.jax = { - imports = [ - ./common/modules/home - ./desktop/modules/home - ]; - }; + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.jax = { + imports = [ + ./common/modules/home + ./desktop/modules/home + ]; }; - } - ]; - }; + }; + } + ]; + }; - dalaptop = nixpkgs.lib.nixosSystem { - inherit specialArgs; - system = "x86_64-linux"; - modules = [ - ./common - ./laptop - nix-flatpak.nixosModules.nix-flatpak - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.jax = { - imports = [ - ./common/modules/home - ./laptop/modules/home - ]; - }; + dalaptop = nixpkgs.lib.nixosSystem { + inherit specialArgs; + system = "x86_64-linux"; + modules = [ + ./common + ./laptop + nix-flatpak.nixosModules.nix-flatpak + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.jax = { + imports = [ + ./common/modules/home + ./laptop/modules/home + ]; }; - } - ]; - }; + }; + } + ]; }; }; + }; } diff --git a/laptop/default.nix b/laptop/default.nix index c4306c7..a4386a1 100644 --- a/laptop/default.nix +++ b/laptop/default.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { imports = [ ./hardware-configuration.nix ./modules diff --git a/laptop/hardware-configuration.nix b/laptop/hardware-configuration.nix index 6aee3b3..2971c01 100644 --- a/laptop/hardware-configuration.nix +++ b/laptop/hardware-configuration.nix @@ -7,8 +7,7 @@ pkgs, modulesPath, ... -}: -{ +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -23,11 +22,11 @@ "sd_mod" ]; - kernelModules = [ ]; + kernelModules = []; }; - kernelModules = [ "kvm-intel" ]; - extraModulePackages = [ ]; + kernelModules = ["kvm-intel"]; + extraModulePackages = []; resumeDevice = "/dev/disk/by-uuid/bea07563-dc23-415b-b12f-ba53138bd492"; kernelParams = [ diff --git a/laptop/modules/default.nix b/laptop/modules/default.nix index 8cf6623..8c0e137 100644 --- a/laptop/modules/default.nix +++ b/laptop/modules/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./flatpak.nix ./gnome.nix diff --git a/laptop/modules/flatpak.nix b/laptop/modules/flatpak.nix index bae0102..d9220f8 100644 --- a/laptop/modules/flatpak.nix +++ b/laptop/modules/flatpak.nix @@ -3,6 +3,5 @@ pkgs, lib, ... -}: -{ +}: { } diff --git a/laptop/modules/gnome.nix b/laptop/modules/gnome.nix index ebcac16..189c95a 100644 --- a/laptop/modules/gnome.nix +++ b/laptop/modules/gnome.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { environment = { systemPackages = with pkgs.gnomeExtensions; [ ]; diff --git a/laptop/modules/home/dconf/apps.nix b/laptop/modules/home/dconf/apps.nix index cced51a..4fd3841 100644 --- a/laptop/modules/home/dconf/apps.nix +++ b/laptop/modules/home/dconf/apps.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { dconf.settings = { "org/gnome/Console" = { custom-font = "FiraCode Nerd Font Mono 11"; diff --git a/laptop/modules/home/dconf/default.nix b/laptop/modules/home/dconf/default.nix index 4968ed9..5261d6c 100644 --- a/laptop/modules/home/dconf/default.nix +++ b/laptop/modules/home/dconf/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./apps.nix ./extensions.nix diff --git a/laptop/modules/home/dconf/extensions.nix b/laptop/modules/home/dconf/extensions.nix index 58b55cc..f3b3c66 100644 --- a/laptop/modules/home/dconf/extensions.nix +++ b/laptop/modules/home/dconf/extensions.nix @@ -1,4 +1,3 @@ -{ ... }: -{ - dconf.settings = { }; +{...}: { + dconf.settings = {}; } diff --git a/laptop/modules/home/dconf/gnome.nix b/laptop/modules/home/dconf/gnome.nix index b653602..8499744 100644 --- a/laptop/modules/home/dconf/gnome.nix +++ b/laptop/modules/home/dconf/gnome.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { dconf.settings = { "org/gnome/desktop/peripherals/touchpad" = { click-method = "areas"; diff --git a/laptop/modules/home/default.nix b/laptop/modules/home/default.nix index fc53db3..96d9ea3 100644 --- a/laptop/modules/home/default.nix +++ b/laptop/modules/home/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./dconf ]; diff --git a/laptop/modules/packages.nix b/laptop/modules/packages.nix index 7951093..4d4b970 100644 --- a/laptop/modules/packages.nix +++ b/laptop/modules/packages.nix @@ -3,8 +3,7 @@ pkgs, lib, ... -}: -{ +}: { environment.systemPackages = with pkgs; [ btop gnome-power-manager diff --git a/laptop/modules/programs.nix b/laptop/modules/programs.nix index 52c14b8..ea8f50d 100644 --- a/laptop/modules/programs.nix +++ b/laptop/modules/programs.nix @@ -1,3 +1,2 @@ -{ ... }: -{ +{...}: { } diff --git a/laptop/modules/services.nix b/laptop/modules/services.nix index f49f719..07a54b2 100644 --- a/laptop/modules/services.nix +++ b/laptop/modules/services.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { services.thermald.enable = true; services.power-profiles-daemon.enable = false; services.tlp = { @@ -42,7 +41,7 @@ systemd.services.disable-problematic-wakeup = { description = "Disable only specific noisy wakeup sources"; - wantedBy = [ "multi-user.target" ]; + wantedBy = ["multi-user.target"]; serviceConfig = { Type = "oneshot";