From 8d7d732a1f3f4c947059ee01811d051da4133f06 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 19 Jan 2024 13:42:27 +0100 Subject: [PATCH] run nixpkgs-fmt --- flake.lock | 12 +++---- home-modules/firefox/default.nix | 4 +-- modules/keyboard/default.nix | 2 +- modules/sway/default.nix | 2 +- packages/default.nix | 2 +- systems/default.nix | 10 +++--- systems/kuraokami/default.nix | 2 +- systems/zap/default.nix | 57 ++++++++++++++++---------------- 8 files changed, 46 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 7644c8d..1c173de 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1705534402, - "narHash": "sha256-mOWT45HLd8dm8FJNmrgngotE5NRJ+2arz65m1Kk0LBA=", + "lastModified": 1705660110, + "narHash": "sha256-q5cEuYpgWEsgcKhRzJ7i87N2hf1saMX42WBQc9LrKO4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "6a928ce99e4ccb09e59c1f58052bd65027249c8a", + "rev": "516de0615e77d6e4d1ea5c405c776c0b0d6c1e4c", "type": "gitlab" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1705535278, - "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", + "lastModified": 1705660020, + "narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", + "rev": "2064348e555b6aa963da6372a8f14e6acb80a176", "type": "github" }, "original": { diff --git a/home-modules/firefox/default.nix b/home-modules/firefox/default.nix index 44f6c01..373d58e 100644 --- a/home-modules/firefox/default.nix +++ b/home-modules/firefox/default.nix @@ -245,7 +245,7 @@ in { } ]; }]; - icon ="${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; definedAliases = [ "@np" ]; }; "NixOS Modules" = { @@ -279,7 +279,7 @@ in { } ]; }]; - icon ="${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; definedAliases = [ "@hm" ]; }; "Repology" = { diff --git a/modules/keyboard/default.nix b/modules/keyboard/default.nix index 053a8a8..2149329 100644 --- a/modules/keyboard/default.nix +++ b/modules/keyboard/default.nix @@ -6,7 +6,7 @@ in { enable = lib.mkEnableOption "Enable Keyboard"; layout = lib.mkOption { type = lib.types.str; - default = "us"; + default = "us"; description = lib.mdDoc "Keyboard Layout."; }; }; diff --git a/modules/sway/default.nix b/modules/sway/default.nix index ff58284..6a4afdd 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -7,7 +7,7 @@ in { }; config = lib.mkIf cfg.enable { - programs.sway = { + programs.sway = { enable = true; }; networking.networkmanager.enable = true; diff --git a/packages/default.nix b/packages/default.nix index d29735e..eb30540 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -10,7 +10,7 @@ }; libadwaita-follow-theme = pkgs.libadwaita.overrideAttrs (old: { - patches = (old.patches or [ ])++ [ ./adwaita-theming-support.patch ]; + patches = (old.patches or [ ]) ++ [ ./adwaita-theming-support.patch ]; doCheck = false; }); diff --git a/systems/default.nix b/systems/default.nix index e2992a3..336c536 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -2,7 +2,7 @@ let mkSystem = systemConfig: name: nixpkgs.lib.nixosSystem rec { - system = builtins.replaceStrings ["-unknown-" "-gnu"] ["-" ""] systemConfig; + system = builtins.replaceStrings [ "-unknown-" "-gnu" ] [ "-" "" ] systemConfig; specialArgs = inputs; modules = [ ./${name} @@ -23,8 +23,8 @@ in jurojin = mkSystem "aarch64-unknown-linux-gnu" "jurojin"; sukuna-biko-na = mkSystem "aarch64-unknown-linux-gnu" "sukuna-biko-na"; benzaiten = mkSystem "x86_64-unknown-linux-gnu" "benzaiten"; - kamimusubi = mkSystem "x86_64-unknown-linux-gnu" "kamimusubi"; - ebisu = mkSystem "x86_64-unknown-linux-gnu" "ebisu"; - hetzner = mkSystem "x86_64-unknown-linux-gnu" "hetzner"; - zap = mkSystem "x86_64-unknown-linux-gnu" "zap"; + kamimusubi = mkSystem "x86_64-unknown-linux-gnu" "kamimusubi"; + ebisu = mkSystem "x86_64-unknown-linux-gnu" "ebisu"; + hetzner = mkSystem "x86_64-unknown-linux-gnu" "hetzner"; + zap = mkSystem "x86_64-unknown-linux-gnu" "zap"; } diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index 5d6fd38..e1b73bb 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -104,5 +104,5 @@ }; nix.settings.system-features = [ "gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test" ] - ++ map (x: "gccarch-${x}") (lib.systems.architectures.inferiors.alderlake or []); + ++ map (x: "gccarch-${x}") (lib.systems.architectures.inferiors.alderlake or [ ]); } diff --git a/systems/zap/default.nix b/systems/zap/default.nix index 0a26b9e..1fd1d6a 100644 --- a/systems/zap/default.nix +++ b/systems/zap/default.nix @@ -12,7 +12,8 @@ }; imports = - [ (modulesPath + "/profiles/qemu-guest.nix") + [ + (modulesPath + "/profiles/qemu-guest.nix") ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; @@ -36,22 +37,22 @@ }; -# networking = { -# wireless.enable = lib.mkForce false; -# interfaces.eth0 = { -# ipv4.addresses = [{ -# address = "134.255.219.135"; -# prefixLength = 24; -# }]; -# }; -# interfaces.ens18 = { -# ipv4.addresses = [{ -# address = "185.249.199.92"; -# prefixLength = 24; -# }]; -# }; -# defaultGateway = "134.255.219.1"; -# }; + # networking = { + # wireless.enable = lib.mkForce false; + # interfaces.eth0 = { + # ipv4.addresses = [{ + # address = "134.255.219.135"; + # prefixLength = 24; + # }]; + # }; + # interfaces.ens18 = { + # ipv4.addresses = [{ + # address = "185.249.199.92"; + # prefixLength = 24; + # }]; + # }; + # defaultGateway = "134.255.219.1"; + # }; time.timeZone = "Europe/Berlin"; @@ -77,17 +78,17 @@ type = "table"; format = "msdos"; partitions = [ -# { -# name = "ESP"; -# start = "1M"; -# end = "500M"; -# bootable = true; -# content = { -# type = "filesystem"; -# format = "vfat"; -# mountpoint = "/boot"; -# }; -# } + # { + # name = "ESP"; + # start = "1M"; + # end = "500M"; + # bootable = true; + # content = { + # type = "filesystem"; + # format = "vfat"; + # mountpoint = "/boot"; + # }; + # } { name = "root"; start = "500M";