From f42247f51a0b71e7c9ef5f8e5eea91c548bb5127 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Thu, 26 Nov 2020 04:20:52 +0000 Subject: [PATCH] Run nixpkgs-fmt --- configuration.nix | 2 +- externals/packages/jlink/default.nix | 1 - externals/systemd-boot-secure/default.nix | 4 +- packages.nix | 7 +- private | 2 +- sets/fpga.nix | 2 +- sets/gpu/intel.nix | 2 +- sets/hardware.nix | 2 +- sets/sway.nix | 84 +++++++++---------- sets/virtualization.nix | 4 +- system/rainbowdash/boot-config.nix | 6 +- system/rainbowdash/hardware-configuration.nix | 15 ++-- system/spike/hardware-configuration.nix | 21 +++-- 13 files changed, 78 insertions(+), 74 deletions(-) diff --git a/configuration.nix b/configuration.nix index ed5ffbe..0375de9 100644 --- a/configuration.nix +++ b/configuration.nix @@ -93,5 +93,5 @@ mutableUsers = false; }; systemd.extraConfig = "DefaultLimitCORE=infinity"; - security.pam.loginLimits = [ { domain = "*"; item = "core"; type = "hard"; value = "infinity"; } ]; + security.pam.loginLimits = [{ domain = "*"; item = "core"; type = "hard"; value = "infinity"; }]; } diff --git a/externals/packages/jlink/default.nix b/externals/packages/jlink/default.nix index bbeb2ad..166cbf2 100644 --- a/externals/packages/jlink/default.nix +++ b/externals/packages/jlink/default.nix @@ -17,7 +17,6 @@ , libXrender , libXrandr }: - let jlinkVersion = "686a"; diff --git a/externals/systemd-boot-secure/default.nix b/externals/systemd-boot-secure/default.nix index 3d10d5c..b575daa 100644 --- a/externals/systemd-boot-secure/default.nix +++ b/externals/systemd-boot-secure/default.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: with lib; - let cfg = config.boot.loader.systemd-boot-secure; @@ -38,7 +37,8 @@ let signingCertificate = if cfg.signed then cfg.signing-certificate else "/no-signing-crt"; }; -in { +in +{ options.boot.loader.systemd-boot-secure = { enable = mkOption { diff --git a/packages.nix b/packages.nix index 85198d8..7f89a3e 100644 --- a/packages.nix +++ b/packages.nix @@ -1,11 +1,10 @@ { config, pkgs, ... }: - let llvm = pkgs.llvmPackages_10; go = pkgs.go_1_15; in - { - environment.systemPackages = (with pkgs; [ +{ + environment.systemPackages = (with pkgs; [ # Audiovisual audacity darktable @@ -107,7 +106,7 @@ in xclip xxd zip - + # Networking curlFull httpie diff --git a/private b/private index 37ff0f2..2f3480e 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 37ff0f2defe0902161d79d79cb4a9f7ef30bfbed +Subproject commit 2f3480efc17b6cbd3edf01f2cee877ce2c9a8cf4 diff --git a/sets/fpga.nix b/sets/fpga.nix index d761c56..7513940 100644 --- a/sets/fpga.nix +++ b/sets/fpga.nix @@ -18,6 +18,6 @@ dfu-util tinyprog wishbone-tool - ( callPackage ../externals/packages/fujproj { } ) + (callPackage ../externals/packages/fujproj { }) ]; } diff --git a/sets/gpu/intel.nix b/sets/gpu/intel.nix index e7d527d..598756d 100644 --- a/sets/gpu/intel.nix +++ b/sets/gpu/intel.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ...}: +{ config, pkgs, ... }: { hardware.opengl.extraPackages = with pkgs; [ intel-media-driver diff --git a/sets/hardware.nix b/sets/hardware.nix index 0fa230e..c83e177 100644 --- a/sets/hardware.nix +++ b/sets/hardware.nix @@ -16,6 +16,6 @@ users = { users.artemis.extraGroups = [ "plugdev" "dialout" ]; - extraGroups.plugdev = {}; + extraGroups.plugdev = { }; }; } diff --git a/sets/sway.nix b/sets/sway.nix index 0737095..ec80f95 100644 --- a/sets/sway.nix +++ b/sets/sway.nix @@ -1,52 +1,50 @@ { config, pkgs, ... }: - let - wofi = pkgs.wofi.overrideAttrs ( old: { + wofi = pkgs.wofi.overrideAttrs (old: { src = pkgs.fetchhg { url = old.src.url; rev = "e3db9b8075e71399bba14a568c59032f47981dab"; sha256 = "07fr1yfls94gxpwv3azgzxm7shjs4g5ribvqrh88flpf4cv5hq2d"; }; - } ); + }); in - { - security.polkit.enable = true; - services = { - accounts-daemon.enable = true; - logind.extraConfig = "HandlePowerKey=suspend"; - }; - xdg.portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - xdg-desktop-portal-wlr - ]; - }; - sound.enable = true; - programs.sway = { - enable = true; - wrapperFeatures.gtk = true; - extraSessionCommands = '' - export MOZ_USE_XINPUT2=1 - export _JAVA_AWT_WM_NONREPARENTING=1 - export GTK_THEME=Adwaita-dark - ''; - }; - environment.systemPackages = with pkgs; [ - dex - glib - grim - imagemagick - libnotify - mako - polkit_gnome - slurp - wf-recorder - wl-clipboard - wofi - xdg-user-dirs - xdg_utils - xsettingsd +{ + security.polkit.enable = true; + services = { + accounts-daemon.enable = true; + logind.extraConfig = "HandlePowerKey=suspend"; + }; + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-wlr ]; - } - + }; + sound.enable = true; + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + extraSessionCommands = '' + export MOZ_USE_XINPUT2=1 + export _JAVA_AWT_WM_NONREPARENTING=1 + export GTK_THEME=Adwaita-dark + ''; + }; + environment.systemPackages = with pkgs; [ + dex + glib + grim + imagemagick + libnotify + mako + polkit_gnome + slurp + wf-recorder + wl-clipboard + wofi + xdg-user-dirs + xdg_utils + xsettingsd + ]; +} diff --git a/sets/virtualization.nix b/sets/virtualization.nix index 2b651e0..7f4cbc7 100644 --- a/sets/virtualization.nix +++ b/sets/virtualization.nix @@ -12,8 +12,8 @@ users.users = { artemis.extraGroups = [ "docker" "lxd" ]; root = { - subUidRanges = [ { startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; } ]; - subGidRanges = [ { startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; } ]; + subUidRanges = [{ startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; }]; + subGidRanges = [{ startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; }]; }; }; } diff --git a/system/rainbowdash/boot-config.nix b/system/rainbowdash/boot-config.nix index b898f57..efda058 100644 --- a/system/rainbowdash/boot-config.nix +++ b/system/rainbowdash/boot-config.nix @@ -18,8 +18,8 @@ }; fileSystems = { - "/home".options = ["noatime"]; - "/boot".options = ["noatime"]; - "/".options = ["noatime"]; + "/home".options = [ "noatime" ]; + "/boot".options = [ "noatime" ]; + "/".options = [ "noatime" ]; }; } diff --git a/system/rainbowdash/hardware-configuration.nix b/system/rainbowdash/hardware-configuration.nix index 3faeccf..d6ad3f2 100644 --- a/system/rainbowdash/hardware-configuration.nix +++ b/system/rainbowdash/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; @@ -14,25 +15,27 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/mapper/rainbowdash-root"; + { + device = "/dev/mapper/rainbowdash-root"; fsType = "btrfs"; options = [ "subvol=root" ]; }; fileSystems."/home" = - { device = "/dev/mapper/rainbowdash-root"; + { + device = "/dev/mapper/rainbowdash-root"; fsType = "btrfs"; options = [ "subvol=home" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/642D-02DF"; + { + device = "/dev/disk/by-uuid/642D-02DF"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/289be8e5-6547-41d4-a6ba-309141f9fccd"; } - ]; + [{ device = "/dev/disk/by-uuid/289be8e5-6547-41d4-a6ba-309141f9fccd"; }]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # High-DPI console diff --git a/system/spike/hardware-configuration.nix b/system/spike/hardware-configuration.nix index d831bb3..59c024c 100644 --- a/system/spike/hardware-configuration.nix +++ b/system/spike/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; @@ -14,37 +15,41 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511"; + { + device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511"; fsType = "btrfs"; options = [ "subvol=root" ]; }; fileSystems."/nix" = - { device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511"; + { + device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511"; fsType = "btrfs"; options = [ "subvol=nix" ]; }; fileSystems."/var/lib/flatpak" = - { device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511"; + { + device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511"; fsType = "btrfs"; options = [ "subvol=flatpak" ]; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511"; + { + device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511"; fsType = "btrfs"; options = [ "subvol=home" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/597E-B7FC"; + { + device = "/dev/disk/by-uuid/597E-B7FC"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/52effd04-0e5a-4ac6-a0c9-5970c063e5f4"; } - ]; + [{ device = "/dev/disk/by-uuid/52effd04-0e5a-4ac6-a0c9-5970c063e5f4"; }]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; }