From 5d94db016b8f77df097bbd52d107f85bc12f45cb Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Fri, 11 Aug 2023 00:00:19 +0200 Subject: [PATCH] chore(fmt): formatting changes --- hosts/chmura/conduit.nix | 1 - hosts/chmura/configuration.nix | 7 +++--- hosts/niks/configuration.nix | 43 ++++++++++++++++++++-------------- hosts/niks/greetd.nix | 8 +++---- 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/hosts/chmura/conduit.nix b/hosts/chmura/conduit.nix index 99fd3912..e363e9af 100644 --- a/hosts/chmura/conduit.nix +++ b/hosts/chmura/conduit.nix @@ -14,7 +14,6 @@ in { services.matrix-conduit = { enable = true; - package = inputs.conduit.packages.${pkgs.system}.default; settings.global = { diff --git a/hosts/chmura/configuration.nix b/hosts/chmura/configuration.nix index af9a574f..1ccd8e3b 100644 --- a/hosts/chmura/configuration.nix +++ b/hosts/chmura/configuration.nix @@ -7,9 +7,10 @@ # fuck broadcom nixpkgs.config.allowUnfree = true; - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; time.timeZone = "Europe/Warsaw"; diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index c079fbfc..12b593e4 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -4,20 +4,26 @@ inputs, ... }: { - nixpkgs.config.allowUnfree = true; - nixpkgs.overlays = [ - inputs.nur.overlay - inputs.neovim-nightly-overlay.overlay - ]; + nixpkgs = { + config.allowUnfree = true; + overlays = [ + inputs.nur.overlay + inputs.neovim-nightly-overlay.overlay + ]; + }; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; - boot.initrd.kernelModules = [ "amdgpu" ]; - boot.kernelParams = [ - "video=eDP-1:2560x1440@165" - "video=HDMI-A-1:2560x1440@144" - ]; + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + kernelPackages = pkgs.linuxPackages_xanmod_latest; + initrd.kernelModules = [ "amdgpu" ]; + kernelParams = [ + "video=eDP-1:2560x1440@165" + "video=HDMI-A-1:2560x1440@144" + ]; + }; networking.networkmanager.enable = true; @@ -131,7 +137,6 @@ enableSSHSupport = true; }; - hardware = { opentabletdriver = { enable = true; @@ -154,10 +159,12 @@ }; }; - swapDevices = [ { - device = "/var/lib/swapfile"; - size = 16*1024; - } ]; + swapDevices = [ + { + device = "/var/lib/swapfile"; + size = 16*1024; + } + ]; system.stateVersion = "23.11"; } diff --git a/hosts/niks/greetd.nix b/hosts/niks/greetd.nix index db2a5c93..e5b8df2f 100644 --- a/hosts/niks/greetd.nix +++ b/hosts/niks/greetd.nix @@ -21,11 +21,9 @@ in { services.greetd = { enable = true; - settings = { - default_session = { - command = "${pkgs.sway}/bin/sway --config ${swayConfig}"; - user = "jacek"; - }; + settings.default_session = { + command = "${pkgs.sway}/bin/sway --config ${swayConfig}"; + user = "jacek"; }; };