From e634c42b238c103d176e48de473c29b5dc12ff9c Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sun, 31 Aug 2025 15:13:01 -0500 Subject: [PATCH] formating --- flake.nix | 232 ++++++++++++++--------------- home/common/catppuccin.nix | 10 +- home/common/tmux.nix | 2 +- home/gui/mpv.nix | 2 +- home/work/citrix.nix | 20 +-- hosts/book/default.nix | 9 +- hosts/loki/default.nix | 11 +- hosts/smaug/default.nix | 9 +- hosts/vars.nix | 4 +- hosts/wm/sway/default.nix | 12 +- hosts/workstation/auto-cpufreq.nix | 16 +- 11 files changed, 141 insertions(+), 186 deletions(-) diff --git a/flake.nix b/flake.nix index 78e1c48..6ac9dc9 100644 --- a/flake.nix +++ b/flake.nix @@ -38,126 +38,118 @@ nvf.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs @ { - self, - nixpkgs, - nix, - nixpkgs-stable, - nixos-hardware, - home-manager, - catppuccin, - colmena, - ... - }: let - inherit (self) outputs; - lib = nixpkgs.lib // home-manager.lib; - in { - inherit lib; - nixpkgs.config.allowUnfree = true; - config.allowUnfree = true; - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) ["widevine-cdm"]; - colmena = { - meta = { - nixpkgs = import nixpkgs {system = "x86_64-linux";}; - specialArgs = {inherit inputs outputs;}; + outputs = inputs@{ self, nixpkgs, nix, nixpkgs-stable, nixos-hardware + , home-manager, catppuccin, colmena, ... }: + let + inherit (self) outputs; + lib = nixpkgs.lib // home-manager.lib; + in { + inherit lib; + nixpkgs.config.allowUnfree = true; + config.allowUnfree = true; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ "widevine-cdm" ]; + colmena = { + meta = { + nixpkgs = import nixpkgs { system = "x86_64-linux"; }; + specialArgs = { inherit inputs outputs; }; + }; + # ace = import ./hosts/ace/colmena.nix; # Acer C720 + book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme. + display = import ./hosts/display/colmena.nix; # Pi4 + # eve = import ./hosts/eve/colmena.nix; # Google Pixelbook 2017 w/ eMMC. + fred = import ./hosts/fred/colmena.nix; # acer server + loki = import ./hosts/loki/colmena.nix; # Dell XPS 13 + # pi1 = import ./hosts/pi1/colmena.nix; + # pocket2 = import ./hosts/pocket2/colmena.nix; + smaug = import ./hosts/smaug/colmena.nix; # Thinkpad x260 + w1 = import ./hosts/w1/colmena.nix; # Hetzner VPS + # w2 = import ./hosts/w2/colmena.nix; + }; + + nixosConfigurations = { + # clients + ace = lib.nixosSystem { + modules = [ ./hosts/ace ]; + specialArgs = { inherit inputs outputs; }; + }; + dragon = lib.nixosSystem { + modules = [ ./hosts/dragon ]; + specialArgs = { inherit inputs outputs; }; + }; + book = lib.nixosSystem { + modules = [ ./hosts/book ]; + specialArgs = { inherit inputs outputs; }; + }; + loki = lib.nixosSystem { + modules = [ ./hosts/loki ]; + specialArgs = { inherit inputs outputs; }; + }; + + pocket2 = lib.nixosSystem { + modules = [ ./hosts/pocket2 ]; + specialArgs = { inherit inputs outputs; }; + }; + smaug = lib.nixosSystem { + modules = [ ./hosts/smaug ]; + specialArgs = { inherit inputs outputs; }; + }; + t2 = lib.nixosSystem { + modules = [ ./hosts/t2 ]; + specialArgs = { inherit inputs outputs; }; + }; + pi1 = lib.nixosSystem { + modules = [ ./hosts/pi1 ]; + specialArgs = { inherit inputs outputs; }; + }; + + # servers + display = lib.nixosSystem { + modules = [ ./hosts/display ]; + specialArgs = { inherit inputs outputs; }; + }; + fred = lib.nixosSystem { + modules = [ ./hosts/fred ]; + specialArgs = { inherit inputs outputs; }; + }; + vm = lib.nixosSystem { + modules = [ + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix" + "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + ./hosts/vm + ]; + specialArgs = { inherit inputs outputs; }; + }; + harper2 = lib.nixosSystem { + modules = [ ./hosts/harper2 ]; + specialArgs = { inherit inputs outputs; }; + }; + harper = lib.nixosSystem { + modules = [ ./hosts/harper ]; + specialArgs = { inherit inputs outputs; }; + }; + nuwww = lib.nixosSystem { + modules = [ ./hosts/nuwww ]; + specialArgs = { inherit inputs outputs; }; + }; + pihole = lib.nixosSystem { + modules = [ ./hosts/pihole ]; + specialArgs = { inherit inputs outputs; }; + }; + www2 = lib.nixosSystem { + modules = [ ./hosts/www2 ]; + specialArgs = { inherit inputs outputs; }; + }; + w1 = lib.nixosSystem { + modules = [ ./hosts/w1 ]; + specialArgs = { inherit inputs outputs; }; + }; + # w2 = lib.nixosSystem { + # modules = [./hosts/w2]; + # specialArgs = { + # inherit inputs outputs; + # }; + # }; }; - # ace = import ./hosts/ace/colmena.nix; # Acer C720 - book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme. - display = import ./hosts/display/colmena.nix; # Pi4 - # eve = import ./hosts/eve/colmena.nix; # Google Pixelbook 2017 w/ eMMC. - fred = import ./hosts/fred/colmena.nix; # acer server - loki = import ./hosts/loki/colmena.nix; # Dell XPS 13 - # pi1 = import ./hosts/pi1/colmena.nix; - # pocket2 = import ./hosts/pocket2/colmena.nix; - smaug = import ./hosts/smaug/colmena.nix; # Thinkpad x260 - w1 = import ./hosts/w1/colmena.nix; # Hetzner VPS - # w2 = import ./hosts/w2/colmena.nix; }; - - nixosConfigurations = { - # clients - ace = lib.nixosSystem { - modules = [./hosts/ace]; - specialArgs = {inherit inputs outputs;}; - }; - dragon = lib.nixosSystem { - modules = [./hosts/dragon]; - specialArgs = {inherit inputs outputs;}; - }; - eve = lib.nixosSystem { - modules = [./hosts/eve]; - specialArgs = {inherit inputs outputs;}; - }; - loki = lib.nixosSystem { - modules = [./hosts/loki]; - specialArgs = {inherit inputs outputs;}; - }; - - pocket2 = lib.nixosSystem { - modules = [./hosts/pocket2]; - specialArgs = {inherit inputs outputs;}; - }; - smaug = lib.nixosSystem { - modules = [./hosts/smaug]; - specialArgs = {inherit inputs outputs;}; - }; - t2 = lib.nixosSystem { - modules = [./hosts/t2]; - specialArgs = {inherit inputs outputs;}; - }; - pi1 = lib.nixosSystem { - modules = [./hosts/pi1]; - specialArgs = {inherit inputs outputs;}; - }; - - # servers - display = lib.nixosSystem { - modules = [./hosts/display]; - specialArgs = {inherit inputs outputs;}; - }; - fred = lib.nixosSystem { - modules = [./hosts/fred]; - specialArgs = {inherit inputs outputs;}; - }; - vm = lib.nixosSystem { - modules = [ - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix" - "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" - ./hosts/vm - ]; - specialArgs = {inherit inputs outputs;}; - }; - harper2 = lib.nixosSystem { - modules = [./hosts/harper2]; - specialArgs = {inherit inputs outputs;}; - }; - harper = lib.nixosSystem { - modules = [./hosts/harper]; - specialArgs = {inherit inputs outputs;}; - }; - nuwww = lib.nixosSystem { - modules = [./hosts/nuwww]; - specialArgs = {inherit inputs outputs;}; - }; - pihole = lib.nixosSystem { - modules = [./hosts/pihole]; - specialArgs = {inherit inputs outputs;}; - }; - www2 = lib.nixosSystem { - modules = [./hosts/www2]; - specialArgs = {inherit inputs outputs;}; - }; - w1 = lib.nixosSystem { - modules = [./hosts/w1]; - specialArgs = {inherit inputs outputs;}; - }; - # w2 = lib.nixosSystem { - # modules = [./hosts/w2]; - # specialArgs = { - # inherit inputs outputs; - # }; - # }; - }; - }; } diff --git a/home/common/catppuccin.nix b/home/common/catppuccin.nix index 7fe121f..ab879a2 100644 --- a/home/common/catppuccin.nix +++ b/home/common/catppuccin.nix @@ -1,10 +1,10 @@ -{...}: { - gtk = {}; - qt = {style = {};}; +{ ... }: { + gtk = { }; + qt = { style = { }; }; catppuccin = { enable = true; flavor = "mocha"; - aerc = {enable = false;}; + aerc = { enable = false; }; alacritty = { enable = true; flavor = "mocha"; @@ -45,7 +45,7 @@ enable = true; flavor = "mocha"; }; - mako = {enable = false;}; + mako = { enable = false; }; newsboat = { enable = true; flavor = "mocha"; diff --git a/home/common/tmux.nix b/home/common/tmux.nix index 8d1cc34..6e921e8 100644 --- a/home/common/tmux.nix +++ b/home/common/tmux.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { programs.tmux = { enable = true; aggressiveResize = true; diff --git a/home/gui/mpv.nix b/home/gui/mpv.nix index 3710ddc..63ac7d4 100644 --- a/home/gui/mpv.nix +++ b/home/gui/mpv.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { programs = { mpv = { enable = true; diff --git a/home/work/citrix.nix b/home/work/citrix.nix index 5966ac0..c141b24 100644 --- a/home/work/citrix.nix +++ b/home/work/citrix.nix @@ -1,19 +1,11 @@ -{ - lib, - config, - pkgs, - inputs, - outputs, - home-manager, - ... -}: -with lib; let - cfg = config.roles.citrix; +{ lib, config, pkgs, inputs, outputs, home-manager, ... }: +with lib; +let cfg = config.roles.citrix; in { - options.roles.citrix = {enable = lib.mkEnableOption "citrix tools";}; + options.roles.citrix = { enable = lib.mkEnableOption "citrix tools"; }; config = mkIf cfg.enable { - home-manager.users.don.home.packages = with pkgs; [citrix_workspace]; - nixpkgs.config.permittedInsecurePackages = ["libsoup-2.74.3"]; + home-manager.users.don.home.packages = with pkgs; [ citrix_workspace ]; + nixpkgs.config.permittedInsecurePackages = [ "libsoup-2.74.3" ]; # home-manager.users.don.home.packages = with pkgs; # [ citrix_workspace_24_11_0 ]; home-manager.users.don.home.file."ICAClient" = { diff --git a/hosts/book/default.nix b/hosts/book/default.nix index 41e3fb2..9821ac4 100644 --- a/hosts/book/default.nix +++ b/hosts/book/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ inputs.nixos-hardware.nixosModules.google-pixelbook ./hardware-configuration.nix diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix index 52cd7b6..ebc2127 100644 --- a/hosts/loki/default.nix +++ b/hosts/loki/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ inputs.nixos-hardware.nixosModules.dell-xps-13-9310 ./hardware-configuration.nix @@ -13,7 +6,7 @@ ../workstation ]; networking.hostName = "loki"; - boot.binfmt.emulatedSystems = ["aarch64-linux"]; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; variables.address = "100.72.0.1"; variables.swayScale = "1.1"; diff --git a/hosts/smaug/default.nix b/hosts/smaug/default.nix index 3575fd6..053ad48 100644 --- a/hosts/smaug/default.nix +++ b/hosts/smaug/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260 inputs.nixos-hardware.nixosModules.common-pc-laptop diff --git a/hosts/vars.nix b/hosts/vars.nix index 9480aa4..ee8dc05 100644 --- a/hosts/vars.nix +++ b/hosts/vars.nix @@ -1,8 +1,8 @@ -{lib, ...}: { +{ lib, ... }: { options = { variables = lib.mkOption { type = lib.types.attrs; - default = {}; + default = { }; }; }; } diff --git a/hosts/wm/sway/default.nix b/hosts/wm/sway/default.nix index fc354c9..ea150ce 100644 --- a/hosts/wm/sway/default.nix +++ b/hosts/wm/sway/default.nix @@ -1,10 +1,6 @@ -{ - pkgs, - lib, - config, - ... -}: -with lib; let +{ pkgs, lib, config, ... }: +with lib; +let cfg = config.wm.sway; dbus-sway-environment = pkgs.writeTextFile { name = "dbus-sway-environment"; @@ -30,7 +26,7 @@ with lib; let ''; }; in { - options.wm.sway = {enable = mkEnableOption "wm: sway";}; + options.wm.sway = { enable = mkEnableOption "wm: sway"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ adwaita-icon-theme diff --git a/hosts/workstation/auto-cpufreq.nix b/hosts/workstation/auto-cpufreq.nix index c2d0ac1..b059b9e 100644 --- a/hosts/workstation/auto-cpufreq.nix +++ b/hosts/workstation/auto-cpufreq.nix @@ -1,14 +1,10 @@ -{ - pkgs, - inputs, - config, - lib, - ... -}: -with lib; let - cfg = config.roles.auto-cpufreq; +{ pkgs, inputs, config, lib, ... }: +with lib; +let cfg = config.roles.auto-cpufreq; in { - options.roles.auto-cpufreq = {enable = mkEnableOption "roles auto-cpufreq";}; + options.roles.auto-cpufreq = { + enable = mkEnableOption "roles auto-cpufreq"; + }; config = mkIf cfg.enable { services.auto-cpufreq = { enable = true;