don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

formating

Browse source
This commit is contained in:
Don Harper 2025-08-31 15:13:01 -05:00
parent 63e412b597
commit e634c42b23
11 changed files with 141 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

232
flake.nix
View file

@ -38,126 +38,118 @@
nvf.inputs.nixpkgs.follows = "nixpkgs"; nvf.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs @ { outputs = inputs@{ self, nixpkgs, nix, nixpkgs-stable, nixos-hardware
self, , home-manager, catppuccin, colmena, ... }:
nixpkgs, let
nix, inherit (self) outputs;
nixpkgs-stable, lib = nixpkgs.lib // home-manager.lib;
nixos-hardware, in {
home-manager, inherit lib;
catppuccin, nixpkgs.config.allowUnfree = true;
colmena, config.allowUnfree = true;
... nixpkgs.config.allowUnfreePredicate = pkg:
}: let builtins.elem (lib.getName pkg) [ "widevine-cdm" ];
inherit (self) outputs; colmena = {
lib = nixpkgs.lib // home-manager.lib; meta = {
in { nixpkgs = import nixpkgs { system = "x86_64-linux"; };
inherit lib; specialArgs = { inherit inputs outputs; };
nixpkgs.config.allowUnfree = true; };
config.allowUnfree = true; # ace = import ./hosts/ace/colmena.nix; # Acer C720
nixpkgs.config.allowUnfreePredicate = pkg: book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme.
builtins.elem (lib.getName pkg) ["widevine-cdm"]; display = import ./hosts/display/colmena.nix; # Pi4
colmena = { # eve = import ./hosts/eve/colmena.nix; # Google Pixelbook 2017 w/ eMMC.
meta = { fred = import ./hosts/fred/colmena.nix; # acer server
nixpkgs = import nixpkgs {system = "x86_64-linux";}; loki = import ./hosts/loki/colmena.nix; # Dell XPS 13
specialArgs = {inherit inputs outputs;}; # 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;
# };
# };
};
};
} }

10
home/common/catppuccin.nix
View file

@ -1,10 +1,10 @@
{...}: { { ... }: {
gtk = {}; gtk = { };
qt = {style = {};}; qt = { style = { }; };
catppuccin = { catppuccin = {
enable = true; enable = true;
flavor = "mocha"; flavor = "mocha";
aerc = {enable = false;}; aerc = { enable = false; };
alacritty = { alacritty = {
enable = true; enable = true;
flavor = "mocha"; flavor = "mocha";
@ -45,7 +45,7 @@
enable = true; enable = true;
flavor = "mocha"; flavor = "mocha";
}; };
mako = {enable = false;}; mako = { enable = false; };
newsboat = { newsboat = {
enable = true; enable = true;
flavor = "mocha"; flavor = "mocha";

2
home/common/tmux.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
aggressiveResize = true; aggressiveResize = true;

2
home/gui/mpv.nix
View file

@ -1,4 +1,4 @@
{...}: { { ... }: {
programs = { programs = {
mpv = { mpv = {
enable = true; enable = true;

20
home/work/citrix.nix
View file

@ -1,19 +1,11 @@
{ { lib, config, pkgs, inputs, outputs, home-manager, ... }:
lib, with lib;
config, let cfg = config.roles.citrix;
pkgs,
inputs,
outputs,
home-manager,
...
}:
with lib; let
cfg = config.roles.citrix;
in { in {
options.roles.citrix = {enable = lib.mkEnableOption "citrix tools";}; options.roles.citrix = { enable = lib.mkEnableOption "citrix tools"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.don.home.packages = with pkgs; [citrix_workspace]; home-manager.users.don.home.packages = with pkgs; [ citrix_workspace ];
nixpkgs.config.permittedInsecurePackages = ["libsoup-2.74.3"]; nixpkgs.config.permittedInsecurePackages = [ "libsoup-2.74.3" ];
# home-manager.users.don.home.packages = with pkgs; # home-manager.users.don.home.packages = with pkgs;
# [ citrix_workspace_24_11_0 ]; # [ citrix_workspace_24_11_0 ];
home-manager.users.don.home.file."ICAClient" = { home-manager.users.don.home.file."ICAClient" = {

9
hosts/book/default.nix
View file

@ -1,11 +1,4 @@
{ { inputs, outputs, lib, config, pkgs, ... }: {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.google-pixelbook inputs.nixos-hardware.nixosModules.google-pixelbook
./hardware-configuration.nix ./hardware-configuration.nix

11
hosts/loki/default.nix
View file

@ -1,11 +1,4 @@
{ { inputs, outputs, lib, config, pkgs, ... }: {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.dell-xps-13-9310 inputs.nixos-hardware.nixosModules.dell-xps-13-9310
./hardware-configuration.nix ./hardware-configuration.nix
@ -13,7 +6,7 @@
../workstation ../workstation
]; ];
networking.hostName = "loki"; networking.hostName = "loki";
boot.binfmt.emulatedSystems = ["aarch64-linux"]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
variables.address = "100.72.0.1"; variables.address = "100.72.0.1";
variables.swayScale = "1.1"; variables.swayScale = "1.1";

9
hosts/smaug/default.nix
View file

@ -1,11 +1,4 @@
{ { inputs, outputs, lib, config, pkgs, ... }: {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260 inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260
inputs.nixos-hardware.nixosModules.common-pc-laptop inputs.nixos-hardware.nixosModules.common-pc-laptop

4
hosts/vars.nix
View file

@ -1,8 +1,8 @@
{lib, ...}: { { lib, ... }: {
options = { options = {
variables = lib.mkOption { variables = lib.mkOption {
type = lib.types.attrs; type = lib.types.attrs;
default = {}; default = { };
}; };
}; };
} }

12
hosts/wm/sway/default.nix
View file

@ -1,10 +1,6 @@
{ { pkgs, lib, config, ... }:
pkgs, with lib;
lib, let
config,
...
}:
with lib; let
cfg = config.wm.sway; cfg = config.wm.sway;
dbus-sway-environment = pkgs.writeTextFile { dbus-sway-environment = pkgs.writeTextFile {
name = "dbus-sway-environment"; name = "dbus-sway-environment";
@ -30,7 +26,7 @@ with lib; let
''; '';
}; };
in { in {
options.wm.sway = {enable = mkEnableOption "wm: sway";}; options.wm.sway = { enable = mkEnableOption "wm: sway"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
adwaita-icon-theme adwaita-icon-theme

16
hosts/workstation/auto-cpufreq.nix
View file

@ -1,14 +1,10 @@
{ { pkgs, inputs, config, lib, ... }:
pkgs, with lib;
inputs, let cfg = config.roles.auto-cpufreq;
config,
lib,
...
}:
with lib; let
cfg = config.roles.auto-cpufreq;
in { in {
options.roles.auto-cpufreq = {enable = mkEnableOption "roles auto-cpufreq";}; options.roles.auto-cpufreq = {
enable = mkEnableOption "roles auto-cpufreq";
};
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.auto-cpufreq = { services.auto-cpufreq = {
enable = true; enable = true;