From 24ae3a3bc1133d681e9fbdb92422e83e4dda8404 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Sat, 4 Nov 2023 16:12:45 +0530 Subject: [PATCH] reformat with nixpkgs-fmt --- common/default.nix | 4 +- common/nix.nix | 11 ++-- common/users/default.nix | 15 ++--- flake.nix | 71 ++++++++++++----------- home/default.nix | 14 ++--- home/gtk.nix | 15 ++--- home/programs/default.nix | 2 +- home/programs/eza.nix | 2 +- home/programs/files.nix | 4 +- home/programs/firefox.nix | 7 +-- home/programs/git.nix | 8 ++- home/programs/github-cli.nix | 4 +- home/programs/kitty.nix | 8 ++- home/programs/mpv.nix | 8 +-- home/programs/neovim.nix | 10 ++-- home/programs/tmux.nix | 2 +- home/programs/virt-manager.nix | 12 ++-- home/programs/zsh.nix | 7 +-- home/services/aria2c.nix | 19 +++--- home/services/spotifyd.nix | 7 +-- home/wm/addon/default.nix | 2 +- home/wm/addon/dunst.nix | 13 +++-- home/wm/addon/rofi/default.nix | 2 +- home/wm/addon/swayidle.nix | 6 +- home/wm/addon/waybar/default.nix | 14 ++--- home/wm/default.nix | 2 +- home/wm/hyprland/default.nix | 21 +++---- hosts/rico1/containers/default.nix | 2 +- hosts/rico1/default.nix | 4 +- hosts/rico1/hardware/default.nix | 4 +- hosts/rico1/hardware/filesystem.nix | 2 +- hosts/rico1/hardware/kernel.nix | 7 +-- hosts/rico1/network.nix | 4 +- hosts/rico1/programs/default.nix | 2 +- hosts/rico1/programs/zsh.nix | 2 +- hosts/rico1/services/caddy.nix | 2 +- hosts/rico1/services/default.nix | 2 +- hosts/rico1/services/dendrite/default.nix | 6 +- hosts/rico1/services/frpc.nix | 13 +++-- hosts/rico1/services/postgresql.nix | 4 +- hosts/rico1/wireguard.nix | 15 ++--- hosts/rico2/containers/default.nix | 4 +- hosts/rico2/default.nix | 4 +- hosts/rico2/hardware/default.nix | 4 +- hosts/rico2/hardware/filesystem.nix | 2 +- hosts/rico2/hardware/kernel.nix | 7 +-- hosts/rico2/network.nix | 4 +- hosts/rico2/programs/default.nix | 2 +- hosts/rico2/programs/zsh.nix | 2 +- hosts/rico2/services/adtya.xyz.nix | 17 +++--- hosts/rico2/services/caddy.nix | 7 +-- hosts/rico2/services/default.nix | 2 +- hosts/rico2/services/frpc.nix | 13 +++-- hosts/rico2/services/if3.nix | 13 +++-- hosts/rico2/services/proofs.nix | 7 +-- hosts/rico2/services/wiki.nix | 13 +++-- hosts/rico2/wireguard.nix | 15 ++--- hosts/skipper/default.nix | 8 +-- hosts/skipper/hardware/default.nix | 19 +++--- hosts/skipper/hardware/filesystem.nix | 10 ++-- hosts/skipper/hardware/kernel.nix | 13 ++--- hosts/skipper/network.nix | 4 +- hosts/skipper/plymouth.nix | 2 +- hosts/skipper/programs/default.nix | 2 +- hosts/skipper/rollback.nix | 6 +- hosts/skipper/secureboot.nix | 7 +-- hosts/skipper/security.nix | 6 +- hosts/skipper/services/dbus.nix | 4 +- hosts/skipper/services/default.nix | 6 +- hosts/skipper/services/keyd.nix | 2 +- hosts/skipper/services/udev.nix | 4 +- hosts/skipper/specialisation.nix | 2 +- hosts/skipper/virtualisation.nix | 4 +- hosts/skipper/wireguard.nix | 15 ++--- packages/adi1090x-plymouth/default.nix | 12 ++-- packages/default.nix | 8 +-- packages/dracula-gtk/default.nix | 20 +++---- packages/rofi-bluetooth/default.nix | 16 ++--- packages/scripts/default.nix | 32 +++++----- 79 files changed, 344 insertions(+), 333 deletions(-) diff --git a/common/default.nix b/common/default.nix index ff1fd17..d01f589 100644 --- a/common/default.nix +++ b/common/default.nix @@ -1,3 +1,3 @@ -{...}: { - imports = [./nix.nix ./users]; +{ ... }: { + imports = [ ./nix.nix ./users ]; } diff --git a/common/nix.nix b/common/nix.nix index 7d9b21a..11f356b 100644 --- a/common/nix.nix +++ b/common/nix.nix @@ -1,16 +1,15 @@ -{ - nixpkgs, - pkgs, - ... +{ nixpkgs +, pkgs +, ... }: { environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath; nix = { package = pkgs.nixFlakes; - nixPath = ["nixpkgs=/etc/nix/inputs/nixpkgs"]; + nixPath = [ "nixpkgs=/etc/nix/inputs/nixpkgs" ]; registry.nixpkgs.flake = nixpkgs; settings = { auto-optimise-store = true; - experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "cgroups" "ca-derivations"]; + experimental-features = [ "nix-command" "flakes" "auto-allocate-uids" "cgroups" "ca-derivations" ]; auto-allocate-uids = true; sandbox = true; trusted-substituters = [ diff --git a/common/users/default.nix b/common/users/default.nix index de69806..547ef97 100644 --- a/common/users/default.nix +++ b/common/users/default.nix @@ -1,10 +1,11 @@ -{ - pkgs, - secrets, - ... -}: let +{ pkgs +, secrets +, ... +}: +let user = secrets.users; -in { +in +{ users.mutableUsers = false; users.users = { root = { @@ -15,7 +16,7 @@ in { inherit (user.primary) hashedPassword; description = user.primary.realName; isNormalUser = true; - extraGroups = ["docker" "libvirtd" "networkmanager" "tss" "wheel"]; + extraGroups = [ "docker" "libvirtd" "networkmanager" "tss" "wheel" ]; shell = pkgs.zsh; openssh.authorizedKeys.keys = [ user.primary.sshPublicKey diff --git a/flake.nix b/flake.nix index 46df900..ab205c6 100644 --- a/flake.nix +++ b/flake.nix @@ -60,23 +60,25 @@ }; }; - outputs = { - self, - nixpkgs, - flake-utils, - home-manager, - impermanence, - lanzaboote, - nixvim, - www, - wiki, - if3, - } @ inputs: let - secrets = import ./secrets.nix; - nixpkgs-config = { - allowUnfree = true; - }; - in + outputs = + { self + , nixpkgs + , flake-utils + , home-manager + , impermanence + , lanzaboote + , nixvim + , www + , wiki + , if3 + , + } @ inputs: + let + secrets = import ./secrets.nix; + nixpkgs-config = { + allowUnfree = true; + }; + in { nixosConfigurations = { Skipper = nixpkgs.lib.nixosSystem rec { @@ -84,9 +86,9 @@ pkgs = import nixpkgs { inherit system; config = nixpkgs-config; - overlays = [(import ./packages)]; + overlays = [ (import ./packages) ]; }; - specialArgs = inputs // {inherit secrets;}; + specialArgs = inputs // { inherit secrets; }; modules = [ { system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; @@ -103,8 +105,8 @@ home-manager = { useUserPackages = true; useGlobalPkgs = true; - extraSpecialArgs = {inherit secrets;}; - users.${secrets.users.primary.userName} = {pkgs, ...}: { + extraSpecialArgs = { inherit secrets; }; + users.${secrets.users.primary.userName} = { pkgs, ... }: { imports = [ impermanence.nixosModules.home-manager.impermanence nixvim.homeManagerModules.nixvim @@ -121,7 +123,7 @@ inherit system; config = nixpkgs-config; }; - specialArgs = inputs // {inherit secrets;}; + specialArgs = inputs // { inherit secrets; }; modules = [ { system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; @@ -137,7 +139,7 @@ inherit system; config = nixpkgs-config; }; - specialArgs = inputs // {inherit secrets;}; + specialArgs = inputs // { inherit secrets; }; modules = [ { system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; @@ -150,20 +152,21 @@ }; } // flake-utils.lib.eachDefaultSystem ( - system: let + system: + let pkgs = import nixpkgs { inherit system; }; in - with pkgs; { - formatter = pkgs.alejandra; - devShells.default = mkShell { - buildInputs = [ - git - git-crypt - statix - ]; - }; - } + with pkgs; { + formatter = nixpkgs-fmt; + devShells.default = mkShell { + buildInputs = [ + git + git-crypt + statix + ]; + }; + } ); } diff --git a/home/default.nix b/home/default.nix index 58ef629..dc6aa00 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,5 +1,5 @@ _: { - imports = [./programs ./services ./wm ./gtk.nix ./persistence.nix]; + imports = [ ./programs ./services ./wm ./gtk.nix ./persistence.nix ]; home.stateVersion = "23.11"; @@ -9,12 +9,12 @@ _: { mimeApps = { enable = true; defaultApplications = { - "application/pdf" = ["org.gnome.Evince.desktop"]; - "image/gif" = ["org.gnome.eog.desktop"]; - "image/jpeg" = ["org.gnome.eog.desktop"]; - "image/png" = ["org.gnome.eog.desktop"]; - "image/webp" = ["org.gnome.eog.desktop"]; - "x-scheme-handler/tg" = ["org.telegram.desktop.desktop"]; + "application/pdf" = [ "org.gnome.Evince.desktop" ]; + "image/gif" = [ "org.gnome.eog.desktop" ]; + "image/jpeg" = [ "org.gnome.eog.desktop" ]; + "image/png" = [ "org.gnome.eog.desktop" ]; + "image/webp" = [ "org.gnome.eog.desktop" ]; + "x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ]; }; }; userDirs.enable = true; diff --git a/home/gtk.nix b/home/gtk.nix index 58e63ef..947cc7a 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -1,8 +1,8 @@ -{ - lib, - pkgs, - ... -}: let +{ lib +, pkgs +, ... +}: +let gtkTheme = { name = "Dracula"; package = pkgs.dracula-gtk; @@ -10,14 +10,15 @@ iconTheme = { name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme.override {color = "black";}; + package = pkgs.papirus-icon-theme.override { color = "black"; }; }; cursorTheme = { name = "Bibata-Modern-Classic"; package = pkgs.bibata-cursors; }; -in { +in +{ gtk = { enable = true; theme = gtkTheme; diff --git a/home/programs/default.nix b/home/programs/default.nix index b44ec4c..066ccd3 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { imports = [ ./aria2.nix ./bat.nix diff --git a/home/programs/eza.nix b/home/programs/eza.nix index 9b8846d..c7e54ec 100644 --- a/home/programs/eza.nix +++ b/home/programs/eza.nix @@ -2,7 +2,7 @@ _: { programs.eza = { enable = true; enableAliases = true; - extraOptions = ["--group-directories-first" "--group"]; + extraOptions = [ "--group-directories-first" "--group" ]; git = true; icons = true; }; diff --git a/home/programs/files.nix b/home/programs/files.nix index 0778421..345b01d 100644 --- a/home/programs/files.nix +++ b/home/programs/files.nix @@ -1,5 +1,5 @@ -{pkgs, ...}: { - home.packages = [pkgs.gnome.nautilus]; +{ pkgs, ... }: { + home.packages = [ pkgs.gnome.nautilus ]; dconf.settings = { "io/elementary/files/preferences" = { singleclick-select = true; diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix index 93a64b2..0ff53c4 100644 --- a/home/programs/firefox.nix +++ b/home/programs/firefox.nix @@ -1,7 +1,6 @@ -{ - pkgs, - osConfig, - ... +{ pkgs +, osConfig +, ... }: { programs = { firefox = { diff --git a/home/programs/git.nix b/home/programs/git.nix index 142008b..1c57913 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -1,6 +1,8 @@ -{secrets, ...}: let +{ secrets, ... }: +let user = secrets.users; -in { +in +{ programs.git = { enable = true; delta = { @@ -27,6 +29,6 @@ in { push.autoSetupRemote = true; pull.rebase = true; }; - ignores = ["/.nix" "/.direnv"]; + ignores = [ "/.nix" "/.direnv" ]; }; } diff --git a/home/programs/github-cli.nix b/home/programs/github-cli.nix index 6be2be9..8188f76 100644 --- a/home/programs/github-cli.nix +++ b/home/programs/github-cli.nix @@ -1,7 +1,7 @@ -{pkgs, ...}: { +{ pkgs, ... }: { programs.gh = { enable = true; settings.git_protocol = "ssh"; - extensions = [pkgs.gh-dash]; + extensions = [ pkgs.gh-dash ]; }; } diff --git a/home/programs/kitty.nix b/home/programs/kitty.nix index d734566..e81f1fd 100644 --- a/home/programs/kitty.nix +++ b/home/programs/kitty.nix @@ -1,14 +1,16 @@ -{pkgs, ...}: let +{ pkgs, ... }: +let dracula-kitty = pkgs.fetchFromGitHub { owner = "dracula"; repo = "kitty"; rev = "87717a3f00e3dff0fc10c93f5ff535ea4092de70"; hash = "sha256-78PTH9wE6ktuxeIxrPp0ZgRI8ST+eZ3Ok2vW6BCIZkc="; }; -in { +in +{ programs.kitty = { enable = true; - font.package = pkgs.nerdfonts.override {fonts = ["FiraCode"];}; + font.package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; font.name = "FiraCode Nerd Font"; extraConfig = '' font_size 14 diff --git a/home/programs/mpv.nix b/home/programs/mpv.nix index 72d1406..06c9f2b 100644 --- a/home/programs/mpv.nix +++ b/home/programs/mpv.nix @@ -1,15 +1,15 @@ -{pkgs, ...}: { +{ pkgs, ... }: { programs.mpv = { enable = true; - package = pkgs.mpv.override {youtubeSupport = true;}; + package = pkgs.mpv.override { youtubeSupport = true; }; config = { cache = "yes"; cache-secs = "120"; hwdec = "auto-safe"; gpu-context = "wayland"; }; - defaultProfiles = ["gpu-hq"]; - scripts = with pkgs.mpvScripts; [mpris]; + defaultProfiles = [ "gpu-hq" ]; + scripts = with pkgs.mpvScripts; [ mpris ]; }; xdg.desktopEntries = { diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index f328a0e..af4b047 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { xdg.desktopEntries = { "nvim".name = "Neovim wrapper"; "nvim".exec = "nvim %F"; @@ -154,10 +154,10 @@ enable = true; snippet.expand = "luasnip"; sources = [ - {name = "nvim_lsp";} - {name = "luasnip";} - {name = "buffers";} - {name = "treesitter";} + { name = "nvim_lsp"; } + { name = "luasnip"; } + { name = "buffers"; } + { name = "treesitter"; } ]; }; telescope = { diff --git a/home/programs/tmux.nix b/home/programs/tmux.nix index cf7de94..c12514a 100644 --- a/home/programs/tmux.nix +++ b/home/programs/tmux.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { programs.tmux = { enable = true; escapeTime = 0; diff --git a/home/programs/virt-manager.nix b/home/programs/virt-manager.nix index b503650..a235947 100644 --- a/home/programs/virt-manager.nix +++ b/home/programs/virt-manager.nix @@ -1,18 +1,18 @@ -{pkgs, ...}: { - home.packages = [pkgs.virt-manager]; +{ pkgs, ... }: { + home.packages = [ pkgs.virt-manager ]; dconf.settings = { "org/virt-manager/virt-manager/confirm" = { forcepoweroff = false; }; "org/virt-manager/virt-manager/connections" = { - autoconnect = ["qemu:///system"]; - uris = ["qemu:///system"]; + autoconnect = [ "qemu:///system" ]; + uris = [ "qemu:///system" ]; }; - "org/virt-manager/virt-manager/new-vm" = {firmware = "uefi";}; + "org/virt-manager/virt-manager/new-vm" = { firmware = "uefi"; }; "org/virt-manager/virt-manager/stats" = { enable-disk-poll = true; enable-net-poll = true; }; - "org/virt-manager/virt-manager/vmlist-fields" = {network-traffic = true;}; + "org/virt-manager/virt-manager/vmlist-fields" = { network-traffic = true; }; }; } diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix index 89ceacb..055f0a0 100644 --- a/home/programs/zsh.nix +++ b/home/programs/zsh.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { programs.zsh = { enable = true; diff --git a/home/services/aria2c.nix b/home/services/aria2c.nix index e9b8162..534fae0 100644 --- a/home/services/aria2c.nix +++ b/home/services/aria2c.nix @@ -1,17 +1,16 @@ -{ - config, - pkgs, - secrets, - ... +{ config +, pkgs +, secrets +, ... }: { systemd.user.services = { ariang = { Unit = { Description = "AriaNg: Web frontend for aria2c"; - After = ["network.target" "aria2c.service"]; + After = [ "network.target" "aria2c.service" ]; }; Install = { - WantedBy = ["default.target"]; + WantedBy = [ "default.target" ]; }; Service = { Type = "simple"; @@ -23,11 +22,11 @@ aria2c = { Unit = { Description = "Aria2c Download Manager"; - Documentation = ["man:aria2c(1)"]; - After = ["network.target"]; + Documentation = [ "man:aria2c(1)" ]; + After = [ "network.target" ]; }; Install = { - WantedBy = ["default.target" "ariang.service"]; + WantedBy = [ "default.target" "ariang.service" ]; }; Service = { Type = "simple"; diff --git a/home/services/spotifyd.nix b/home/services/spotifyd.nix index 150a0c4..b6684e4 100644 --- a/home/services/spotifyd.nix +++ b/home/services/spotifyd.nix @@ -1,7 +1,6 @@ -{ - pkgs, - secrets, - ... +{ pkgs +, secrets +, ... }: { services = { spotifyd = { diff --git a/home/wm/addon/default.nix b/home/wm/addon/default.nix index a840cf2..6d53568 100644 --- a/home/wm/addon/default.nix +++ b/home/wm/addon/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { imports = [ ./rofi ./waybar diff --git a/home/wm/addon/dunst.nix b/home/wm/addon/dunst.nix index 399fb45..4bf7daf 100644 --- a/home/wm/addon/dunst.nix +++ b/home/wm/addon/dunst.nix @@ -1,11 +1,12 @@ -{ - config, - pkgs, - ... -}: let +{ config +, pkgs +, ... +}: +let dmenu = "${config.programs.rofi.package}/bin/rofi -dmenu"; firefox = "${config.programs.firefox.package}/bin/firefox"; -in { +in +{ services.dunst = { enable = true; iconTheme.name = config.gtk.iconTheme.name; diff --git a/home/wm/addon/rofi/default.nix b/home/wm/addon/rofi/default.nix index 0360e82..7848c71 100644 --- a/home/wm/addon/rofi/default.nix +++ b/home/wm/addon/rofi/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { programs.rofi = { enable = true; cycle = false; diff --git a/home/wm/addon/swayidle.nix b/home/wm/addon/swayidle.nix index 097e548..efdab1a 100644 --- a/home/wm/addon/swayidle.nix +++ b/home/wm/addon/swayidle.nix @@ -1,7 +1,9 @@ -{pkgs, ...}: let +{ pkgs, ... }: +let swaylock = "${pkgs.swaylock}/bin/swaylock"; hyprctl = "${pkgs.hyprland}/bin/hyprctl"; -in { +in +{ services.swayidle = { enable = true; systemdTarget = "graphical-session.target"; diff --git a/home/wm/addon/waybar/default.nix b/home/wm/addon/waybar/default.nix index da468eb..575a4e5 100644 --- a/home/wm/addon/waybar/default.nix +++ b/home/wm/addon/waybar/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { programs.waybar = { enable = true; package = pkgs.waybar.override { @@ -12,9 +12,9 @@ layer = "top"; position = "top"; height = 28; - modules-left = ["hyprland/workspaces" "hyprland/window" "hyprland/submap"]; - modules-center = []; - modules-right = ["tray" "idle_inhibitor" "network" "bluetooth" "wireplumber" "backlight" "battery" "clock"]; + modules-left = [ "hyprland/workspaces" "hyprland/window" "hyprland/submap" ]; + modules-center = [ ]; + modules-right = [ "tray" "idle_inhibitor" "network" "bluetooth" "wireplumber" "backlight" "battery" "clock" ]; idle_inhibitor = { format = "{icon}"; format-icons = { @@ -31,7 +31,7 @@ }; backlight = { format = "{icon}"; - format-icons = ["󰃚" "󰃛" "󰃜" "󰃝" "󰃞" "󰃟" "󰃠"]; + format-icons = [ "󰃚" "󰃛" "󰃜" "󰃝" "󰃞" "󰃟" "󰃠" ]; tooltip = false; }; battery = { @@ -44,7 +44,7 @@ format-alt = "{icon} {capacity}% ({time})"; format-charging = "󰂄 {capacity}%"; format-plugged = "‭󰚥 {capacity}%"; - format-icons = ["󰂃" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"]; + format-icons = [ "󰂃" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ]; tooltip = false; }; network = { @@ -59,7 +59,7 @@ format = "{icon}"; format-muted = "‭󰝟"; on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; - format-icons = ["󰕿" "󰖀" "󰕾"]; + format-icons = [ "󰕿" "󰖀" "󰕾" ]; tooltip = false; }; bluetooth = { diff --git a/home/wm/default.nix b/home/wm/default.nix index 02f7ac0..1699b56 100644 --- a/home/wm/default.nix +++ b/home/wm/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { imports = [ ./hyprland ./addon diff --git a/home/wm/hyprland/default.nix b/home/wm/hyprland/default.nix index 9207d02..4c8087a 100644 --- a/home/wm/hyprland/default.nix +++ b/home/wm/hyprland/default.nix @@ -1,8 +1,8 @@ -{ - config, - pkgs, - ... -}: let +{ config +, pkgs +, ... +}: +let dbus-update-activation-environment = "${pkgs.dbus}/bin/dbus-update-activation-environment"; brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl"; grim = "${pkgs.grim}/bin/grim"; @@ -17,7 +17,8 @@ xdg-user-dir = "${pkgs.xdg-user-dirs}/bin/xdg-user-dir"; change-wallpaper = "${pkgs.scripts}/bin/chpaper ${config.xdg.userDirs.pictures}/Wallpapers"; wallhaven-wallpaper = "${pkgs.scripts}/bin/chpaper \$(${pkgs.scripts}/bin/wallhaven ${config.xdg.userDirs.pictures}/Wallpapers)"; -in { +in +{ home.packages = with pkgs; [ hyprland ]; @@ -25,11 +26,11 @@ in { systemd.user.targets = { hyprland-session = { Unit = { - After = ["graphical-session-pre.target"]; - BindsTo = ["graphical-session.target"]; + After = [ "graphical-session-pre.target" ]; + BindsTo = [ "graphical-session.target" ]; Description = "Hyprland session"; - Documentation = ["man:systemd.special(7)"]; - Wants = ["graphical-session-pre.target"]; + Documentation = [ "man:systemd.special(7)" ]; + Wants = [ "graphical-session-pre.target" ]; }; }; }; diff --git a/hosts/rico1/containers/default.nix b/hosts/rico1/containers/default.nix index f6b3d35..58a943f 100644 --- a/hosts/rico1/containers/default.nix +++ b/hosts/rico1/containers/default.nix @@ -1,5 +1,5 @@ _: { - imports = []; + imports = [ ]; virtualisation.oci-containers = { backend = "podman"; diff --git a/hosts/rico1/default.nix b/hosts/rico1/default.nix index 645df76..6cfa02a 100644 --- a/hosts/rico1/default.nix +++ b/hosts/rico1/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { imports = [ ./hardware ./programs @@ -25,7 +25,7 @@ LC_TIME = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8"; }; - supportedLocales = ["en_US.UTF-8/UTF-8"]; + supportedLocales = [ "en_US.UTF-8/UTF-8" ]; }; time.timeZone = "Asia/Kolkata"; diff --git a/hosts/rico1/hardware/default.nix b/hosts/rico1/hardware/default.nix index 15eca2b..bb25f2f 100644 --- a/hosts/rico1/hardware/default.nix +++ b/hosts/rico1/hardware/default.nix @@ -1,3 +1,3 @@ -{...}: { - imports = [./filesystem.nix ./kernel.nix]; +{ ... }: { + imports = [ ./filesystem.nix ./kernel.nix ]; } diff --git a/hosts/rico1/hardware/filesystem.nix b/hosts/rico1/hardware/filesystem.nix index c790e1e..8cc3afb 100644 --- a/hosts/rico1/hardware/filesystem.nix +++ b/hosts/rico1/hardware/filesystem.nix @@ -2,7 +2,7 @@ _: { fileSystems."/" = { device = "/dev/disk/by-partlabel/NIXOS_ROOT"; fsType = "btrfs"; - options = ["noatime" "compress=zstd"]; + options = [ "noatime" "compress=zstd" ]; }; fileSystems."/boot" = { device = "/dev/disk/by-partlabel/ESP"; diff --git a/hosts/rico1/hardware/kernel.nix b/hosts/rico1/hardware/kernel.nix index 2264185..e29e060 100644 --- a/hosts/rico1/hardware/kernel.nix +++ b/hosts/rico1/hardware/kernel.nix @@ -1,7 +1,6 @@ -{ - lib, - pkgs, - ... +{ lib +, pkgs +, ... }: { boot = { initrd = { diff --git a/hosts/rico1/network.nix b/hosts/rico1/network.nix index 1e8aef1..5e1b6f0 100644 --- a/hosts/rico1/network.nix +++ b/hosts/rico1/network.nix @@ -1,5 +1,5 @@ -{lib, ...}: { - imports = [./wireguard.nix]; +{ lib, ... }: { + imports = [ ./wireguard.nix ]; networking = { hostName = "Rico1"; useDHCP = lib.mkDefault false; diff --git a/hosts/rico1/programs/default.nix b/hosts/rico1/programs/default.nix index e85c1c4..dfffea1 100644 --- a/hosts/rico1/programs/default.nix +++ b/hosts/rico1/programs/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { imports = [ ./neovim.nix ./starship.nix diff --git a/hosts/rico1/programs/zsh.nix b/hosts/rico1/programs/zsh.nix index 2a3cb10..53468ac 100644 --- a/hosts/rico1/programs/zsh.nix +++ b/hosts/rico1/programs/zsh.nix @@ -6,5 +6,5 @@ _: { syntaxHighlighting.enable = true; }; }; - environment.pathsToLink = ["/share/zsh"]; + environment.pathsToLink = [ "/share/zsh" ]; } diff --git a/hosts/rico1/services/caddy.nix b/hosts/rico1/services/caddy.nix index 38e3057..80a7e2c 100644 --- a/hosts/rico1/services/caddy.nix +++ b/hosts/rico1/services/caddy.nix @@ -1,4 +1,4 @@ -{secrets, ...}: { +{ secrets, ... }: { services.caddy = { enable = true; inherit (secrets.caddy_config) email; diff --git a/hosts/rico1/services/default.nix b/hosts/rico1/services/default.nix index fcb75bb..9d6125c 100644 --- a/hosts/rico1/services/default.nix +++ b/hosts/rico1/services/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { imports = [ ./caddy.nix ./dendrite diff --git a/hosts/rico1/services/dendrite/default.nix b/hosts/rico1/services/dendrite/default.nix index 6495749..16ed081 100644 --- a/hosts/rico1/services/dendrite/default.nix +++ b/hosts/rico1/services/dendrite/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { services = { caddy.virtualHosts."matrix.adtya.xyz" = { extraConfig = '' @@ -9,8 +9,8 @@ }; systemd.services.dendrite = { description = "Dendrite Matrix homeserver"; - after = ["network.target"]; - wantedBy = ["multi-user.target"]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "simple"; DynamicUser = true; diff --git a/hosts/rico1/services/frpc.nix b/hosts/rico1/services/frpc.nix index 56877e1..d8baf9f 100644 --- a/hosts/rico1/services/frpc.nix +++ b/hosts/rico1/services/frpc.nix @@ -1,10 +1,11 @@ -{ - pkgs, - secrets, - ... -}: let +{ pkgs +, secrets +, ... +}: +let inherit (secrets) frp_config; -in { +in +{ services.frp = { enable = true; role = "client"; diff --git a/hosts/rico1/services/postgresql.nix b/hosts/rico1/services/postgresql.nix index f1e147f..c11fffc 100644 --- a/hosts/rico1/services/postgresql.nix +++ b/hosts/rico1/services/postgresql.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { services.postgresql = { enable = true; authentication = pkgs.lib.mkOverride 10 '' @@ -6,7 +6,7 @@ host all all 127.0.0.1/32 trust host all all ::1/128 trust ''; - ensureDatabases = ["dendrite"]; + ensureDatabases = [ "dendrite" ]; ensureUsers = [ { name = "dendrite"; diff --git a/hosts/rico1/wireguard.nix b/hosts/rico1/wireguard.nix index 2ed8f9c..c813f0d 100644 --- a/hosts/rico1/wireguard.nix +++ b/hosts/rico1/wireguard.nix @@ -1,11 +1,12 @@ -{ - config, - secrets, - ... -}: let +{ config +, secrets +, ... +}: +let inherit (secrets.wireguard_config) peers; -in { - networking.firewall.trustedInterfaces = ["wg0"]; +in +{ + networking.firewall.trustedInterfaces = [ "wg0" ]; networking.wireguard = { enable = true; interfaces = { diff --git a/hosts/rico2/containers/default.nix b/hosts/rico2/containers/default.nix index dd5a697..797cc9d 100644 --- a/hosts/rico2/containers/default.nix +++ b/hosts/rico2/containers/default.nix @@ -1,5 +1,5 @@ -{...}: { - imports = []; +{ ... }: { + imports = [ ]; virtualisation.oci-containers = { backend = "podman"; diff --git a/hosts/rico2/default.nix b/hosts/rico2/default.nix index 645df76..6cfa02a 100644 --- a/hosts/rico2/default.nix +++ b/hosts/rico2/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { imports = [ ./hardware ./programs @@ -25,7 +25,7 @@ LC_TIME = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8"; }; - supportedLocales = ["en_US.UTF-8/UTF-8"]; + supportedLocales = [ "en_US.UTF-8/UTF-8" ]; }; time.timeZone = "Asia/Kolkata"; diff --git a/hosts/rico2/hardware/default.nix b/hosts/rico2/hardware/default.nix index 15eca2b..bb25f2f 100644 --- a/hosts/rico2/hardware/default.nix +++ b/hosts/rico2/hardware/default.nix @@ -1,3 +1,3 @@ -{...}: { - imports = [./filesystem.nix ./kernel.nix]; +{ ... }: { + imports = [ ./filesystem.nix ./kernel.nix ]; } diff --git a/hosts/rico2/hardware/filesystem.nix b/hosts/rico2/hardware/filesystem.nix index c790e1e..8cc3afb 100644 --- a/hosts/rico2/hardware/filesystem.nix +++ b/hosts/rico2/hardware/filesystem.nix @@ -2,7 +2,7 @@ _: { fileSystems."/" = { device = "/dev/disk/by-partlabel/NIXOS_ROOT"; fsType = "btrfs"; - options = ["noatime" "compress=zstd"]; + options = [ "noatime" "compress=zstd" ]; }; fileSystems."/boot" = { device = "/dev/disk/by-partlabel/ESP"; diff --git a/hosts/rico2/hardware/kernel.nix b/hosts/rico2/hardware/kernel.nix index 2264185..e29e060 100644 --- a/hosts/rico2/hardware/kernel.nix +++ b/hosts/rico2/hardware/kernel.nix @@ -1,7 +1,6 @@ -{ - lib, - pkgs, - ... +{ lib +, pkgs +, ... }: { boot = { initrd = { diff --git a/hosts/rico2/network.nix b/hosts/rico2/network.nix index 960ada2..e0ed736 100644 --- a/hosts/rico2/network.nix +++ b/hosts/rico2/network.nix @@ -1,5 +1,5 @@ -{lib, ...}: { - imports = [./wireguard.nix]; +{ lib, ... }: { + imports = [ ./wireguard.nix ]; networking = { hostName = "Rico2"; useDHCP = lib.mkDefault false; diff --git a/hosts/rico2/programs/default.nix b/hosts/rico2/programs/default.nix index e85c1c4..dfffea1 100644 --- a/hosts/rico2/programs/default.nix +++ b/hosts/rico2/programs/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { imports = [ ./neovim.nix ./starship.nix diff --git a/hosts/rico2/programs/zsh.nix b/hosts/rico2/programs/zsh.nix index 2a3cb10..53468ac 100644 --- a/hosts/rico2/programs/zsh.nix +++ b/hosts/rico2/programs/zsh.nix @@ -6,5 +6,5 @@ _: { syntaxHighlighting.enable = true; }; }; - environment.pathsToLink = ["/share/zsh"]; + environment.pathsToLink = [ "/share/zsh" ]; } diff --git a/hosts/rico2/services/adtya.xyz.nix b/hosts/rico2/services/adtya.xyz.nix index 5571d73..42b688e 100644 --- a/hosts/rico2/services/adtya.xyz.nix +++ b/hosts/rico2/services/adtya.xyz.nix @@ -1,14 +1,15 @@ -{ - pkgs, - www, - secrets, - ... -}: let +{ pkgs +, www +, secrets +, ... +}: +let system = pkgs.system; -in { +in +{ services = { caddy.virtualHosts."adtya.xyz" = { - serverAliases = ["www.adtya.xyz"]; + serverAliases = [ "www.adtya.xyz" ]; extraConfig = '' handle /.well-known/matrix/server { header Content-Type application/json diff --git a/hosts/rico2/services/caddy.nix b/hosts/rico2/services/caddy.nix index 97331f3..d6a01d3 100644 --- a/hosts/rico2/services/caddy.nix +++ b/hosts/rico2/services/caddy.nix @@ -1,7 +1,6 @@ -{ - config, - secrets, - ... +{ config +, secrets +, ... }: { services.caddy = { enable = true; diff --git a/hosts/rico2/services/default.nix b/hosts/rico2/services/default.nix index 82db512..760a819 100644 --- a/hosts/rico2/services/default.nix +++ b/hosts/rico2/services/default.nix @@ -1,3 +1,3 @@ _: { - imports = [./adtya.xyz.nix ./caddy.nix ./frpc.nix ./if3.nix ./proofs.nix ./ssh.nix ./wiki.nix]; + imports = [ ./adtya.xyz.nix ./caddy.nix ./frpc.nix ./if3.nix ./proofs.nix ./ssh.nix ./wiki.nix ]; } diff --git a/hosts/rico2/services/frpc.nix b/hosts/rico2/services/frpc.nix index efd3b5b..75fb808 100644 --- a/hosts/rico2/services/frpc.nix +++ b/hosts/rico2/services/frpc.nix @@ -1,10 +1,11 @@ -{ - pkgs, - secrets, - ... -}: let +{ pkgs +, secrets +, ... +}: +let inherit (secrets) frp_config; -in { +in +{ services.frp = { enable = true; role = "client"; diff --git a/hosts/rico2/services/if3.nix b/hosts/rico2/services/if3.nix index 592612f..28703a1 100644 --- a/hosts/rico2/services/if3.nix +++ b/hosts/rico2/services/if3.nix @@ -1,10 +1,11 @@ -{ - pkgs, - if3, - ... -}: let +{ pkgs +, if3 +, ... +}: +let system = pkgs.system; -in { +in +{ services = { caddy.virtualHosts = { "if3.adtya.xyz" = { diff --git a/hosts/rico2/services/proofs.nix b/hosts/rico2/services/proofs.nix index 14742bd..9590cda 100644 --- a/hosts/rico2/services/proofs.nix +++ b/hosts/rico2/services/proofs.nix @@ -1,7 +1,6 @@ -{ - config, - secrets, - ... +{ config +, secrets +, ... }: { services = { caddy.virtualHosts = { diff --git a/hosts/rico2/services/wiki.nix b/hosts/rico2/services/wiki.nix index eabb3cb..bdb8998 100644 --- a/hosts/rico2/services/wiki.nix +++ b/hosts/rico2/services/wiki.nix @@ -1,10 +1,11 @@ -{ - pkgs, - wiki, - ... -}: let +{ pkgs +, wiki +, ... +}: +let system = pkgs.system; -in { +in +{ services = { caddy.virtualHosts = { "wiki.adtya.xyz" = { diff --git a/hosts/rico2/wireguard.nix b/hosts/rico2/wireguard.nix index 2ed8f9c..c813f0d 100644 --- a/hosts/rico2/wireguard.nix +++ b/hosts/rico2/wireguard.nix @@ -1,11 +1,12 @@ -{ - config, - secrets, - ... -}: let +{ config +, secrets +, ... +}: +let inherit (secrets.wireguard_config) peers; -in { - networking.firewall.trustedInterfaces = ["wg0"]; +in +{ + networking.firewall.trustedInterfaces = [ "wg0" ]; networking.wireguard = { enable = true; interfaces = { diff --git a/hosts/skipper/default.nix b/hosts/skipper/default.nix index fc66197..501c507 100644 --- a/hosts/skipper/default.nix +++ b/hosts/skipper/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { imports = [ ./hardware ./programs @@ -24,7 +24,7 @@ packages = with pkgs; [ cantarell-fonts liberation_ttf - (nerdfonts.override {fonts = ["FiraCode"];}) + (nerdfonts.override { fonts = [ "FiraCode" ]; }) noto-fonts noto-fonts-cjk noto-fonts-emoji @@ -47,7 +47,7 @@ LC_TIME = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8"; }; - supportedLocales = ["en_US.UTF-8/UTF-8"]; + supportedLocales = [ "en_US.UTF-8/UTF-8" ]; }; location.provider = "geoclue2"; @@ -57,7 +57,7 @@ xdg.portal = { enable = true; - extraPortals = with pkgs; [xdg-desktop-portal-gtk xdg-desktop-portal-hyprland]; + extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-hyprland ]; }; system.stateVersion = "23.11"; diff --git a/hosts/skipper/hardware/default.nix b/hosts/skipper/hardware/default.nix index 2fc4887..0a2d148 100644 --- a/hosts/skipper/hardware/default.nix +++ b/hosts/skipper/hardware/default.nix @@ -1,9 +1,8 @@ -{ - lib, - pkgs, - ... +{ lib +, pkgs +, ... }: { - imports = [./kernel.nix ./filesystem.nix]; + imports = [ ./kernel.nix ./filesystem.nix ]; boot = { initrd.luks.devices = { @@ -16,10 +15,10 @@ }; loader.efi.canTouchEfiVariables = true; resumeDevice = "/dev/vg0/swap"; - supportedFilesystems = ["btrfs"]; + supportedFilesystems = [ "btrfs" ]; }; - swapDevices = [{device = "/dev/vg0/swap";}]; + swapDevices = [{ device = "/dev/vg0/swap"; }]; hardware = { bluetooth = { @@ -30,20 +29,20 @@ KernelExperimental = true; }; }; - package = pkgs.bluez.override {withExperimental = true;}; + package = pkgs.bluez.override { withExperimental = true; }; }; cpu.intel.updateMicrocode = lib.mkDefault true; enableRedistributableFirmware = true; gpgSmartcards.enable = true; opengl = { enable = true; - extraPackages = [pkgs.intel-media-driver]; + extraPackages = [ pkgs.intel-media-driver ]; driSupport = true; driSupport32Bit = true; }; sensor.hddtemp = { enable = true; - drives = ["/dev/disk/by-path/pci-0000:01:00.0-nvme-1"]; + drives = [ "/dev/disk/by-path/pci-0000:01:00.0-nvme-1" ]; }; xone.enable = true; }; diff --git a/hosts/skipper/hardware/filesystem.nix b/hosts/skipper/hardware/filesystem.nix index 13a6449..4f9aee6 100644 --- a/hosts/skipper/hardware/filesystem.nix +++ b/hosts/skipper/hardware/filesystem.nix @@ -3,30 +3,30 @@ _: { "/" = { device = "/dev/vg0/system"; fsType = "btrfs"; - options = ["subvol=@root" "compress-force=zstd" "noatime"]; + options = [ "subvol=@root" "compress-force=zstd" "noatime" ]; neededForBoot = true; }; "/home" = { device = "/dev/vg0/system"; fsType = "btrfs"; - options = ["subvol=@home" "compress-force=zstd" "noatime"]; + options = [ "subvol=@home" "compress-force=zstd" "noatime" ]; }; "/nix" = { device = "/dev/vg0/system"; fsType = "btrfs"; - options = ["subvol=/@nix" "compress-force=zstd" "noatime"]; + options = [ "subvol=/@nix" "compress-force=zstd" "noatime" ]; neededForBoot = true; }; "/persist" = { device = "/dev/vg0/system"; fsType = "btrfs"; - options = ["subvol=/@persist" "compress-force=zstd" "noatime"]; + options = [ "subvol=/@persist" "compress-force=zstd" "noatime" ]; neededForBoot = true; }; "/mnt/system" = { device = "/dev/vg0/system"; fsType = "btrfs"; - options = ["subvol=/" "compress-force=zstd" "noatime"]; + options = [ "subvol=/" "compress-force=zstd" "noatime" ]; }; "/boot" = { device = "/dev/disk/by-partlabel/ESP"; diff --git a/hosts/skipper/hardware/kernel.nix b/hosts/skipper/hardware/kernel.nix index 9384c57..fbe477c 100644 --- a/hosts/skipper/hardware/kernel.nix +++ b/hosts/skipper/hardware/kernel.nix @@ -1,7 +1,6 @@ -{ - lib, - pkgs, - ... +{ lib +, pkgs +, ... }: { boot = { consoleLogLevel = 3; @@ -15,12 +14,12 @@ "sd_mod" "rtsx_pci_sdmmc" ]; - kernelModules = ["i915"]; + kernelModules = [ "i915" ]; systemd.enable = true; }; - kernelModules = ["kvm-intel"]; + kernelModules = [ "kvm-intel" ]; kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - kernelParams = ["quiet"]; + kernelParams = [ "quiet" ]; kernel.sysctl = { "vm.swappiness" = 0; }; diff --git a/hosts/skipper/network.nix b/hosts/skipper/network.nix index 80f6208..568c7e6 100644 --- a/hosts/skipper/network.nix +++ b/hosts/skipper/network.nix @@ -1,5 +1,5 @@ -{lib, ...}: { - imports = [./wireguard.nix]; +{ lib, ... }: { + imports = [ ./wireguard.nix ]; networking = { hostName = "Skipper"; networkmanager = { diff --git a/hosts/skipper/plymouth.nix b/hosts/skipper/plymouth.nix index 6486674..fa1da40 100644 --- a/hosts/skipper/plymouth.nix +++ b/hosts/skipper/plymouth.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { boot.plymouth = { enable = true; themePackages = [ diff --git a/hosts/skipper/programs/default.nix b/hosts/skipper/programs/default.nix index ba63c68..e88f03f 100644 --- a/hosts/skipper/programs/default.nix +++ b/hosts/skipper/programs/default.nix @@ -12,5 +12,5 @@ _: { xwayland.enable = true; zsh.enable = true; }; - environment.pathsToLink = ["/share/zsh"]; + environment.pathsToLink = [ "/share/zsh" ]; } diff --git a/hosts/skipper/rollback.nix b/hosts/skipper/rollback.nix index 76c1347..73b0fb4 100644 --- a/hosts/skipper/rollback.nix +++ b/hosts/skipper/rollback.nix @@ -1,9 +1,9 @@ _: { boot.initrd.systemd.services.rollback = { description = "Rollback root subvolume to blank state"; - wantedBy = ["initrd.target"]; - after = ["dev-vg0-system.device"]; - before = ["sysroot.mount"]; + wantedBy = [ "initrd.target" ]; + after = [ "dev-vg0-system.device" ]; + before = [ "sysroot.mount" ]; unitConfig.DefaultDependencies = "no"; serviceConfig.Type = "oneshot"; script = '' diff --git a/hosts/skipper/secureboot.nix b/hosts/skipper/secureboot.nix index 1252769..0e06ca5 100644 --- a/hosts/skipper/secureboot.nix +++ b/hosts/skipper/secureboot.nix @@ -1,7 +1,6 @@ -{ - lib, - pkgs, - ... +{ lib +, pkgs +, ... }: { boot = { bootspec.enable = true; diff --git a/hosts/skipper/security.nix b/hosts/skipper/security.nix index 6776638..26f5988 100644 --- a/hosts/skipper/security.nix +++ b/hosts/skipper/security.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { security = { apparmor = { enable = true; @@ -10,7 +10,7 @@ services = { passwd.enableGnomeKeyring = true; login.enableGnomeKeyring = true; - swaylock = {}; + swaylock = { }; }; u2f = { enable = true; @@ -21,7 +21,7 @@ polkit.enable = true; rtkit.enable = true; sudo = { - package = pkgs.sudo.override {withInsults = true;}; + package = pkgs.sudo.override { withInsults = true; }; extraConfig = '' Defaults lecture="never" ''; diff --git a/hosts/skipper/services/dbus.nix b/hosts/skipper/services/dbus.nix index e672190..d2a7310 100644 --- a/hosts/skipper/services/dbus.nix +++ b/hosts/skipper/services/dbus.nix @@ -1,7 +1,7 @@ -{pkgs, ...}: { +{ pkgs, ... }: { services.dbus = { enable = true; apparmor = "enabled"; - packages = with pkgs; [gcr gcr_4]; + packages = with pkgs; [ gcr gcr_4 ]; }; } diff --git a/hosts/skipper/services/default.nix b/hosts/skipper/services/default.nix index 16a3763..e57830c 100644 --- a/hosts/skipper/services/default.nix +++ b/hosts/skipper/services/default.nix @@ -1,6 +1,8 @@ -{secrets, ...}: let +{ secrets, ... }: +let user = secrets.users; -in { +in +{ imports = [ ./dbus.nix ./keyd.nix diff --git a/hosts/skipper/services/keyd.nix b/hosts/skipper/services/keyd.nix index c3481a6..22e1173 100644 --- a/hosts/skipper/services/keyd.nix +++ b/hosts/skipper/services/keyd.nix @@ -3,7 +3,7 @@ _: { enable = true; keyboards = { builtin = { - ids = ["0001:0001"]; + ids = [ "0001:0001" ]; settings = { main = { pageup = "noop"; diff --git a/hosts/skipper/services/udev.nix b/hosts/skipper/services/udev.nix index c3873af..277133b 100644 --- a/hosts/skipper/services/udev.nix +++ b/hosts/skipper/services/udev.nix @@ -1,6 +1,6 @@ -{pkgs, ...}: { +{ pkgs, ... }: { services.udev = { enable = true; - packages = [pkgs.yubikey-personalization]; + packages = [ pkgs.yubikey-personalization ]; }; } diff --git a/hosts/skipper/specialisation.nix b/hosts/skipper/specialisation.nix index 86aac17..8107266 100644 --- a/hosts/skipper/specialisation.nix +++ b/hosts/skipper/specialisation.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { specialisation = { linux_lts = { configuration = { diff --git a/hosts/skipper/virtualisation.nix b/hosts/skipper/virtualisation.nix index 9db5bd5..706c334 100644 --- a/hosts/skipper/virtualisation.nix +++ b/hosts/skipper/virtualisation.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { virtualisation = { docker = { enable = true; @@ -9,7 +9,7 @@ enable = true; qemu.ovmf = { enable = true; - packages = [pkgs.OVMFFull.fd]; + packages = [ pkgs.OVMFFull.fd ]; }; }; }; diff --git a/hosts/skipper/wireguard.nix b/hosts/skipper/wireguard.nix index 2ed8f9c..c813f0d 100644 --- a/hosts/skipper/wireguard.nix +++ b/hosts/skipper/wireguard.nix @@ -1,11 +1,12 @@ -{ - config, - secrets, - ... -}: let +{ config +, secrets +, ... +}: +let inherit (secrets.wireguard_config) peers; -in { - networking.firewall.trustedInterfaces = ["wg0"]; +in +{ + networking.firewall.trustedInterfaces = [ "wg0" ]; networking.wireguard = { enable = true; interfaces = { diff --git a/packages/adi1090x-plymouth/default.nix b/packages/adi1090x-plymouth/default.nix index 205708c..dd967d5 100644 --- a/packages/adi1090x-plymouth/default.nix +++ b/packages/adi1090x-plymouth/default.nix @@ -1,9 +1,9 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - pack ? "pack_1", - theme ? "cuts", +{ lib +, stdenvNoCC +, fetchFromGitHub +, pack ? "pack_1" +, theme ? "cuts" +, }: stdenvNoCC.mkDerivation { pname = "adi1090x-plymouth"; diff --git a/packages/default.nix b/packages/default.nix index 23c8d22..6229610 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,6 +1,6 @@ self: super: { - adi1090x-plymouth = super.callPackage ./adi1090x-plymouth {}; - dracula-gtk = super.callPackage ./dracula-gtk {}; - scripts = super.callPackage ./scripts {}; - rofi-bluetooth = super.callPackage ./rofi-bluetooth {}; + adi1090x-plymouth = super.callPackage ./adi1090x-plymouth { }; + dracula-gtk = super.callPackage ./dracula-gtk { }; + scripts = super.callPackage ./scripts { }; + rofi-bluetooth = super.callPackage ./rofi-bluetooth { }; } diff --git a/packages/dracula-gtk/default.nix b/packages/dracula-gtk/default.nix index 3e69436..e31980a 100644 --- a/packages/dracula-gtk/default.nix +++ b/packages/dracula-gtk/default.nix @@ -1,10 +1,10 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - gtk3, - gnome-themes-extra, - gtk-engine-murrine, +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, gnome-themes-extra +, gtk-engine-murrine +, }: stdenvNoCC.mkDerivation { pname = "dracula-gtk"; @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation { rev = "a0b0ab451447d374600a74519abaa0588f2fa536"; hash = "sha256-0Ndk9Mh58KU2eoG1Z/CzZPiLNxy2bdloq9p4gzMDu2M="; }; - nativeBuildInputs = [gtk3]; + nativeBuildInputs = [ gtk3 ]; buildInputs = [ gnome-themes-extra ]; - propagatedUserEnvPkgs = [gtk-engine-murrine]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' runHook preInstall @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { downloadPage = "https://github.com/dracula/gtk"; homepage = "https://draculatheme.com/gtk"; license = licenses.gpl3; - maintainers = with maintainers; [adtya]; + maintainers = with maintainers; [ adtya ]; platforms = platforms.linux; }; } diff --git a/packages/rofi-bluetooth/default.nix b/packages/rofi-bluetooth/default.nix index 16b0df8..df81d2b 100644 --- a/packages/rofi-bluetooth/default.nix +++ b/packages/rofi-bluetooth/default.nix @@ -1,10 +1,10 @@ -{ - lib, - fetchFromGitHub, - makeWrapper, - stdenvNoCC, - bluez, - rofi-wayland, +{ lib +, fetchFromGitHub +, makeWrapper +, stdenvNoCC +, bluez +, rofi-wayland +, }: stdenvNoCC.mkDerivation { pname = "rofi-bluetooth"; @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-1Xe3QFThIvJDCUznDP5ZBzwZEMuqmxpDIV+BcVvQDG8="; }; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix index 746951d..84d579f 100644 --- a/packages/scripts/default.nix +++ b/packages/scripts/default.nix @@ -1,25 +1,25 @@ -{ - lib, - stdenvNoCC, - makeWrapper, - libnotify, - rofi-wayland, - tmux, - kitty, - imagemagick, - hyprland, - swww, - jq, - curl, - ytfzf, - libsecret, +{ lib +, stdenvNoCC +, makeWrapper +, libnotify +, rofi-wayland +, tmux +, kitty +, imagemagick +, hyprland +, swww +, jq +, curl +, ytfzf +, libsecret +, }: stdenvNoCC.mkDerivation { pname = "scripts"; version = "1.0"; src = ./.; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin