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-09-24 13:39:24 -05:00
parent 4dbb70199a
commit a8df20b4cb
2 changed files with 146 additions and 151 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;};
};
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;
# };
# };
};
};
} }

65
home/gui/default.nix
View file

@ -1,8 +1,14 @@
{ pkgs, inputs, config, lib, ... }: {
with lib; pkgs,
let cfg = config.roles.gui; inputs,
config,
lib,
...
}:
with lib; let
cfg = config.roles.gui;
in { in {
options.roles.gui = { enable = mkEnableOption "roles gui"; }; options.roles.gui = {enable = mkEnableOption "roles gui";};
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.don = { home-manager.users.don = {
imports = [ imports = [
@ -17,10 +23,10 @@ in {
./sway.nix ./sway.nix
./terminals.nix ./terminals.nix
]; ];
fonts = { fontconfig = { enable = true; }; }; fonts = {fontconfig = {enable = true;};};
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
qutebrowser = prev.qutebrowser.override { enableWideVine = true; }; qutebrowser = prev.qutebrowser.override {enableWideVine = true;};
}) })
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -31,7 +37,7 @@ in {
inputs.bzmenu.packages.${pkgs.system}.default inputs.bzmenu.packages.${pkgs.system}.default
at-spi2-core at-spi2-core
blueberry blueberry
calibre # calibre # FIXME - TODO - Failing to build 2025.09.23
clipman clipman
darktable darktable
# element-desktop # element-desktop
@ -75,32 +81,29 @@ in {
mimeApps = { mimeApps = {
enable = true; enable = true;
associations.added = { associations.added = {
"application/octet-stream" = [ "nvim-qt.desktop" ]; "application/octet-stream" = ["nvim-qt.desktop"];
"application/pdf" = [ "application/pdf" = [
"org.pwmt.zathura-pdf-mupdf.desktop;qpdfview.desktop;org.gnome.Evince.desktop" "org.pwmt.zathura-pdf-mupdf.desktop;qpdfview.desktop;org.gnome.Evince.desktop"
]; ];
"image/jpeg" = [ "imv.desktop;darktable.desktop;gimp.desktop" ]; "image/jpeg" = ["imv.desktop;darktable.desktop;gimp.desktop"];
"image/png" = [ "imv.desktop;darktable.desktop;gimp.desktop" ]; "image/png" = ["imv.desktop;darktable.desktop;gimp.desktop"];
"image/x-adobe-dng" = [ "imv.desktop" ]; "image/x-adobe-dng" = ["imv.desktop"];
"inode/directory" = [ "thunar.desktop" ]; "inode/directory" = ["thunar.desktop"];
"text/plain" = [ "nvim-qt.desktop" ]; "text/plain" = ["nvim-qt.desktop"];
"x-scheme-handler/pdf" = [ "x-scheme-handler/pdf" = [
"org.pwmt.zathura-pdf-mupdf.desktop;qpdfview.desktop;org.gnome.Evince.desktop" "org.pwmt.zathura-pdf-mupdf.desktop;qpdfview.desktop;org.gnome.Evince.desktop"
]; ];
}; };
defaultApplications = { defaultApplications = {
"inode/directory" = [ "thunar.desktop" ]; "inode/directory" = ["thunar.desktop"];
"text/html" = [ "org.qutebrowser.qutebrowser.desktop" ]; "text/html" = ["org.qutebrowser.qutebrowser.desktop"];
"x-scheme-handler/about" = "x-scheme-handler/about" = ["org.qutebrowser.qutebrowser.desktop"];
[ "org.qutebrowser.qutebrowser.desktop" ]; "x-scheme-handler/http" = ["org.qutebrowser.qutebrowser.desktop"];
"x-scheme-handler/http" = [ "org.qutebrowser.qutebrowser.desktop" ]; "x-scheme-handler/https" = ["org.qutebrowser.qutebrowser.desktop"];
"x-scheme-handler/https" = "x-scheme-handler/pdf" = ["myweb.desktop"];
[ "org.qutebrowser.qutebrowser.desktop" ]; "x-scheme-handler/unknown" = ["org.qutebrowser.qutebrowser.desktop"];
"x-scheme-handler/pdf" = [ "myweb.desktop" ]; "application/pdf" = ["org.pwmt.zathura-pdf-mupdf.desktop"];
"x-scheme-handler/unknown" = "x-scheme-handler/mailto" = ["neomutt.desktop"];
[ "org.qutebrowser.qutebrowser.desktop" ];
"application/pdf" = [ "org.pwmt.zathura-pdf-mupdf.desktop" ];
"x-scheme-handler/mailto" = [ "neomutt.desktop" ];
}; };
}; };
desktopEntries = { desktopEntries = {
@ -126,7 +129,7 @@ in {
terminal = false; terminal = false;
name = "myweb"; name = "myweb";
exec = "/home/don/bin/myweb %u"; exec = "/home/don/bin/myweb %u";
mimeType = [ "x-scheme-handler/pdf" ]; mimeType = ["x-scheme-handler/pdf"];
}; };
cooking-notebook = { cooking-notebook = {
type = "Application"; type = "Application";
@ -141,8 +144,8 @@ in {
type = "Application"; type = "Application";
icon = "obsidian"; icon = "obsidian";
comment = "Obsidian"; comment = "Obsidian";
mimeType = [ "x-scheme-handler/obsidian" ]; mimeType = ["x-scheme-handler/obsidian"];
categories = [ "Office" ]; categories = ["Office"];
}; };
journal = { journal = {
name = "Journal"; name = "Journal";
@ -151,11 +154,11 @@ in {
type = "Application"; type = "Application";
icon = "obsidian"; icon = "obsidian";
comment = "Obsidian Journal"; comment = "Obsidian Journal";
mimeType = [ "x-scheme-handler/obsidian" ]; mimeType = ["x-scheme-handler/obsidian"];
categories = [ "Office" ]; categories = ["Office"];
}; };
}; };
configFile = { "shikane/config.toml".source = files/shikane.toml; }; configFile = {"shikane/config.toml".source = files/shikane.toml;};
}; };
}; };
}; };