From 7d0571f4a9537f5848bb3dfbcf4e4cdb5894cef5 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Wed, 12 Apr 2023 22:09:46 +0200 Subject: [PATCH] formatting --- hosts/falkenstein-1/hardware-configuration.nix | 9 ++++++--- .../falkenstein-1/modules/networks/default.nix | 2 +- hosts/nuc/modules/backup/default.nix | 3 +-- hosts/nuc/modules/nix-serve/default.nix | 4 ++-- hosts/thinkpad/modules/greetd/default.nix | 2 +- hosts/thinkpad/modules/networks/default.nix | 3 ++- pkgs/x32edit/default.nix | 18 +++++++++--------- users/rouven/modules/accounts/default.nix | 16 ++++++++-------- users/rouven/modules/hyprland/hyprpaper.nix | 10 +++++----- users/rouven/modules/neovim/default.nix | 6 ++++-- 10 files changed, 39 insertions(+), 34 deletions(-) diff --git a/hosts/falkenstein-1/hardware-configuration.nix b/hosts/falkenstein-1/hardware-configuration.nix index 1616ace..14b839c 100644 --- a/hosts/falkenstein-1/hardware-configuration.nix +++ b/hosts/falkenstein-1/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/profiles/qemu-guest.nix") + [ + (modulesPath + "/profiles/qemu-guest.nix") ]; boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "virtio_scsi" "xhci_pci" "sd_mod" "sr_mod" ]; @@ -14,12 +15,14 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/da06b92f-6eb6-45d5-9409-4d897a40d70e"; + { + device = "/dev/disk/by-uuid/da06b92f-6eb6-45d5-9409-4d897a40d70e"; fsType = "ext4"; }; fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/B677-3035"; + { + device = "/dev/disk/by-uuid/B677-3035"; fsType = "vfat"; }; diff --git a/hosts/falkenstein-1/modules/networks/default.nix b/hosts/falkenstein-1/modules/networks/default.nix index a126f21..10ad6e6 100644 --- a/hosts/falkenstein-1/modules/networks/default.nix +++ b/hosts/falkenstein-1/modules/networks/default.nix @@ -17,7 +17,7 @@ DHCP = "ipv4"; IPv6AcceptRA = "yes"; Address = "2a01:4f8:c012:49de::1/64"; - Gateway="fe80::1"; + Gateway = "fe80::1"; }; }; }; diff --git a/hosts/nuc/modules/backup/default.nix b/hosts/nuc/modules/backup/default.nix index fa7ddc3..9d1076c 100644 --- a/hosts/nuc/modules/backup/default.nix +++ b/hosts/nuc/modules/backup/default.nix @@ -1,4 +1,3 @@ - { fileSystems."/mnt/backup" = { @@ -14,7 +13,7 @@ fsType = "btrfs"; options = [ "compress=zstd" "noatime" ]; }; - + services.btrbk = { instances."nuc-to-disk".settings = { snapshot_preserve = "14d"; diff --git a/hosts/nuc/modules/nix-serve/default.nix b/hosts/nuc/modules/nix-serve/default.nix index 42dc333..0e5f6cd 100644 --- a/hosts/nuc/modules/nix-serve/default.nix +++ b/hosts/nuc/modules/nix-serve/default.nix @@ -1,9 +1,9 @@ -{config, ...}: +{ config, ... }: let domain = "cache.rfive.de"; in { - sops.secrets."nix-serve/secretkey" = {}; + sops.secrets."nix-serve/secretkey" = { }; services.nix-serve = { enable = true; secretKeyFile = config.sops.secrets."nix-serve/secretkey".path; diff --git a/hosts/thinkpad/modules/greetd/default.nix b/hosts/thinkpad/modules/greetd/default.nix index e36f099..2a231ac 100644 --- a/hosts/thinkpad/modules/greetd/default.nix +++ b/hosts/thinkpad/modules/greetd/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ...}: +{ config, pkgs, ... }: { services.greetd = { enable = true; diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix index 756a166..641e4a5 100644 --- a/hosts/thinkpad/modules/networks/default.nix +++ b/hosts/thinkpad/modules/networks/default.nix @@ -11,7 +11,8 @@ owner = config.users.users.systemd-network.name; }; }; - networking = { useNetworkd = true; + networking = { + useNetworkd = true; hostName = "thinkpad"; enableIPv6 = true; wireless = { diff --git a/pkgs/x32edit/default.nix b/pkgs/x32edit/default.nix index 6f2bd9e..db3b9f1 100644 --- a/pkgs/x32edit/default.nix +++ b/pkgs/x32edit/default.nix @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation libPath = lib.makeLibraryPath [ #(curlWithGnuTls.overrideAttrs (oldAttrs: rec { - #version = "7.81.0"; - #src = fetchurl { - #urls = [ - #"https://curl.haxx.se/download/curl-${version}.tar.bz2" - #"https://github.com/curl/curl/releases/download/curl-${version}/curl-${version}.tar.bz2" - #]; - #hash = "sha256-Hno41wGOwGDx8W34OYVPCInpThIsTPpdOjfC3Fbx4lg="; - ##hash = "sha256-m2selrdI0EuWh4a2vfQHqlx1q1Oj03wcjIHNtzZVXM8="; - #}; + #version = "7.81.0"; + #src = fetchurl { + #urls = [ + #"https://curl.haxx.se/download/curl-${version}.tar.bz2" + #"https://github.com/curl/curl/releases/download/curl-${version}/curl-${version}.tar.bz2" + #]; + #hash = "sha256-Hno41wGOwGDx8W34OYVPCInpThIsTPpdOjfC3Fbx4lg="; + ##hash = "sha256-m2selrdI0EuWh4a2vfQHqlx1q1Oj03wcjIHNtzZVXM8="; + #}; #})) # libcurl-gnutls.so.4 #curlWithGnuTls libX11 # libX11.so.6 diff --git a/users/rouven/modules/accounts/default.nix b/users/rouven/modules/accounts/default.nix index b439f20..3c16436 100644 --- a/users/rouven/modules/accounts/default.nix +++ b/users/rouven/modules/accounts/default.nix @@ -225,10 +225,10 @@ in msmtp.enable = true; neomutt = let c = mbsync.groups.ifsr.channels; in { - enable = true; - mailboxName = "  iFSR"; - extraMailboxes = lib.lists.forEach [ c.admin c.sent c.trash c.junk c.drafts ] (x: x.nearPattern); - }; + enable = true; + mailboxName = "  iFSR"; + extraMailboxes = lib.lists.forEach [ c.admin c.sent c.trash c.junk c.drafts ] (x: x.nearPattern); + }; }; "gmail" = rec { address = "seifertrouven@gmail.com"; @@ -283,10 +283,10 @@ in msmtp.enable = true; neomutt = let c = mbsync.groups.gmail.channels; in { - enable = true; - mailboxName = " 󰊫 gmail"; - extraMailboxes = lib.lists.forEach [ c.sent c.trash c.junk c.drafts ] (x: x.nearPattern); - }; + enable = true; + mailboxName = " 󰊫 gmail"; + extraMailboxes = lib.lists.forEach [ c.sent c.trash c.junk c.drafts ] (x: x.nearPattern); + }; }; }; home.file.".urlview".text = '' diff --git a/users/rouven/modules/hyprland/hyprpaper.nix b/users/rouven/modules/hyprland/hyprpaper.nix index c6f73c5..0a285e6 100644 --- a/users/rouven/modules/hyprland/hyprpaper.nix +++ b/users/rouven/modules/hyprland/hyprpaper.nix @@ -1,5 +1,5 @@ { config, hyprpaper, ... }: -let +let hyprpaper-pkg = hyprpaper.packages.x86_64-linux.default; in { @@ -7,12 +7,12 @@ in hyprpaper-pkg ]; xdg.configFile."hypr/hyprpaper.conf".text = '' - preload = ${../../../../images/wallpaper.png} - wallpaper =eDP-1, ${../../../../images/wallpaper.png} - wallpaper =HDMI-A-1, ${../../../../images/wallpaper.png} + preload = ${../../../../images/wallpaper.png} + wallpaper =eDP-1, ${../../../../images/wallpaper.png} + wallpaper =HDMI-A-1, ${../../../../images/wallpaper.png} ''; systemd.user.services.hyprpaper = { - Install.WantedBy = ["graphical-session.target"]; + Install.WantedBy = [ "graphical-session.target" ]; Service = { ExecStart = "${hyprpaper-pkg}/bin/hyprpaper"; Restart = "on-failure"; diff --git a/users/rouven/modules/neovim/default.nix b/users/rouven/modules/neovim/default.nix index 7702ef6..ad1caf2 100644 --- a/users/rouven/modules/neovim/default.nix +++ b/users/rouven/modules/neovim/default.nix @@ -1,12 +1,14 @@ { config, pkgs, ... }: { - programs.nixvim = { enable = true; + programs.nixvim = { + enable = true; vimAlias = true; colorscheme = "dracula"; options = { shiftwidth = 4; - expandtab = true; preserveindent = true; + expandtab = true; + preserveindent = true; number = true; relativenumber = true; tabstop = 4;