From 8ba4965d21fd85d4f60d1e9121f3b98135df8250 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Mon, 18 Aug 2025 19:12:52 -0500 Subject: [PATCH] formating --- home/common/default.nix | 10 ++--- home/common/nvf.nix | 38 ++++++++---------- home/gui/qutebrowser.nix | 79 ++++++++++++++++++++---------------- hosts/pi-server/default.nix | 80 ++++++++++++++++--------------------- hosts/wm/greetd/default.nix | 3 +- 5 files changed, 99 insertions(+), 111 deletions(-) diff --git a/home/common/default.nix b/home/common/default.nix index 84bae12..9d85d33 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -1,9 +1,4 @@ -{ - pkgs, - inputs, - osConfig, - ... -}: { +{ pkgs, inputs, osConfig, ... }: { imports = [ ./aerc.nix ./bash.nix @@ -119,7 +114,8 @@ programs.keychain = { enable = true; enableBashIntegration = true; - keys = "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B"; + keys = + "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B"; }; home.file.".links/links.cfg".source = files/links.cfg; } diff --git a/home/common/nvf.nix b/home/common/nvf.nix index d567361..c49d552 100644 --- a/home/common/nvf.nix +++ b/home/common/nvf.nix @@ -1,5 +1,5 @@ -{pkgs, ...}: { - home.packages = with pkgs; [tree-sitter fd ripgrep]; +{ pkgs, ... }: { + home.packages = with pkgs; [ tree-sitter fd ripgrep ]; programs.nvf = { enable = true; enableManpages = true; @@ -14,14 +14,12 @@ vim.o.sidescrolloff = 8 ''; autocomplete.blink-cmp.enable = true; - binds = { - cheatsheet.enable = true; - }; + binds = { cheatsheet.enable = true; }; dashboard.alpha = { enable = true; theme = "dashboard"; }; - filetree.neo-tree = {enable = true;}; + filetree.neo-tree = { enable = true; }; comments.comment-nvim.enable = true; autopairs.nvim-autopairs.enable = true; snippets.luasnip.enable = true; @@ -33,9 +31,7 @@ terminal = { toggleterm = { enable = true; - lazygit = { - enable = true; - }; + lazygit = { enable = true; }; }; }; treesitter = { @@ -49,42 +45,42 @@ { key = ""; action = ":bnext"; - mode = ["n"]; + mode = [ "n" ]; } { key = "t"; action = ":Telescope buffers"; - mode = ["n"]; + mode = [ "n" ]; } { key = "T"; action = ":terminal"; - mode = ["n"]; + mode = [ "n" ]; } { key = "e"; action = ":Neotree toggle"; - mode = ["n"]; + mode = [ "n" ]; } { key = "ow"; action = ":ObsidianWorkspace"; - mode = ["n"]; + mode = [ "n" ]; } { key = "od"; action = ":ObsidianDailies"; - mode = ["n"]; + mode = [ "n" ]; } { key = "on"; action = ":ObsidianNew"; - mode = ["n"]; + mode = [ "n" ]; } { key = "oN"; action = ":ObsidianNewFromTemplate"; - mode = ["n"]; + mode = [ "n" ]; } ]; git = { @@ -121,11 +117,9 @@ codewindow.enable = true; }; - notify = { - nvim-notify.enable = true; - }; + notify = { nvim-notify.enable = true; }; - options = {conceallevel = 1;}; + options = { conceallevel = 1; }; statusline.lualine = { enable = true; @@ -147,7 +141,7 @@ legacy_commands = true; ui.enable = false; completion.nvim-cmp = true; - templates = {subdir = "Templates";}; + templates = { subdir = "Templates"; }; daily_notes = { date_format = "%Y-%m-%d"; folder = "Daily"; diff --git a/home/gui/qutebrowser.nix b/home/gui/qutebrowser.nix index 16c20d8..eeaaeed 100644 --- a/home/gui/qutebrowser.nix +++ b/home/gui/qutebrowser.nix @@ -1,9 +1,4 @@ -{ - inputs, - outputs, - pkgs, - ... -}: { +{ inputs, outputs, pkgs, ... }: { programs.qutebrowser = { enable = true; loadAutoconfig = true; @@ -29,7 +24,8 @@ ";V" = "hint --rapid links spawn myweb {hint-url}"; "xb" = "config-cycle statusbar.show always in-mode"; "xt" = "config-cycle tabs.show always switching"; - "xx" = "config-cycle statusbar.show always in-mode ;; config-cycle tabs.show always switching"; + "xx" = + "config-cycle statusbar.show always in-mode ;; config-cycle tabs.show always switching"; }; }; searchEngines = { @@ -50,7 +46,8 @@ buymusic2 = "https://www.hdtracks.com/"; cal = "https://cloud.trex-halfbeak.ts.net/apps/calendar/timeGridDay/now"; canvas = "https://katyisd.instructure.com/login/ldap"; - centerpoint = "http://gis.centerpointenergy.com/outagetracker/?WT.ac=OC_Image_Callout"; + centerpoint = + "http://gis.centerpointenergy.com/outagetracker/?WT.ac=OC_Image_Callout"; chase = "https://www.chase.com/"; cloud = "https://cloud.trex-halfbeak.ts.net/apps/dashboard/"; cnn = "https://www.cnn.com"; @@ -59,34 +56,42 @@ cups = "http://localhost:631/printers/printer"; darkroom = "https://thedarkroom.com/photodashboard/"; disk = "https://smart.trex-halfbeak.ts.net/web/dashboard"; - driversed = "https://driving.aceable.com/teacher/log?studentId=I89fno2YEZo4hQ40"; + driversed = + "https://driving.aceable.com/teacher/log?studentId=I89fno2YEZo4hQ40"; droplet = "https://cloud.digitalocean.com/droplets?i=a8b99f"; ercot = "https://www.ercot.com/gridmktinfo/dashboards"; fiesta = "https://www.fiestamart.com/weekly-ads/?store_code=66"; flood = "https://www.harriscountyfws.org/"; gatus = "https://gatus.trex-halfbeak.ts.net/"; gcal = "https://calendar.google.com/calendar/r"; - gfamily = "https://familylink.google.com/member/112279402605706545724/highlights"; + gfamily = + "https://familylink.google.com/member/112279402605706545724/highlights"; git = "https://git.trex-halfbeak.ts.net/?repo-search-query=m"; gmail = "https://mail.google.com/mail/u/0/?pli=1#inbox"; gmaps = "https://www.google.com/maps/"; gmessages = "https://messages.google.com/web/conversations"; gphoto = "https://photos.google.com/"; gvoice = "https://voice.google.com/u/0/calls"; - hac = "https://homeaccess.katyisd.org/HomeAccess/Account/LogOn?ReturnUrl=%2FHomeAccess"; - heb = "https://www.heb.com/collections/weekly-ad?customFilters=onAdFilter&shoppingStore=497&utm_source=1021275&utm_medium=email&utm_campaign=2023-11-24-weekly-ad&utm_content=weekly-ad-banner"; + hac = + "https://homeaccess.katyisd.org/HomeAccess/Account/LogOn?ReturnUrl=%2FHomeAccess"; + heb = + "https://www.heb.com/collections/weekly-ad?customFilters=onAdFilter&shoppingStore=497&utm_source=1021275&utm_medium=email&utm_campaign=2023-11-24-weekly-ad&utm_content=weekly-ad-banner"; hetzner = "https://console.hetzner.cloud/projects"; - hometail = "http://homeassistant.trex-halfbeak.ts.net:8123/lovelace-mine/default_view"; + hometail = + "http://homeassistant.trex-halfbeak.ts.net:8123/lovelace-mine/default_view"; hurricane = "https://www.nhc.noaa.gov/"; ice = "https://ice.home.duckland.org/"; imdb = "https://www.imdb.com/"; - instapot-cook-times = "https://temeculablogs.com/instant-pot-cooking-times/"; - jelly = "https://jellyfin.trex-halfbeak.ts.net/web/index.html#!/home.html"; + instapot-cook-times = + "https://temeculablogs.com/instant-pot-cooking-times/"; + jelly = + "https://jellyfin.trex-halfbeak.ts.net/web/index.html#!/home.html"; jellyreq = "https://jellyseerr.trex-halfbeak.ts.net/discover/trending"; jzoom = "https://jpmchase.zoom.us/"; katy-bus = "https://busroutes.katyisd.org/wqsimweb/webquery/"; katy-pay = "https://katyisd.revtrak.net/"; - kindle = "https://smile.amazon.com/mn/dcw/myx.html/ref=kinw_myk_redirect#/home/content/booksAll/dateDsc/"; + kindle = + "https://smile.amazon.com/mn/dcw/myx.html/ref=kinw_myk_redirect#/home/content/booksAll/dateDsc/"; kindle-read = "https://www.amazon.com/kindle-dbs/ku/ku-central/"; kroger = "https://www.kroger.com/weeklyad"; linkedin = "https://www.linkedin.com/feed/"; @@ -108,16 +113,19 @@ nix-config = "https://nixos.org/manual/nixos/stable/options.html"; nix-dev = "https://nix.dev/"; nix-hardware = "https://github.com/duckunix/nixos-hardware"; - nix-home-manual = "https://nix-community.github.io/home-manager/options.xhtml"; + nix-home-manual = + "https://nix-community.github.io/home-manager/options.xhtml"; nix-manual = "https://nixos.org/manual/nixos/stable/index.html"; nix-options = "https://search.nixos.org/options?"; nix-package = "https://search.nixos.org/packages"; - nix-up-software = "https://nix.dev/tutorials/learning-journey/packaging-existing-software"; + nix-up-software = + "https://nix.dev/tutorials/learning-journey/packaging-existing-software"; nix-versions = "https://lazamar.co.uk/nix-versions/"; nix-wiki = "https://wiki.nixos.org/"; ntop = "https://ice.home.duckland.org:3001/"; octoprint = "http://octopi/?#temp"; - orders = "https://www.amazon.com/gp/css/order-history?ref_=nav_orders_first"; + orders = + "https://www.amazon.com/gp/css/order-history?ref_=nav_orders_first"; photos = "https://photos.trex-halfbeak.ts.net/"; pi = "http://pi.hole/admin/"; pinetab2-releases = "https://wiki.pine64.org/wiki/PineTab2_Releases"; @@ -130,7 +138,8 @@ smile = "https://www.amazon.com/"; spacecity = "https://spacecityweather.com/"; sprouts = "https://www.sprouts.com/weekly-ad/"; - star = "https://starpizzacinco.revelup.com/weborder/?establishment=1#index"; + star = + "https://starpizzacinco.revelup.com/weborder/?establishment=1#index"; swayutil = "https://github.com/swaywm/sway/wiki/Useful-add-ons-for-sway"; sync-book = "http://book:8384/#"; sync-dragon = "http://dragon:8384/#"; @@ -157,7 +166,8 @@ vonage = "https://secure.vonage.com/account/login.html"; vortexic = "https://vortexic-university.sparkuniversity.co/Courses.aspx"; waze = "https://www.waze.com/livemap"; - weather = "https://merrysky.net/forecast/Cinco%20Ranch%20High%20School,%20Katy,%20%20TX/us"; + weather = + "https://merrysky.net/forecast/Cinco%20Ranch%20High%20School,%20Katy,%20%20TX/us"; weather2 = "https://openweathermap.org/city/4681485"; weather3 = "https://www.wunderground.com/weather/us/tx/katy/29.79,-95.82"; weather4 = "https://www.weatherbug.com/weather-forecast/now/"; @@ -177,7 +187,7 @@ #c.bindings = { key_mappings = ['': '' '': '' '': '' '': '' '': '' '': '' '': '' '': '']} ''; settings = { - auto_save = {session = true;}; + auto_save = { session = true; }; colors = { webpage = { bg = "#2d2d2d"; @@ -197,12 +207,13 @@ }; }; completion = { - open_categories = ["quickmarks" "searchengines" "bookmarks" "history"]; + open_categories = + [ "quickmarks" "searchengines" "bookmarks" "history" ]; }; content = { autoplay = false; blocking = { - hosts = {block_subdomains = true;}; + hosts = { block_subdomains = true; }; adblock = { lists = [ "https://secure.fanboy.co.nz/fanboy-annoyance.txt" @@ -212,7 +223,7 @@ }; enabled = true; }; - cookies = {accept = "no-3rdparty";}; + cookies = { accept = "no-3rdparty"; }; dns_prefetch = false; local_content_can_access_remote_urls = true; pdfjs = false; @@ -224,35 +235,35 @@ }; fileselect = { folder = { - command = ["${pkgs.foot}/bin/foot" "-e" "ranger" "--choosedir={}"]; + command = [ "${pkgs.foot}/bin/foot" "-e" "ranger" "--choosedir={}" ]; }; handler = "external"; multiple_files = { - command = ["${pkgs.foot}/bin/foot" "-e" "ranger" "--choosefile={}"]; + command = [ "${pkgs.foot}/bin/foot" "-e" "ranger" "--choosefile={}" ]; }; single_file = { - command = ["${pkgs.foot}/bin/foot" "-e" "ranger" "--choosefile={}"]; + command = [ "${pkgs.foot}/bin/foot" "-e" "ranger" "--choosefile={}" ]; }; }; qt = { args = [ "widevine-path=${pkgs.widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" ]; - workarounds = {remove_service_workers = true;}; + workarounds = { remove_service_workers = true; }; }; - spellcheck = {languages = ["en-US"];}; + spellcheck = { languages = [ "en-US" ]; }; statusbar = { show = "in-mode"; position = "bottom"; }; tabs = { - favicons = {scale = 1;}; - indicator = {width = 1;}; + favicons = { scale = 1; }; + indicator = { width = 1; }; mode_on_change = "restore"; position = "bottom"; select_on_remove = "next"; show = "always"; - title = {format = "{audio}{current_title}";}; + title = { format = "{audio}{current_title}"; }; }; url = { default_page = "about:blank"; @@ -260,7 +271,7 @@ }; editor = { encoding = "utf-8"; - command = ["kitty" "-e" "nvim" "{file}"]; + command = [ "kitty" "-e" "nvim" "{file}" ]; }; }; }; diff --git a/hosts/pi-server/default.nix b/hosts/pi-server/default.nix index 6761044..9edcbaf 100644 --- a/hosts/pi-server/default.nix +++ b/hosts/pi-server/default.nix @@ -1,11 +1,5 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: let +{ inputs, outputs, lib, config, pkgs, ... }: +let my-python-packages = python-packages: with python-packages; [ pip @@ -18,10 +12,10 @@ 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; @@ -54,14 +48,14 @@ in { inputMethod = { enable = true; type = "fcitx5"; - fcitx5.addons = with pkgs; [fcitx5-mozc fcitx5-gtk]; + fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-gtk ]; }; }; # Bootloader. boot = { kernelPackages = pkgs.linuxPackages_rpi4; - kernelParams = ["consoleblank=60"]; + kernelParams = [ "consoleblank=60" ]; #loader = { #systemd-boot = { #enable = true; @@ -71,36 +65,34 @@ in { #efiSysMountPoint = "/boot"; #}; #}; - plymouth = {enable = true;}; - kernel = {sysctl = {"vm.swappiness" = 10;};}; + plymouth = { enable = true; }; + kernel = { sysctl = { "vm.swappiness" = 10; }; }; }; security = { - polkit = {enable = true;}; + polkit = { enable = true; }; sudo.enable = false; doas = { enable = true; - extraRules = [ - { - users = ["don"]; - keepEnv = true; - noPass = true; - } - ]; + extraRules = [{ + users = [ "don" ]; + keepEnv = true; + noPass = true; + }]; }; }; services = { - pcscd = {enable = true;}; - beszel-agent = {enable = true;}; + pcscd = { enable = true; }; + beszel-agent = { enable = true; }; avahi = { enable = true; nssmdns4 = true; }; - printing = {enable = true;}; - udisks2 = {enable = true;}; - nscd = {enableNsncd = true;}; - tailscale = {enable = true;}; + printing = { enable = true; }; + udisks2 = { enable = true; }; + nscd = { enableNsncd = true; }; + tailscale = { enable = true; }; locate = { enable = true; package = pkgs.mlocate; @@ -184,8 +176,8 @@ in { ]; programs = { - dconf = {enable = true;}; - mtr = {enable = true;}; + dconf = { enable = true; }; + mtr = { enable = true; }; gnupg = { agent = { enable = true; @@ -197,7 +189,7 @@ in { nixpkgs.overlays = [ (final: super: { - khal = super.khal.overridePythonAttrs (_: {doCheck = false;}); + khal = super.khal.overridePythonAttrs (_: { doCheck = false; }); }) ]; @@ -205,26 +197,22 @@ in { networking.firewall = { enable = true; # always allow traffic from your Tailscale network - trustedInterfaces = ["tailscale0"]; + trustedInterfaces = [ "tailscale0" ]; checkReversePath = "loose"; # allow the Tailscale UDP port through the firewall - allowedUDPPorts = [config.services.tailscale.port]; - allowedTCPPortRanges = [ - { - from = 1714; - to = 1764; - } - ]; - allowedUDPPortRanges = [ - { - from = 1714; - to = 1764; - } - ]; + allowedUDPPorts = [ config.services.tailscale.port ]; + allowedTCPPortRanges = [{ + from = 1714; + to = 1764; + }]; + allowedUDPPortRanges = [{ + from = 1714; + to = 1764; + }]; # allow you to SSH in over the public internet - allowedTCPPorts = [22]; + allowedTCPPorts = [ 22 ]; }; # This value determines the NixOS release from which the default diff --git a/hosts/wm/greetd/default.nix b/hosts/wm/greetd/default.nix index 719b039..6caf546 100644 --- a/hosts/wm/greetd/default.nix +++ b/hosts/wm/greetd/default.nix @@ -13,8 +13,7 @@ # package = "greetd.wlgreet"; settings = { default_session = { - command = - "${pkgs.greetd.greetd}/bin/agreety --cmd /home/don/bin/mysway"; + command = "${pkgs.greetd}/bin/agreety --cmd /home/don/bin/mysway"; # command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd /home/don/bin/mysway"; user = "greeter"; };