diff --git a/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix index f9e46fd..0a381ef 100644 --- a/hosts/pinwheel/configuration.nix +++ b/hosts/pinwheel/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ inputs, system, config, pkgs, ... }: +{ inputs, system, pkgs, ... }: { imports = @@ -81,7 +81,7 @@ isNormalUser = true; description = "alex"; extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; []; + packages = []; }; # Allow unfree packages diff --git a/hosts/pinwheel/hardware-configuration.nix b/hosts/pinwheel/hardware-configuration.nix index 22a7802..9b46d5d 100644 --- a/hosts/pinwheel/hardware-configuration.nix +++ b/hosts/pinwheel/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/pinwheel/home.nix b/hosts/pinwheel/home.nix index dedc080..a4cb213 100644 --- a/hosts/pinwheel/home.nix +++ b/hosts/pinwheel/home.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: { home-manager = { useGlobalPkgs = true; @@ -14,7 +14,7 @@ home.packages = with pkgs; [ gnumake - tig + tig spotify onlyoffice-bin qmk diff --git a/hosts/pinwheel/modules/age/default.nix b/hosts/pinwheel/modules/age/default.nix index d0f5dba..0881e6f 100644 --- a/hosts/pinwheel/modules/age/default.nix +++ b/hosts/pinwheel/modules/age/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { age = { identityPaths = [ diff --git a/hosts/pinwheel/modules/bemenu/default.nix b/hosts/pinwheel/modules/bemenu/default.nix index cfa4eae..00e1365 100644 --- a/hosts/pinwheel/modules/bemenu/default.nix +++ b/hosts/pinwheel/modules/bemenu/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: { home-manager.users.alex = { home.packages = [ pkgs.bemenu ]; diff --git a/hosts/pinwheel/modules/calibre/default.nix b/hosts/pinwheel/modules/calibre/default.nix index 2ff8585..f670a96 100644 --- a/hosts/pinwheel/modules/calibre/default.nix +++ b/hosts/pinwheel/modules/calibre/default.nix @@ -1,9 +1,9 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: { home-manager.users.alex = { home.packages = [ pkgs.calibre ]; }; # Needed to access mounted e-readers - services.udisks2.enable = true; + services.udisks2.enable = true; } diff --git a/hosts/pinwheel/modules/emacs/default.nix b/hosts/pinwheel/modules/emacs/default.nix index 7238a9d..3f6b638 100644 --- a/hosts/pinwheel/modules/emacs/default.nix +++ b/hosts/pinwheel/modules/emacs/default.nix @@ -1,4 +1,4 @@ -{home-manager, pkgs, ... }: +{ pkgs, ... }: let emacs = pkgs.emacsWithPackagesFromUsePackage { package = pkgs.emacs-unstable; diff --git a/hosts/pinwheel/modules/firefox/default.nix b/hosts/pinwheel/modules/firefox/default.nix index 9021ff1..3bee597 100644 --- a/hosts/pinwheel/modules/firefox/default.nix +++ b/hosts/pinwheel/modules/firefox/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: let wrapped = pkgs.wrapFirefox pkgs.firefox-devedition-unwrapped { extraPolicies = { @@ -24,7 +24,7 @@ let SkipOnboarding = true; }; }; - }; + }; ff = pkgs.writeShellApplication { name = "ff"; diff --git a/hosts/pinwheel/modules/foot/default.nix b/hosts/pinwheel/modules/foot/default.nix index 9b95407..12fb563 100644 --- a/hosts/pinwheel/modules/foot/default.nix +++ b/hosts/pinwheel/modules/foot/default.nix @@ -1,9 +1,9 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: { home-manager.users.alex = { programs.foot = { enable = true; - + settings = { main = { term = "xterm-256color"; diff --git a/hosts/pinwheel/modules/git/default.nix b/hosts/pinwheel/modules/git/default.nix index b642f8a..9e5206e 100644 --- a/hosts/pinwheel/modules/git/default.nix +++ b/hosts/pinwheel/modules/git/default.nix @@ -1,4 +1,4 @@ -{ home-manager, ... }: +{ ... }: { home-manager.users.alex = { programs.git = { diff --git a/hosts/pinwheel/modules/go/default.nix b/hosts/pinwheel/modules/go/default.nix index d406257..a94e70a 100644 --- a/hosts/pinwheel/modules/go/default.nix +++ b/hosts/pinwheel/modules/go/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: { home-manager.users.alex = { home.packages = [ pkgs.gopls ]; diff --git a/hosts/pinwheel/modules/hyprland/default.nix b/hosts/pinwheel/modules/hyprland/default.nix index d14cdf3..86ccf2e 100644 --- a/hosts/pinwheel/modules/hyprland/default.nix +++ b/hosts/pinwheel/modules/hyprland/default.nix @@ -1,4 +1,4 @@ -{ home-manager, ... }: +{ ... }: { home-manager.users.alex = { wayland.windowManager.hyprland = { diff --git a/hosts/pinwheel/modules/light/default.nix b/hosts/pinwheel/modules/light/default.nix index 9c4d867..646ef2d 100644 --- a/hosts/pinwheel/modules/light/default.nix +++ b/hosts/pinwheel/modules/light/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: { users.users.alex.extraGroups = [ "video" ]; programs.light.enable = true; @@ -8,7 +8,7 @@ settings = { bind = [ ", XF86MonBrightnessUp, exec, ${pkgs.light}/bin/light -A 5" - ", XF86MonBrightnessDown, exec, ${pkgs.light}/bin/light -U 5" + ", XF86MonBrightnessDown, exec, ${pkgs.light}/bin/light -U 5" ]; }; }; diff --git a/hosts/pinwheel/modules/sound/default.nix b/hosts/pinwheel/modules/sound/default.nix index f1a3e83..4be61bc 100644 --- a/hosts/pinwheel/modules/sound/default.nix +++ b/hosts/pinwheel/modules/sound/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: { users.users.alex.extraGroups = [ "audio" ]; diff --git a/hosts/pinwheel/modules/ssh/default.nix b/hosts/pinwheel/modules/ssh/default.nix index 0fc9b13..2af473c 100644 --- a/hosts/pinwheel/modules/ssh/default.nix +++ b/hosts/pinwheel/modules/ssh/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ... }: +{ ... }: { home-manager.users.alex.programs.ssh = { enable = true; @@ -22,7 +22,7 @@ "/etc/ssh/pinwheel" "/home/alex/.ssh/alex.pinwheel" ]; - + secrets = { "alex.pinwheel-sombrero" = { file = ../../../../secrets/pinwheel/alex.pinwheel-sombrero.age; @@ -49,5 +49,5 @@ group = "users"; }; }; - }; + }; } diff --git a/hosts/pinwheel/modules/swaylock/default.nix b/hosts/pinwheel/modules/swaylock/default.nix index 42e79cb..b55b9a9 100644 --- a/hosts/pinwheel/modules/swaylock/default.nix +++ b/hosts/pinwheel/modules/swaylock/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: { home-manager.users.alex = { programs.swaylock = { diff --git a/hosts/pinwheel/modules/syncthing/default.nix b/hosts/pinwheel/modules/syncthing/default.nix index 3100bca..235fe14 100644 --- a/hosts/pinwheel/modules/syncthing/default.nix +++ b/hosts/pinwheel/modules/syncthing/default.nix @@ -1,9 +1,9 @@ -{ config, pkgs, ... }: +{ config, ... }: { services.syncthing = { enable = true; openDefaultPorts = true; - + cert = config.age.secrets.syncthing-cert.path; key = config.age.secrets.syncthing-key.path; @@ -11,13 +11,13 @@ group = "users"; dataDir = "/home/alex/sync"; - + settings = { devices = { sombrero.id = "DIKHOMV-QGZV3DR-FXQZH45-I5J5R4R-JJZS5BA-XNNW5C7-QSSU3XV-KVC4MAQ"; phone.id = "NJIMX57-C2CGV76-GXMAQYV-ABWDA7Z-TS6UV2X-NVL5UPG-UFEQH4C-TKYA6QM"; }; - + folders = { org = { path = "/home/alex/sync/org"; diff --git a/hosts/pinwheel/modules/tmux/default.nix b/hosts/pinwheel/modules/tmux/default.nix index 54a61e9..e31781f 100644 --- a/hosts/pinwheel/modules/tmux/default.nix +++ b/hosts/pinwheel/modules/tmux/default.nix @@ -1,4 +1,4 @@ -{ home-manger, pkgs, ... }: +{ pkgs, ... }: { home-manager.users.alex = { programs.tmux = { diff --git a/hosts/pinwheel/modules/vim/default.nix b/hosts/pinwheel/modules/vim/default.nix index fcbe902..9842524 100644 --- a/hosts/pinwheel/modules/vim/default.nix +++ b/hosts/pinwheel/modules/vim/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ...}: +{ ... }: { home-manager.users.alex = { programs.vim = { diff --git a/hosts/pinwheel/modules/waybar/default.nix b/hosts/pinwheel/modules/waybar/default.nix index 840cfdf..ba82222 100644 --- a/hosts/pinwheel/modules/waybar/default.nix +++ b/hosts/pinwheel/modules/waybar/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, ... }: +{ pkgs, ... }: { home-manager.users.alex = { programs.waybar = { diff --git a/hosts/pinwheel/modules/zsh/default.nix b/hosts/pinwheel/modules/zsh/default.nix index 2b2bc91..c470590 100644 --- a/hosts/pinwheel/modules/zsh/default.nix +++ b/hosts/pinwheel/modules/zsh/default.nix @@ -1,4 +1,4 @@ -{ home-manager, pkgs, lib, ... }: +{ pkgs, lib, ... }: { home-manager.users.alex = { programs.zsh = {