theme - formating

This commit is contained in:
Don Harper 2024-09-01 10:30:16 -05:00
parent 8355c7ab83
commit f1c469c7fc
30 changed files with 287 additions and 105 deletions

View file

@ -23,13 +23,18 @@
}: let
inherit (self) outputs;
lib = nixpkgs.lib // home-manager.lib;
systems = ["x86_64-linux" "aarch64-linux"];
systems = [
"x86_64-linux"
"aarch64-linux"
];
forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
pkgsFor = lib.genAttrs systems (system:
import nixpkgs {
inherit system;
config.allowUnfree = true;
});
pkgsFor = lib.genAttrs systems (
system:
import nixpkgs {
inherit system;
config.allowUnfree = true;
}
);
in {
inherit lib;
# nixosModules = import ./modules/nixos;
@ -46,42 +51,60 @@
# clients
ace = lib.nixosSystem {
modules = [./hosts/ace];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
dragon = lib.nixosSystem {
modules = [./hosts/dragon];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
eve = lib.nixosSystem {
modules = [./hosts/eve];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
loki = lib.nixosSystem {
modules = [./hosts/loki];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
pocket2 = lib.nixosSystem {
modules = [./hosts/pocket2];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
smaug = lib.nixosSystem {
modules = [./hosts/smaug];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
t2 = lib.nixosSystem {
modules = [./hosts/t2];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
# servers
display = lib.nixosSystem {
modules = [./hosts/display];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
fred = lib.nixosSystem {
modules = [./hosts/fred];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
vm = lib.nixosSystem {
modules = [
@ -89,27 +112,39 @@
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
./hosts/vm
];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
harper2 = lib.nixosSystem {
modules = [./hosts/harper2];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
harper = lib.nixosSystem {
modules = [./hosts/harper];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
nuwww = lib.nixosSystem {
modules = [./hosts/nuwww];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
pihole = lib.nixosSystem {
modules = [./hosts/pihole];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
www2 = lib.nixosSystem {
modules = [./hosts/www2];
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
};
};
};
};

View file

@ -19,7 +19,6 @@
./neovim.nix
./newsboat.nix
./taskwarrior.nix
./todoman.nix
./topgrade.nix
./tmux.nix
./vifm.nix

View file

@ -9,7 +9,10 @@
general = {
default_action = "list";
editor = "${pkgs.neovim}/bin/nvim";
merge_editor = ["${pkgs.neovim}/bin/nvim" "-d"];
merge_editor = [
"${pkgs.neovim}/bin/nvim"
"-d"
];
};
"contact table" = {
display = "first_name";
@ -19,11 +22,24 @@
show_uids = "no";
sort = "last_name";
localize_dates = "yes";
preferred_phone_number_type = ["pref" "cell" "home"];
preferred_email_address_type = ["pref" "work" "home"];
preferred_phone_number_type = [
"pref"
"cell"
"home"
];
preferred_email_address_type = [
"pref"
"work"
"home"
];
};
vcard = {
private_objects = ["Jabber" "Skype" "Twitter" "Mastodon"];
private_objects = [
"Jabber"
"Skype"
"Twitter"
"Mastodon"
];
preferred_version = "3.0";
search_in_source_files = "no";
skip_unparsable = "no";

View file

@ -18,7 +18,13 @@
enable = true;
new = {
tags = ["unread"];
ignore = [".mbsyncstate" ".uidvalidity" ".mbsyncstate.journal" ".mbsyncstate.new" ".mbsyncstate.lock"];
ignore = [
".mbsyncstate"
".uidvalidity"
".mbsyncstate.journal"
".mbsyncstate.new"
".mbsyncstate.lock"
];
};
extraConfig = {
database = {

View file

@ -1,5 +1,11 @@
{pkgs, ...}: {
home.packages = with pkgs; [taskwarrior taskwarrior-tui tasksh vit timewarrior];
home.packages = with pkgs; [
taskwarrior
taskwarrior-tui
tasksh
vit
timewarrior
];
programs.taskwarrior = {
enable = true;
colorTheme = "dark-green-256";

View file

@ -1,15 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [todoman];
xdg.configFile."todoman/config.py".text =
/*
python
*/
''
path = "~/.config/vdirsyncer/storage/calendar/*"
date_format = "%Y-%m-%d"
time_format = "%H:%M"
default_list = "duckunix@gmail.com"
# default_due = 48
default_command = "list --startable"
'';
}

View file

@ -6,7 +6,9 @@
imports = [
inputs.home-manager.nixosModules.home-manager
];
home-manager.extraSpecialArgs = {inherit inputs outputs;};
home-manager.extraSpecialArgs = {
inherit inputs outputs;
};
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;

View file

@ -78,7 +78,9 @@
enable = true;
associations.added = {
"application/octet-stream" = ["gvim.desktop"];
"application/pdf" = ["qpdfview.desktop;org.gnome.Evince.desktop;org.pwmt.zathura-pdf-mupdf.desktop"];
"application/pdf" = [
"qpdfview.desktop;org.gnome.Evince.desktop;org.pwmt.zathura-pdf-mupdf.desktop"
];
"audio/mpeg" = ["org.kde.kid3.desktop"];
"image/jpeg" = ["darktable.desktop;gimp.desktop;imv.desktop"];
"image/png" = ["darktable.desktop;gimp.desktop;imv-folder.desktop;imv.desktop"];
@ -86,7 +88,9 @@
"inode/directory" = ["thunar.desktop"];
"text/plain" = ["gvim.desktop"];
"x-scheme-handler/pdf" = ["pdfview.desktop"];
"x-scheme-handler/tg" = ["userapp-Telegram Desktop-9M6O50.desktop;userapp-Telegram Desktop-6IJLW1.desktop;userapp-Telegram Desktop-IQIXX1.desktop;userapp-Telegram Desktop-FK06Y1.desktop;userapp-Telegram Desktop-1SZ7Y1.desktop;userapp-Telegram Desktop-C24MZ1.desktop;userapp-Telegram Desktop-29FD01.desktop;userapp-Telegram Desktop-21P401.desktop;userapp-Telegram Desktop-LOTG11.desktop"];
"x-scheme-handler/tg" = [
"userapp-Telegram Desktop-9M6O50.desktop;userapp-Telegram Desktop-6IJLW1.desktop;userapp-Telegram Desktop-IQIXX1.desktop;userapp-Telegram Desktop-FK06Y1.desktop;userapp-Telegram Desktop-1SZ7Y1.desktop;userapp-Telegram Desktop-C24MZ1.desktop;userapp-Telegram Desktop-29FD01.desktop;userapp-Telegram Desktop-21P401.desktop;userapp-Telegram Desktop-LOTG11.desktop"
];
};
defaultApplications = {
"inode/directory" = ["thunar.desktop"];

View file

@ -196,13 +196,22 @@
};
};
completion = {
open_categories = ["quickmarks" "searchengines" "bookmarks" "history"];
open_categories = [
"quickmarks"
"searchengines"
"bookmarks"
"history"
];
};
content = {
autoplay = false;
blocking = {
adblock = {
lists = ["https://secure.fanboy.co.nz/fanboy-annoyance.txt" "https://easylist.to/easylist/easylist.txt" "https://easylist.to/easylist/easyprivacy.txt"];
lists = [
"https://secure.fanboy.co.nz/fanboy-annoyance.txt"
"https://easylist.to/easylist/easylist.txt"
"https://easylist.to/easylist/easyprivacy.txt"
];
};
enabled = true;
};
@ -212,14 +221,29 @@
};
fileselect = {
folder = {
command = ["kitty" "-e" "ranger" "--choosedir={}"];
command = [
"kitty"
"-e"
"ranger"
"--choosedir={}"
];
};
handler = "external";
multiple_files = {
command = ["kitty" "-e" "ranger" "--choosefile={}"];
command = [
"kitty"
"-e"
"ranger"
"--choosefile={}"
];
};
single_file = {
command = ["kitty" "-e" "ranger" "--choosefile={}"];
command = [
"kitty"
"-e"
"ranger"
"--choosefile={}"
];
};
};
qt = {

View file

@ -30,10 +30,29 @@
position = "bottom";
height = 10;
spacing = 0;
modules-left = ["sway/workspaces" "sway/mode" "wlr/workspaces" "custom/mycal"];
modules-left = [
"sway/workspaces"
"sway/mode"
"wlr/workspaces"
"custom/mycal"
];
modules-center = [];
# modules-right = ["idle_inhibitor" "custom/mytimew" "pulseaudio" "custom/mymusic" "bluetooth" "network" "backlight" "battery" "battery#bat2" "tray" "custom/mycal" "clock"];
modules-right = ["idle_inhibitor" "custom/weather" "custom/mytimew" "pulseaudio" "custom/mymusic" "bluetooth" "network" "backlight" "battery" "battery#bat2" "tray" "custom/mycal" "clock"];
modules-right = [
"idle_inhibitor"
"custom/weather"
"custom/mytimew"
"pulseaudio"
"custom/mymusic"
"bluetooth"
"network"
"backlight"
"battery"
"battery#bat2"
"tray"
"custom/mycal"
"clock"
];
bluetooth = {
format-alt = "bt: {status}";
format-on = "bt";

View file

@ -12,7 +12,12 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "uas" "sd_mod"];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"uas"
"sd_mod"
];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

View file

@ -12,7 +12,13 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

View file

@ -12,7 +12,13 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
boot.initrd.availableKernelModules = [
"xhci_pci"
"usb_storage"
"usbhid"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

View file

@ -12,7 +12,15 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usbhid" "ums_realtek" "sd_mod" "sr_mod"];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"usbhid"
"ums_realtek"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = ["dm-snapshot"];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

View file

@ -12,7 +12,14 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "uas" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.availableKernelModules = [
"xhci_pci"
"thunderbolt"
"nvme"
"uas"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

View file

@ -3,5 +3,8 @@
pkgs,
...
}: {
boot.kernelModules = ["axge" "ax88179_178a"];
boot.kernelModules = [
"axge"
"ax88179_178a"
];
}

View file

@ -12,7 +12,13 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
boot.initrd.availableKernelModules = [
"xhci_pci"
"usb_storage"
"usbhid"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

View file

@ -18,10 +18,16 @@
in {
nix = {
settings = {
experimental-features = ["nix-command" "flakes"];
experimental-features = [
"nix-command"
"flakes"
];
warn-dirty = false;
auto-optimise-store = true;
trusted-users = ["root" "don"];
trusted-users = [
"root"
"don"
];
};
gc = {
automatic = true;
@ -76,7 +82,9 @@ in {
enable = true;
};
kernel = {
sysctl = {"vm.swappiness" = 10;};
sysctl = {
"vm.swappiness" = 10;
};
};
};
@ -145,7 +153,15 @@ in {
isNormalUser = true;
initialPassword = "changeme";
description = "Don Harper";
extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"];
extraGroups = [
"networkmanager"
"wheel"
"scanner"
"lp"
"video"
"mlocate"
"disk"
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
];
@ -194,7 +210,11 @@ in {
};
nixpkgs.overlays = [
(final: super: {khal = super.khal.overridePythonAttrs (_: {doCheck = false;});})
(final: super: {
khal = super.khal.overridePythonAttrs (_: {
doCheck = false;
});
})
];
# Open ports in the firewall.
@ -223,7 +243,11 @@ in {
allowedTCPPorts = [22];
interfaces = {
"tailscale0" = {
allowedTCPPorts = [22 8080 8443];
allowedTCPPorts = [
22
8080
8443
];
allowedTCPPortRanges = [
{
from = 1714;

Binary file not shown.

View file

@ -12,7 +12,13 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "uas" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"uas"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

View file

@ -12,7 +12,13 @@
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
boot.initrd.availableKernelModules = [
"ahci"
"xhci_pci"
"virtio_pci"
"sr_mod"
"virtio_blk"
];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

View file

@ -12,7 +12,13 @@
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
boot.initrd.availableKernelModules = [
"ahci"
"xhci_pci"
"virtio_pci"
"sr_mod"
"virtio_blk"
];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

View file

@ -19,10 +19,16 @@
in {
nix = {
settings = {
experimental-features = ["nix-command" "flakes"];
experimental-features = [
"nix-command"
"flakes"
];
warn-dirty = false;
auto-optimise-store = true;
trusted-users = ["root" "don"];
trusted-users = [
"root"
"don"
];
};
gc = {
automatic = true;
@ -89,7 +95,9 @@ in {
enable = true;
};
kernel = {
sysctl = {"vm.swappiness" = 10;};
sysctl = {
"vm.swappiness" = 10;
};
};
};
@ -233,7 +241,15 @@ in {
isNormalUser = true;
initialPassword = "changeme";
description = "Don Harper";
extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"];
extraGroups = [
"networkmanager"
"wheel"
"scanner"
"lp"
"video"
"mlocate"
"disk"
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
];
@ -252,7 +268,6 @@ in {
nixpkgs.config.permittedInsecurePackages = ["electron-25.9.0"];
environment.systemPackages = with pkgs; [
#(callPackage ../mypackages/kanshi-fix/default.nix {})
python-with-my-packages
acpi
alejandra
@ -315,7 +330,11 @@ in {
nixpkgs.overlays = [
(final: prev: {qutebrowser = prev.qutebrowser.override {enableWideVine = true;};})
(final: super: {khal = super.khal.overridePythonAttrs (_: {doCheck = false;});})
(final: super: {
khal = super.khal.overridePythonAttrs (_: {
doCheck = false;
});
})
];
# Open ports in the firewall.
@ -344,7 +363,11 @@ in {
allowedTCPPorts = [22];
interfaces = {
"tailscale0" = {
allowedTCPPorts = [22 8080 8443];
allowedTCPPorts = [
22
8080
8443
];
allowedTCPPortRanges = [
{
from = 1714;

Binary file not shown.

View file

@ -12,7 +12,15 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usbhid" "ums_realtek" "sd_mod" "sr_mod"];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"usbhid"
"ums_realtek"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = ["dm-snapshot"];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

0
pkgs/.keepme Normal file
View file

View file

@ -1,2 +0,0 @@
KERNEL=="card0", SUBSYSTEM=="drm", RUN+="$(pkgs.kanshi-fix}/bin/kanshi-fix"

View file

@ -1,2 +0,0 @@
{pkgs ? import <nixpkgs> {}}:
pkgs.callPackage ./derivation.nix {}

View file

@ -1,20 +0,0 @@
{stdenv}:
stdenv.mkDerivation rec {
name = "kanshi-fix-${version}";
version = "1.4";
src = ./.;
nativeBuildInputs = [];
buildInputs = [];
dontConfigure = true;
buildPhase = ''
chmod 0755 kanshi-fix
'';
installPhase = ''
mkdir -p $out/bin
cp kanshi-fix $out/bin
'';
}

View file

@ -1,4 +0,0 @@
#!/usr/bin/env bash
export SWAYSOCK=/run/user/1000/sway-ipc.1000.$(pgrep -x sway).sock
export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/1000/bus"
swaymsg "output * dpms on"