From fdc41485409716dc9a7129f1c60d536234644c87 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Fri, 16 Jul 2021 19:13:51 +0200 Subject: [PATCH] Reformat Nix files --- configs/games.nix | 18 ++-- configs/home/cli.nix | 6 +- configs/home/xmonad.nix | 96 +++++++++---------- configs/system.nix | 2 +- configs/virtualisation.nix | 2 +- hosts/froidmpa-laptop/configuration.nix | 6 +- .../hardware-configuration.nix | 12 ++- hosts/nixos-desktop/configuration.nix | 18 ++-- .../nixos-desktop/hardware-configuration.nix | 9 +- 9 files changed, 87 insertions(+), 82 deletions(-) diff --git a/configs/games.nix b/configs/games.nix index de884f6..705a477 100644 --- a/configs/games.nix +++ b/configs/games.nix @@ -1,16 +1,18 @@ { config, lib, pkgs, ... }: { hardware.opengl.driSupport32Bit = true; - home-manager.users.froidmpa = {pkgs, config, ...}: { + home-manager.users.froidmpa = { pkgs, config, ... }: { nixpkgs.config = { allowUnfree = true; - packageOverrides = super: let self = super.pkgs; in { - lutris-unwrapped = super.lutris-unwrapped.overridePythonAttrs (oldAttrs: rec { - patches = [ - ./lutris_sort_new_with_model_fix.patch - ]; - }); - }; + packageOverrides = super: + let self = super.pkgs; in + { + lutris-unwrapped = super.lutris-unwrapped.overridePythonAttrs (oldAttrs: rec { + patches = [ + ./lutris_sort_new_with_model_fix.patch + ]; + }); + }; }; home.packages = with pkgs; [ steam diff --git a/configs/home/cli.nix b/configs/home/cli.nix index ef5f136..c229ab0 100644 --- a/configs/home/cli.nix +++ b/configs/home/cli.nix @@ -54,7 +54,7 @@ hideUserlandThreads = true; highlightBaseName = true; fields = [ "PID" "USER" "M_RESIDENT" "M_SHARE" "STATE" "PERCENT_CPU" "PERCENT_MEM" "IO_RATE" "TIME" "COMM" ]; - meters.left = [ "LeftCPUs" "Memory" "Swap" ] ; + meters.left = [ "LeftCPUs" "Memory" "Swap" ]; meters.right = [ "RightCPUs" "Tasks" "LoadAverage" "Uptime" ]; }; broot = { @@ -112,8 +112,8 @@ home.file.".config/ranger/plugins" = { source = builtins.fetchGit { - url = "git://github.com/phfroidmont/ranger_devicons.git"; - rev = "e02b6a3203411b76616a0e4328245bf8b47c5dcc"; + url = "git://github.com/phfroidmont/ranger_devicons.git"; + rev = "e02b6a3203411b76616a0e4328245bf8b47c5dcc"; }; recursive = true; }; diff --git a/configs/home/xmonad.nix b/configs/home/xmonad.nix index 35fe736..e672407 100644 --- a/configs/home/xmonad.nix +++ b/configs/home/xmonad.nix @@ -13,7 +13,7 @@ numlock.enable = true; }; nixpkgs.config.packageOverrides = pkgs: { - ncmpcpp = pkgs.ncmpcpp.override {visualizerSupport = true;}; + ncmpcpp = pkgs.ncmpcpp.override { visualizerSupport = true; }; firefox = pkgs.firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }; }; @@ -42,7 +42,7 @@ ]; keyboard = { layout = "fr"; - options = ["caps:escape"]; + options = [ "caps:escape" ]; }; file = { ".wallpaper.png".source = ./files/wallpaper.png; @@ -77,20 +77,20 @@ musicDirectory = "${config.home.homeDirectory}/Nextcloud/Media/Music"; playlistDirectory = "${config.home.homeDirectory}/Nextcloud/Playlists"; extraConfig = '' - max_output_buffer_size "16384" - auto_update "yes" - audio_output { - type "pulse" - name "pulse audio" - device "pulse" - mixer_type "hardware" - } - audio_output { - type "fifo" - name "toggle_visualizer" - path "/tmp/mpd.fifo" - format "44100:16:2" - } + max_output_buffer_size "16384" + auto_update "yes" + audio_output { + type "pulse" + name "pulse audio" + device "pulse" + mixer_type "hardware" + } + audio_output { + type "fifo" + name "toggle_visualizer" + path "/tmp/mpd.fifo" + format "44100:16:2" + } ''; }; stalonetray = { @@ -98,11 +98,11 @@ config = { geometry = "1x1-5+0"; background = "#000000"; - transparent = true; - grow_gravity = "E"; - icon_gravity = "E"; - icon_size = "24"; - kludges = "force_icons_size"; + transparent = true; + grow_gravity = "E"; + icon_gravity = "E"; + icon_size = "24"; + kludges = "force_icons_size"; }; }; unclutter.enable = true; @@ -111,7 +111,7 @@ enable = true; settings = { global = { - monitor = 0; + monitor = 0; geometry = "350x5-30+50"; transparency = 10; font = "monospace 14"; @@ -124,7 +124,7 @@ sort = "yes"; }; frame = { - width = 3; + width = 3; color = "#ebdbb2"; }; shortcuts = { @@ -165,7 +165,7 @@ urxvt = { enable = true; package = pkgs.rxvt_unicode-with-plugins; - fonts = ["xft:monospace:size=12:antialias=true"]; + fonts = [ "xft:monospace:size=12:antialias=true" ]; scroll = { bar.enable = false; lines = 65535; @@ -175,31 +175,31 @@ "Shift-Control-V" = "eval:paste_clipboard"; }; extraConfig = { - "perl-ext-common" = "default,clipboard,matcher,resize-font"; - "background" = "rgba:28ff/28ff/28ff/cf00"; - "foreground" = "#ebdbb2"; - "color0" = "#282828"; - "color8" = "#928374"; - "color1" = "#cc241d"; - "color9" = "#fb4934"; - "color2" = "#98971a"; - "color10" = "#b8bb26"; - "color3" = "#d79921"; - "color11" = "#fabd2f"; - "color4" = "#458588"; - "color12" = "#83a598"; - "color5" = "#b16286"; - "color13" = "#d3869b"; - "color6" = "#689d6a"; - "color14" = "#8ec07c"; - "color7" = "#a89984"; - "color15" = "#ebdbb2"; - "termName" = "rxvt-256color"; - "letterSpace" = "-1"; - "internalBorder" = "10"; - "depth" = "32"; + "perl-ext-common" = "default,clipboard,matcher,resize-font"; + "background" = "rgba:28ff/28ff/28ff/cf00"; + "foreground" = "#ebdbb2"; + "color0" = "#282828"; + "color8" = "#928374"; + "color1" = "#cc241d"; + "color9" = "#fb4934"; + "color2" = "#98971a"; + "color10" = "#b8bb26"; + "color3" = "#d79921"; + "color11" = "#fabd2f"; + "color4" = "#458588"; + "color12" = "#83a598"; + "color5" = "#b16286"; + "color13" = "#d3869b"; + "color6" = "#689d6a"; + "color14" = "#8ec07c"; + "color7" = "#a89984"; + "color15" = "#ebdbb2"; + "termName" = "rxvt-256color"; + "letterSpace" = "-1"; + "internalBorder" = "10"; + "depth" = "32"; "resize-font.smaller" = "C-Down"; - "resize-font.bigger" = "C-Up"; + "resize-font.bigger" = "C-Up"; }; }; }; diff --git a/configs/system.nix b/configs/system.nix index 9d8e49f..98f20e8 100644 --- a/configs/system.nix +++ b/configs/system.nix @@ -10,7 +10,7 @@ environment.systemPackages = with pkgs; [ (pkgs.writeShellScriptBin "nixFlakes" '' - exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@" + exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@" '') wget diff --git a/configs/virtualisation.nix b/configs/virtualisation.nix index f164ac0..62fcade 100644 --- a/configs/virtualisation.nix +++ b/configs/virtualisation.nix @@ -8,7 +8,7 @@ }; users.users.froidmpa.extraGroups = [ "docker" "vboxusers" ]; - home-manager.users.froidmpa = {pkgs, config, ...}: { + home-manager.users.froidmpa = { pkgs, config, ... }: { home.packages = with pkgs; [ docker-compose ]; diff --git a/hosts/froidmpa-laptop/configuration.nix b/hosts/froidmpa-laptop/configuration.nix index 6b23b11..e49fe0e 100644 --- a/hosts/froidmpa-laptop/configuration.nix +++ b/hosts/froidmpa-laptop/configuration.nix @@ -53,20 +53,20 @@ }; services.blueman.enable = true; - home-manager.users.froidmpa = {pkgs, config, ...}: { + home-manager.users.froidmpa = { pkgs, config, ... }: { imports = [ ../../configs/home/full.nix ]; programs.git = { enable = true; - userName = "Paul-Henri Froidmont"; + userName = "Paul-Henri Froidmont"; userEmail = "git.contact-57n2p@froidmont.org"; }; services.network-manager-applet.enable = true; services.blueman-applet.enable = true; services.grobi = { enable = true; - executeAfter = ["${pkgs.systemd}/bin/systemctl --user restart stalonetray" "${pkgs.feh}/bin/feh --bg-fill ~/.wallpaper.png"]; + executeAfter = [ "${pkgs.systemd}/bin/systemctl --user restart stalonetray" "${pkgs.feh}/bin/feh --bg-fill ~/.wallpaper.png" ]; rules = [ { name = "Work HDMI"; diff --git a/hosts/froidmpa-laptop/hardware-configuration.nix b/hosts/froidmpa-laptop/hardware-configuration.nix index 55fee45..80ab5e0 100644 --- a/hosts/froidmpa-laptop/hardware-configuration.nix +++ b/hosts/froidmpa-laptop/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ]; @@ -14,19 +15,20 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/a8abad9b-5615-4887-8431-3d80b78d073e"; + { + device = "/dev/disk/by-uuid/a8abad9b-5615-4887-8431-3d80b78d073e"; fsType = "ext4"; }; boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/1e900b2e-daea-4558-b18f-3d3a5843de61"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/077C-758A"; + { + device = "/dev/disk/by-uuid/077C-758A"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/bb8fa9ef-9b8f-413d-913a-6c891649a954"; } - ]; + [{ device = "/dev/disk/by-uuid/bb8fa9ef-9b8f-413d-913a-6c891649a954"; }]; } diff --git a/hosts/nixos-desktop/configuration.nix b/hosts/nixos-desktop/configuration.nix index 3f9fa82..1b4e0cb 100644 --- a/hosts/nixos-desktop/configuration.nix +++ b/hosts/nixos-desktop/configuration.nix @@ -8,7 +8,7 @@ ../../configs/games.nix ]; - home-manager.users.froidmpa = {pkgs, config, ...}: { + home-manager.users.froidmpa = { pkgs, config, ... }: { imports = [ ../../configs/home/full.nix ]; @@ -17,7 +17,7 @@ programs.git = { enable = true; - userName = "Paul-Henri Froidmont"; + userName = "Paul-Henri Froidmont"; userEmail = "git.contact-57n2p@froidmont.org"; signing = { key = "3AC6F170F01133CE393BCD94BE948AFD7E7873BE"; @@ -27,12 +27,12 @@ }; hardware.opengl = { - driSupport = true; - driSupport32Bit = true; - extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-opencl-runtime - ]; + driSupport = true; + driSupport32Bit = true; + extraPackages = with pkgs; [ + rocm-opencl-icd + rocm-opencl-runtime + ]; }; environment.systemPackages = with pkgs; [ @@ -64,7 +64,7 @@ time.timeZone = "Europe/Amsterdam"; - services.xserver.videoDrivers = ["amdgpu"]; + services.xserver.videoDrivers = [ "amdgpu" ]; services.sshd.enable = true; services.pcscd.enable = true; diff --git a/hosts/nixos-desktop/hardware-configuration.nix b/hosts/nixos-desktop/hardware-configuration.nix index 8a5daf2..5b20324 100644 --- a/hosts/nixos-desktop/hardware-configuration.nix +++ b/hosts/nixos-desktop/hardware-configuration.nix @@ -7,18 +7,19 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/f1e21558-88e6-413e-b56a-04e0b25e9ddd"; + { + device = "/dev/disk/by-uuid/f1e21558-88e6-413e-b56a-04e0b25e9ddd"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CCD1-0415"; + { + device = "/dev/disk/by-uuid/CCD1-0415"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/f714775c-b5af-4c0c-8330-999b43db4794"; } - ]; + [{ device = "/dev/disk/by-uuid/f714775c-b5af-4c0c-8330-999b43db4794"; }]; nix.maxJobs = lib.mkDefault 16; # High-DPI console