From 147b2f4c12d507c30ea1a0ec0be4d91aaff99075 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 1 Aug 2024 13:27:47 -0500 Subject: [PATCH] chore: nixfmt-rfc-style Signed-off-by: jolheiser --- apps/gui/default.nix | 43 ++--- apps/gui/firefox.nix | 59 ++++--- apps/gui/ghostty.nix | 4 +- apps/gui/gtk.nix | 12 +- apps/gui/spotify.nix | 25 +-- apps/gui/tiny.nix | 12 +- apps/gui/zed.nix | 9 +- apps/nogui/aerc.nix | 9 +- apps/nogui/atuin.nix | 2 +- apps/nogui/bat.nix | 7 +- apps/nogui/bottom.nix | 18 +- apps/nogui/default.nix | 7 +- apps/nogui/eza.nix | 3 +- apps/nogui/git.nix | 69 ++++---- apps/nogui/go.nix | 3 +- apps/nogui/gpg.nix | 10 +- apps/nogui/helix.nix | 202 ++++++++++++++++------ apps/nogui/jj.nix | 10 +- apps/nogui/jq.nix | 2 +- apps/nogui/lazygit.nix | 19 ++- apps/nogui/nushell.nix | 5 +- apps/nogui/oh-my-posh.nix | 6 +- apps/nogui/senpai.nix | 8 +- apps/nogui/ssh.nix | 7 +- apps/nogui/xdg.nix | 3 +- flake.nix | 267 +++++++++++++++--------------- machines/common/gui/default.nix | 22 ++- machines/common/nogui/default.nix | 25 ++- machines/dragonwell/caddy.nix | 26 +-- machines/dragonwell/default.nix | 37 ++++- machines/dragonwell/dex.nix | Bin 1934 -> 1942 bytes machines/dragonwell/git-pr.nix | 4 +- machines/dragonwell/go.nix | 19 ++- machines/dragonwell/golink.nix | 3 +- machines/dragonwell/hardware.nix | 14 +- machines/dragonwell/restic.nix | 11 +- machines/dragonwell/soju.nix | 8 +- machines/dragonwell/ugit.nix | 4 +- machines/genmaicha/default.nix | 22 ++- machines/genmaicha/hardware.nix | 25 +-- machines/matcha/default.nix | 30 +++- machines/matcha/hardware.nix | 16 +- machines/sencha/default.nix | 36 +++- machines/sencha/hardware.nix | 27 +-- modules/tclip/default.nix | 50 +++--- secrets/secrets.nix | 46 ++++- 46 files changed, 783 insertions(+), 463 deletions(-) diff --git a/apps/gui/default.nix b/apps/gui/default.nix index dc224a1..a80195f 100644 --- a/apps/gui/default.nix +++ b/apps/gui/default.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ imports = [ ../nogui ./firefox.nix @@ -24,24 +25,26 @@ nodePackages.yaml-language-server ]; }; - dconf.settings = let - wallpaper = pkgs.fetchurl { - url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png"; - hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ="; + dconf.settings = + let + wallpaper = pkgs.fetchurl { + url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png"; + hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ="; + }; + in + { + "org/cinnamon/desktop/background" = { + picture-uri = "file://${wallpaper}"; + }; + "org/cinnamon/desktop/interface" = { + font-name = "Monaspace Neon 10"; + }; + "org/cinnamon/desktop/wm/preferences" = { + titlebar-font = "Monaspace Neon Bold 10"; + }; + "org/gnome/desktop/interface" = { + document-font-name = "Monaspace Xenon 10"; + monospace-font-name = "Monaspace Argon 10"; + }; }; - in { - "org/cinnamon/desktop/background" = { - picture-uri = "file://${wallpaper}"; - }; - "org/cinnamon/desktop/interface" = { - font-name = "Monaspace Neon 10"; - }; - "org/cinnamon/desktop/wm/preferences" = { - titlebar-font = "Monaspace Neon Bold 10"; - }; - "org/gnome/desktop/interface" = { - document-font-name = "Monaspace Xenon 10"; - monospace-font-name = "Monaspace Argon 10"; - }; - }; } diff --git a/apps/gui/firefox.nix b/apps/gui/firefox.nix index 8d8dafd..9a85476 100644 --- a/apps/gui/firefox.nix +++ b/apps/gui/firefox.nix @@ -1,15 +1,19 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.firefox = { enable = true; profiles.default = { search = { default = "Kagi"; privateDefault = "DuckDuckGo"; - order = ["Kagi" "DuckDuckGo"]; + order = [ + "Kagi" + "DuckDuckGo" + ]; force = true; engines = { "Kagi" = { - definedAliases = ["@k"]; + definedAliases = [ "@k" ]; urls = [ { template = "https://kagi.com/search"; @@ -23,7 +27,7 @@ ]; }; "DuckDuckGo" = { - definedAliases = ["@d"]; + definedAliases = [ "@d" ]; urls = [ { template = "https://duckduckgo.com/"; @@ -57,9 +61,9 @@ "browser.newtabpage.activity-stream.feeds.section.topstories" = false; "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; "browser.newtabpage.pinned" = builtins.toJSON [ - {url = "https://github.com/";} - {url = "https://git.jojodev.com/";} - {url = "https://git.jolheiser.com";} + { url = "https://github.com/"; } + { url = "https://git.jojodev.com/"; } + { url = "https://git.jolheiser.com"; } ]; "browser.fixup.domainwhitelist.go" = true; # golink }; @@ -73,31 +77,34 @@ bookmarks = [ { name = "github"; - tags = ["gitea"]; + tags = [ "gitea" ]; keyword = "go-gitea"; url = "https://github.com/go-gitea/gitea"; } { name = "jojodev"; - tags = ["gitea"]; + tags = [ "gitea" ]; keyword = "jojodev"; url = "https://git.jojodev.com"; } { name = "gist"; - tags = ["gitea" "gist"]; + tags = [ + "gitea" + "gist" + ]; keyword = "gist"; url = "https://gist.jojodev.com"; } { name = "gitea"; - tags = ["gitea"]; + tags = [ "gitea" ]; keyword = "gitea"; url = "https://gitea.com"; } { name = "try"; - tags = ["gitea"]; + tags = [ "gitea" ]; keyword = "try"; url = "https://try.gitea.io"; } @@ -108,25 +115,28 @@ bookmarks = [ { name = "golink"; - tags = ["tailscale"]; + tags = [ "tailscale" ]; keyword = "go"; url = "http://go"; } { name = "tclip"; - tags = ["tailscale"]; + tags = [ "tailscale" ]; keyword = "paste"; url = "http://paste"; } { name = "ugit"; - tags = ["tailscale" "git"]; + tags = [ + "tailscale" + "git" + ]; keyword = "git"; url = "http://git"; } { name = "jellyfin"; - tags = ["jellyfin"]; + tags = [ "jellyfin" ]; keyword = "jellyfin"; url = "http://sencha:8096"; } @@ -134,20 +144,29 @@ } { name = "ugit"; - tags = ["git" "ugit"]; + tags = [ + "git" + "ugit" + ]; keyword = "ugit"; url = "https://git.jolheiser.com"; } { name = "git-pr"; - tags = ["git" "pr"]; + tags = [ + "git" + "pr" + ]; keyword = "git-pr"; url = "https://pr.jolheiser.com"; } { name = "todo"; - tags = ["vikunja" "todo"]; + tags = [ + "vikunja" + "todo" + ]; keyword = "todo"; url = "https://todo.jolheiser.com"; } @@ -156,7 +175,7 @@ # Not in the toolbar, but still usable via keyword/searching { name = "Go Playground"; - tags = ["golang"]; + tags = [ "golang" ]; keyword = "play"; url = "https://go.dev/play/"; } diff --git a/apps/gui/ghostty.nix b/apps/gui/ghostty.nix index e34d63c..761f248 100644 --- a/apps/gui/ghostty.nix +++ b/apps/gui/ghostty.nix @@ -8,7 +8,7 @@ term = xterm-256color ''; # zig build -p ~/.local/share/ghostty -Doptimize=ReleaseFast - xdg.systemDirs.data = ["/home/jolheiser/.local/share/ghostty/share"]; - home.sessionPath = ["/home/jolheiser/.local/share/ghostty/bin"]; + xdg.systemDirs.data = [ "/home/jolheiser/.local/share/ghostty/share" ]; + home.sessionPath = [ "/home/jolheiser/.local/share/ghostty/bin" ]; programs.bash.enable = true; } diff --git a/apps/gui/gtk.nix b/apps/gui/gtk.nix index 615ab9f..ee39071 100644 --- a/apps/gui/gtk.nix +++ b/apps/gui/gtk.nix @@ -3,7 +3,8 @@ lib, pkgs, ... -}: { +}: +{ home.pointerCursor = { name = "catppuccin-cursors"; package = pkgs.catppuccin-cursors.mochaLavender; @@ -21,7 +22,7 @@ theme = { name = "Catppuccin-Mocha-Compact-Lavender-Dark"; package = pkgs.catppuccin-gtk.override { - accents = ["lavender"]; + accents = [ "lavender" ]; variant = "mocha"; size = "compact"; }; @@ -41,9 +42,10 @@ }; }; - xdg = let - themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}"; - in + xdg = + let + themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}"; + in lib.mkIf config.gtk.enable { configFile = { "gtk-4.0/assets" = { diff --git a/apps/gui/spotify.nix b/apps/gui/spotify.nix index 847b8e6..e6ed067 100644 --- a/apps/gui/spotify.nix +++ b/apps/gui/spotify.nix @@ -1,17 +1,22 @@ -{pkgs, ...}: { - xdg.configFile."spotify-player/theme.toml".text = builtins.readFile (pkgs.fetchFromGitHub { +{ pkgs, ... }: +{ + xdg.configFile."spotify-player/theme.toml".text = builtins.readFile ( + pkgs.fetchFromGitHub { owner = "catppuccin"; repo = "spotify-player"; rev = "002d51b02b3a2ebc0804e4839ee604dbdab4bec3"; sha256 = "sha256-IUhzVrIBMi/Dn6+HV0m9i38Msg8zzzJlR85JeEVE7EU="; } - + "/src/theme.toml"); - xdg.configFile."spotify-player/app.toml".source = (pkgs.formats.toml {}).generate "spotify-player-config" { - client_id = "41af4976ba70474fbd541ee8764a2cda"; - theme = "Catppuccin-mocha"; - enable_notify = false; - enable_media_control = true; - device.volume = 100; - }; + + "/src/theme.toml" + ); + xdg.configFile."spotify-player/app.toml".source = + (pkgs.formats.toml { }).generate "spotify-player-config" + { + client_id = "41af4976ba70474fbd541ee8764a2cda"; + theme = "Catppuccin-mocha"; + enable_notify = false; + enable_media_control = true; + device.volume = 100; + }; programs.nushell.shellAliases.spt = "spotify_player"; } diff --git a/apps/gui/tiny.nix b/apps/gui/tiny.nix index e6113b5..edf264f 100644 --- a/apps/gui/tiny.nix +++ b/apps/gui/tiny.nix @@ -1,4 +1,5 @@ -{config, ...}: { +{ config, ... }: +{ programs.tiny = { enable = true; settings = { @@ -8,9 +9,12 @@ port = 6697; tls = true; realname = "jolheiser"; - nicks = ["jolheiser"]; + nicks = [ "jolheiser" ]; alias = "LiberaChat"; - join = ["#gitea" "#gitea-devel"]; + join = [ + "#gitea" + "#gitea-devel" + ]; sasl = { username = "jolheiser"; password = { @@ -20,7 +24,7 @@ } ]; defaults = { - nicks = ["jolheiser"]; + nicks = [ "jolheiser" ]; realname = "jolheiser"; }; key_map = { diff --git a/apps/gui/zed.nix b/apps/gui/zed.nix index 6fff16e..d6b5ba2 100644 --- a/apps/gui/zed.nix +++ b/apps/gui/zed.nix @@ -1,5 +1,6 @@ -{pkgs, ...}: { - home.packages = [pkgs.zed-editor]; +{ pkgs, ... }: +{ + home.packages = [ pkgs.zed-editor ]; xdg.configFile."zed/settings.json".text = builtins.toJSON { buffer_font_family = "Monaspace Neon"; buffer_font_size = 16; @@ -10,7 +11,9 @@ }; terminal = { font_family = "Monaspace Neon"; - shell = {program = "nu";}; + shell = { + program = "nu"; + }; }; theme = "Catppuccin Mocha"; ui_font_size = 16; diff --git a/apps/nogui/aerc.nix b/apps/nogui/aerc.nix index ddbc8a3..0bf314e 100644 --- a/apps/nogui/aerc.nix +++ b/apps/nogui/aerc.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.aerc = { enable = true; extraConfig = { @@ -31,13 +32,15 @@ }; }; stylesets = { - catppuccin-mocha = builtins.readFile (pkgs.fetchFromGitHub { + catppuccin-mocha = builtins.readFile ( + pkgs.fetchFromGitHub { owner = "catppuccin"; repo = "aerc"; rev = "c1f233bd22894d7ccf69846c3bd7bcd5af0fc2a2"; sha256 = "sha256-YJdNPROhwgge14O1zuGh/ZK/qjHDxi+xdAyPEIXRI9c="; } - + "/dist/catppuccin-mocha"); + + "/dist/catppuccin-mocha" + ); }; }; } diff --git a/apps/nogui/atuin.nix b/apps/nogui/atuin.nix index a249699..8ee816f 100644 --- a/apps/nogui/atuin.nix +++ b/apps/nogui/atuin.nix @@ -2,6 +2,6 @@ programs.atuin = { enable = true; enableNushellIntegration = true; - flags = ["--disable-up-arrow"]; + flags = [ "--disable-up-arrow" ]; }; } diff --git a/apps/nogui/bat.nix b/apps/nogui/bat.nix index afb7398..8eff3e6 100644 --- a/apps/nogui/bat.nix +++ b/apps/nogui/bat.nix @@ -1,7 +1,10 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.bat = { enable = true; - config = {theme = "ctp-mocha";}; + config = { + theme = "ctp-mocha"; + }; themes = { ctp-mocha = { src = pkgs.fetchFromGitHub { diff --git a/apps/nogui/bottom.nix b/apps/nogui/bottom.nix index e7d4b88..98446f7 100644 --- a/apps/nogui/bottom.nix +++ b/apps/nogui/bottom.nix @@ -6,7 +6,14 @@ table_header_color = "#f5e0dc"; all_cpu_color = "#f5e0dc"; avg_cpu_color = "#eba0ac"; - cpu_core_colors = ["#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" "#74c7ec" "#cba6f7"]; + cpu_core_colors = [ + "#f38ba8" + "#fab387" + "#f9e2af" + "#a6e3a1" + "#74c7ec" + "#cba6f7" + ]; ram_color = "#a6e3a1"; swap_color = "#fab387"; rx_color = "#a6e3a1"; @@ -22,7 +29,14 @@ high_battery_color = "#a6e3a1"; medium_battery_color = "#f9e2af"; low_battery_color = "#f38ba8"; - gpu_core_colors = ["#74c7ec" "#cba6f7" "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1"]; + gpu_core_colors = [ + "#74c7ec" + "#cba6f7" + "#f38ba8" + "#fab387" + "#f9e2af" + "#a6e3a1" + ]; arc_color = "#89dceb"; }; }; diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix index a74f679..cfabab8 100644 --- a/apps/nogui/default.nix +++ b/apps/nogui/default.nix @@ -1,8 +1,5 @@ +{ pkgs, config, ... }: { - pkgs, - config, - ... -}: { imports = [ ./aerc.nix ./atuin.nix @@ -52,7 +49,7 @@ jsonnet-language-server # Formatters - alejandra + nixfmt-rfc-style gofumpt # Flake overlays diff --git a/apps/nogui/eza.nix b/apps/nogui/eza.nix index 4bc0374..ac1155f 100644 --- a/apps/nogui/eza.nix +++ b/apps/nogui/eza.nix @@ -1,4 +1,5 @@ -{lib, ...}: { +{ lib, ... }: +{ programs.eza = { enable = true; git = true; diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix index 6b96c2f..9ddc6ee 100644 --- a/apps/nogui/git.nix +++ b/apps/nogui/git.nix @@ -1,8 +1,5 @@ -{ - pkgs, - config, - ... -}: let +{ pkgs, config, ... }: +let insteadOf = prefix: domain: { "https://${domain}/".insteadOf = "${prefix}:"; "git@${domain}:".insteadOf = "ssh:${prefix}:"; @@ -17,7 +14,8 @@ ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}"; }; }; -in { +in +{ programs.git = { enable = true; userName = "jolheiser"; @@ -40,38 +38,37 @@ in { tui = "!lazygit"; }; lfs.enable = true; - ignores = [".idea/" "result" "node_modules" "ve"]; - extraConfig = - { - init.defaultBranch = "main"; - merge.conflictstyle = "zdiff3"; - diff.colorMoved = "default"; - core.editor = "hx"; - push = { - sutoSetupRemote = true; - default = "current"; - gpgSign = "if-asked"; - }; - rerere.enabled = true; - pull.rebase = true; - diff.algorithm = "histogram"; - merge.tool = "hx"; - url = - insteadOf "jo" "git.jolheiser.com" - // insteadOf "gh" "github.com" - // insteadOf "jj" "git.jojodev.com" - // insteadOf "gt" "gitea.com" - // insteadOf "gl" "gitlab.com" - // insteadOf "cb" "codeberg.org"; - } - // sshSigning; + ignores = [ + ".idea/" + "result" + "node_modules" + "ve" + ]; + extraConfig = { + init.defaultBranch = "main"; + merge.conflictstyle = "zdiff3"; + diff.colorMoved = "default"; + core.editor = "hx"; + push = { + sutoSetupRemote = true; + default = "current"; + gpgSign = "if-asked"; + }; + rerere.enabled = true; + pull.rebase = true; + diff.algorithm = "histogram"; + merge.tool = "hx"; + url = + insteadOf "jo" "git.jolheiser.com" + // insteadOf "gh" "github.com" + // insteadOf "jj" "git.jojodev.com" + // insteadOf "gt" "gitea.com" + // insteadOf "gl" "gitlab.com" + // insteadOf "cb" "codeberg.org"; + } // sshSigning; difftastic = { enable = true; }; - includes = [ - { - path = config.age.secrets.git-send-email.path; - } - ]; + includes = [ { path = config.age.secrets.git-send-email.path; } ]; }; } diff --git a/apps/nogui/go.nix b/apps/nogui/go.nix index 6d7ec86..47f4a8f 100644 --- a/apps/nogui/go.nix +++ b/apps/nogui/go.nix @@ -1,6 +1,7 @@ let goPath = ".local/share/go"; -in { +in +{ programs.go = { inherit goPath; enable = true; diff --git a/apps/nogui/gpg.nix b/apps/nogui/gpg.nix index dac1043..bb1873d 100644 --- a/apps/nogui/gpg.nix +++ b/apps/nogui/gpg.nix @@ -1,7 +1,9 @@ -{pkgs, ...}: let +{ pkgs, ... }: +let key = "0xB853ADA5DA7BBF7A"; -in { - home.packages = with pkgs; [pinentry]; +in +{ + home.packages = with pkgs; [ pinentry ]; home.file.".mozilla/native-messaging-hosts/gpgmejson.json" = { enable = true; text = builtins.toJSON { @@ -9,7 +11,7 @@ in { description = "JavaScript binding for GnuPG"; path = pkgs.gpgme.dev + /bin/gpgme-json; type = "stdio"; - allowed_extensions = ["jid1-AQqSMBYb0a8ADg@jetpack"]; + allowed_extensions = [ "jid1-AQqSMBYb0a8ADg@jetpack" ]; }; }; programs.gpg = { diff --git a/apps/nogui/helix.nix b/apps/nogui/helix.nix index 375ca86..3397587 100644 --- a/apps/nogui/helix.nix +++ b/apps/nogui/helix.nix @@ -1,15 +1,20 @@ # This entire file is superceded by https://git.jolheiser.com/helix.drv -{pkgs, ...}: let - query = scm: - builtins.readFile (pkgs.fetchFromGitea { +{ pkgs, ... }: +let + query = + scm: + builtins.readFile ( + pkgs.fetchFromGitea { domain = "git.jojodev.com"; owner = "jolheiser"; repo = "templ-helix"; rev = "2a47b9c5af0fd9ae8bba8198fd66abc6d07fdf10"; sha256 = "sha256-pTdOX9bPup626t+ko6k3Xq/tprAMAZCUBl+xeIBkhfs="; } - + "/queries/templ/${scm}.scm"); -in { + + "/queries/templ/${scm}.scm" + ); +in +{ programs.helix = { enable = true; defaultEditor = true; @@ -25,12 +30,16 @@ in { normal = "block"; select = "underline"; }; - file-picker = {hidden = false;}; + file-picker = { + hidden = false; + }; indent-guides = { render = true; skip-levels = 1; }; - soft-wrap = {enable = true;}; + soft-wrap = { + enable = true; + }; statusline = { right = [ "version-control" @@ -40,7 +49,9 @@ in { "file-encoding" ]; }; - lsp = {display-messages = true;}; + lsp = { + display-messages = true; + }; }; keys = { normal = { @@ -56,33 +67,61 @@ in { S-right = "goto_next_buffer"; S-left = "goto_previous_buffer"; C-b = ":buffer-close"; - C-s = ["select_all" "select_regex"]; + C-s = [ + "select_all" + "select_regex" + ]; C-j = "shrink_selection"; C-k = "expand_selection"; C-l = "select_next_sibling"; C-a = "select_all"; - C-u = ["half_page_up" "align_view_center"]; - C-d = ["half_page_down" "align_view_center"]; + C-u = [ + "half_page_up" + "align_view_center" + ]; + C-d = [ + "half_page_down" + "align_view_center" + ]; - "{" = ["goto_prev_paragraph" "collapse_selection"]; - "}" = ["goto_next_paragraph" "collapse_selection"]; + "{" = [ + "goto_prev_paragraph" + "collapse_selection" + ]; + "}" = [ + "goto_next_paragraph" + "collapse_selection" + ]; "0" = "goto_line_start"; "$" = "goto_line_end"; "^" = "goto_first_nonwhitespace"; G = "goto_file_end"; "%" = "match_brackets"; - V = ["select_mode" "extend_to_line_bounds"]; - C = ["collapse_selection" "extend_to_line_end" "change_selection"]; - D = ["extend_to_line_end" "delete_selection"]; + V = [ + "select_mode" + "extend_to_line_bounds" + ]; + C = [ + "collapse_selection" + "extend_to_line_end" + "change_selection" + ]; + D = [ + "extend_to_line_end" + "delete_selection" + ]; S = "surround_add"; d = { - d = ["extend_to_line_bounds" "delete_selection"]; - t = ["extend_till_char"]; - s = ["surround_delete"]; - i = ["select_textobject_inner"]; - a = ["select_textobject_around"]; + d = [ + "extend_to_line_bounds" + "delete_selection" + ]; + t = [ "extend_till_char" ]; + s = [ "surround_delete" ]; + i = [ "select_textobject_inner" ]; + a = [ "select_textobject_around" ]; }; x = "delete_selection"; @@ -101,16 +140,40 @@ in { "collapse_selection" ]; - w = ["move_next_word_start" "move_char_right" "collapse_selection"]; - e = ["move_next_word_end" "collapse_selection"]; - b = ["move_prev_word_start" "collapse_selection"]; + w = [ + "move_next_word_start" + "move_char_right" + "collapse_selection" + ]; + e = [ + "move_next_word_end" + "collapse_selection" + ]; + b = [ + "move_prev_word_start" + "collapse_selection" + ]; - i = ["insert_mode" "collapse_selection"]; - a = ["append_mode" "collapse_selection"]; + i = [ + "insert_mode" + "collapse_selection" + ]; + a = [ + "append_mode" + "collapse_selection" + ]; - esc = ["collapse_selection" "keep_primary_selection"]; + esc = [ + "collapse_selection" + "keep_primary_selection" + ]; + }; + insert = { + esc = [ + "collapse_selection" + "normal_mode" + ]; }; - insert = {esc = ["collapse_selection" "normal_mode"];}; select = { space = { j = { @@ -118,28 +181,60 @@ in { c = ":pipe jq -c"; }; }; - "{" = ["extend_to_line_bounds" "goto_prev_paragraph"]; - "}" = ["extend_to_line_bounds" "goto_next_paragraph"]; + "{" = [ + "extend_to_line_bounds" + "goto_prev_paragraph" + ]; + "}" = [ + "extend_to_line_bounds" + "goto_next_paragraph" + ]; "0" = "goto_line_start"; "$" = "goto_line_end"; "^" = "goto_first_nonwhitespace"; G = "goto_file_end"; - D = ["extend_to_line_bounds" "delete_selection" "normal_mode"]; - C = ["goto_line_start" "extend_to_line_bounds" "change_selection"]; + D = [ + "extend_to_line_bounds" + "delete_selection" + "normal_mode" + ]; + C = [ + "goto_line_start" + "extend_to_line_bounds" + "change_selection" + ]; "%" = "match_brackets"; S = "surround_add"; i = "select_textobject_inner"; a = "select_textobject_around"; - tab = ["insert_mode" "collapse_selection"]; - C-a = ["append_mode" "collapse_selection"]; + tab = [ + "insert_mode" + "collapse_selection" + ]; + C-a = [ + "append_mode" + "collapse_selection" + ]; - k = ["extend_line_up" "extend_to_line_bounds"]; - j = ["extend_line_down" "extend_to_line_bounds"]; + k = [ + "extend_line_up" + "extend_to_line_bounds" + ]; + j = [ + "extend_line_down" + "extend_to_line_bounds" + ]; - d = ["yank_main_selection_to_clipboard" "delete_selection"]; - x = ["yank_main_selection_to_clipboard" "delete_selection"]; + d = [ + "yank_main_selection_to_clipboard" + "delete_selection" + ]; + x = [ + "yank_main_selection_to_clipboard" + "delete_selection" + ]; y = [ "yank_main_selection_to_clipboard" "normal_mode" @@ -156,7 +251,11 @@ in { p = "replace_selections_with_clipboard"; P = "paste_clipboard_before"; - esc = ["collapse_selection" "keep_primary_selection" "normal_mode"]; + esc = [ + "collapse_selection" + "keep_primary_selection" + "normal_mode" + ]; }; }; }; @@ -172,7 +271,7 @@ in { name = "lua"; formatter = { command = "luafmt"; - args = ["--stdin"]; + args = [ "--stdin" ]; }; } { @@ -180,7 +279,10 @@ in { auto-format = true; formatter = { command = "black"; - args = ["--quiet" "-"]; + args = [ + "--quiet" + "-" + ]; }; } { @@ -188,7 +290,7 @@ in { auto-format = true; formatter = { command = "alejandra"; - args = ["-qq"]; + args = [ "-qq" ]; }; } { @@ -196,16 +298,16 @@ in { auto-format = true; scope = "source.templ"; injection-regex = "templ"; - file-types = ["templ"]; - roots = ["go.mod"]; + file-types = [ "templ" ]; + roots = [ "go.mod" ]; comment-token = "//"; language-server = { command = "templ"; - args = ["lsp"]; + args = [ "lsp" ]; }; formatter = { command = "templ"; - args = ["fmt"]; + args = [ "fmt" ]; }; } ]; @@ -222,19 +324,19 @@ in { themes = { catppuccin_frappe_transparent = { inherits = "catppuccin_frappe"; - "ui.background" = {}; + "ui.background" = { }; }; catppuccin_latte_transparent = { inherits = "catppuccin_latte"; - "ui.background" = {}; + "ui.background" = { }; }; catppuccin_macchiato_transparent = { inherits = "catppuccin_macchiato"; - "ui.background" = {}; + "ui.background" = { }; }; catppuccin_mocha_transparent = { inherits = "catppuccin_mocha"; - "ui.background" = {}; + "ui.background" = { }; }; }; }; diff --git a/apps/nogui/jj.nix b/apps/nogui/jj.nix index 5d6b9f4..2cd4c9a 100644 --- a/apps/nogui/jj.nix +++ b/apps/nogui/jj.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.jujutsu = { enable = true; settings = { @@ -7,7 +8,12 @@ email = "git@jolheiser.com"; }; ui = { - diff.tool = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"]; + diff.tool = [ + "${pkgs.difftastic}/bin/difft" + "--color=always" + "$left" + "$right" + ]; editor = "hx"; }; signing = { diff --git a/apps/nogui/jq.nix b/apps/nogui/jq.nix index 1cb6a31..3c01c41 100644 --- a/apps/nogui/jq.nix +++ b/apps/nogui/jq.nix @@ -1 +1 @@ -{programs.jq.enable = true;} +{ programs.jq.enable = true; } diff --git a/apps/nogui/lazygit.nix b/apps/nogui/lazygit.nix index c334563..651aac3 100644 --- a/apps/nogui/lazygit.nix +++ b/apps/nogui/lazygit.nix @@ -6,14 +6,17 @@ update.method = "never"; gui.theme = { lightTheme = false; - activeBorderColor = ["#a6e3a1" "bold"]; - inactiveBorderColor = ["#cdd6f4"]; - optionsTextColor = ["#89b4fa"]; - selectedLineBgColor = ["#313244"]; - selectedRangeBgColor = ["#313244"]; - cherryPickedCommitBgColor = ["#94e2d5"]; - cherryPickedCommitFgColor = ["#89b4fa"]; - unstagedChangesColor = ["#f38ba8"]; + activeBorderColor = [ + "#a6e3a1" + "bold" + ]; + inactiveBorderColor = [ "#cdd6f4" ]; + optionsTextColor = [ "#89b4fa" ]; + selectedLineBgColor = [ "#313244" ]; + selectedRangeBgColor = [ "#313244" ]; + cherryPickedCommitBgColor = [ "#94e2d5" ]; + cherryPickedCommitFgColor = [ "#89b4fa" ]; + unstagedChangesColor = [ "#f38ba8" ]; }; }; }; diff --git a/apps/nogui/nushell.nix b/apps/nogui/nushell.nix index 70b128b..918dcd5 100644 --- a/apps/nogui/nushell.nix +++ b/apps/nogui/nushell.nix @@ -1,8 +1,5 @@ +{ pkgs, config, ... }: { - pkgs, - config, - ... -}: { programs.nushell = { enable = true; configFile.source = ./nushell/config.nu; diff --git a/apps/nogui/oh-my-posh.nix b/apps/nogui/oh-my-posh.nix index a763f3f..b1848ce 100644 --- a/apps/nogui/oh-my-posh.nix +++ b/apps/nogui/oh-my-posh.nix @@ -1,8 +1,8 @@ { programs.oh-my-posh = { enable = true; - settings = - builtins.fromJSON (builtins.unsafeDiscardStringContext - (builtins.readFile ./ohmyposh/config.json)); + settings = builtins.fromJSON ( + builtins.unsafeDiscardStringContext (builtins.readFile ./ohmyposh/config.json) + ); }; } diff --git a/apps/nogui/senpai.nix b/apps/nogui/senpai.nix index e535595..2cdf454 100644 --- a/apps/nogui/senpai.nix +++ b/apps/nogui/senpai.nix @@ -1,10 +1,14 @@ -{config, ...}: { +{ config, ... }: +{ programs.senpai = { enable = true; config = { address = "ircs+insecure://irc.jolheiser.com:6697"; nickname = "jolheiser"; - password-cmd = ["cat" "${config.age.secrets.irc-pw.path}"]; + password-cmd = [ + "cat" + "${config.age.secrets.irc-pw.path}" + ]; #channel = "#pico.sh #gitea"; typings = false; }; diff --git a/apps/nogui/ssh.nix b/apps/nogui/ssh.nix index 86c957d..b50143e 100644 --- a/apps/nogui/ssh.nix +++ b/apps/nogui/ssh.nix @@ -1,8 +1,7 @@ -{config, ...}: { +{ config, ... }: +{ programs.ssh = { enable = true; - includes = [ - config.age.secrets.ssh-config.path - ]; + includes = [ config.age.secrets.ssh-config.path ]; }; } diff --git a/apps/nogui/xdg.nix b/apps/nogui/xdg.nix index 7f47814..ade2de7 100644 --- a/apps/nogui/xdg.nix +++ b/apps/nogui/xdg.nix @@ -1,4 +1,5 @@ -{config, ...}: { +{ config, ... }: +{ xdg = { enable = true; userDirs.enable = true; diff --git a/flake.nix b/flake.nix index 5787a3d..f0a6458 100644 --- a/flake.nix +++ b/flake.nix @@ -120,143 +120,148 @@ }; }; - outputs = { - nixpkgs, - home-manager, - nixos-hardware, - agenix, - wsl, - ... - } @ inputs: let - overlays = [ - (_: prev: { - nur = import inputs.nur { - nurpkgs = prev; - pkgs = prev; - }; - jolheiser = { - nur = inputs.jolheiser-nur.packages.${prev.system}; - helix = inputs.helix.packages.${prev.system}.default; - website = inputs.website.packages.${prev.system}.default; - resume = inputs.resume.packages.${prev.system}.default; - git-age = inputs.git-age.packages.${prev.system}.default; - gist = inputs.gist.packages.${prev.system}.default; - tmpl = inputs.tmpl.packages.${prev.system}.default; - gomodinit = inputs.gomodinit.packages.${prev.system}.default; - cfg = inputs.cfg.packages.${prev.system}.default; - blog = inputs.blog.packages.${prev.system}.default; - bennet = inputs.bennet.packages.${prev.system}.default; - }; - tclip = inputs.tclip.packages.${prev.system}.tclip; - templ = inputs.templ.packages.${prev.system}.templ; - }) - inputs.golink.overlay - ]; - pkgs = import inputs.nixpkgs { - inherit overlays system; - config.allowUnfree = true; - }; - commonConfig = {config, ...}: { - config = { - nixpkgs.overlays = overlays; - # TODO Remove when apps are updated - nixpkgs.config.permittedInsecurePackages = [ - "electron-25.9.0" - ]; + outputs = + { + nixpkgs, + home-manager, + nixos-hardware, + agenix, + wsl, + ... + }@inputs: + let + overlays = [ + (_: prev: { + nur = import inputs.nur { + nurpkgs = prev; + pkgs = prev; + }; + jolheiser = { + nur = inputs.jolheiser-nur.packages.${prev.system}; + helix = inputs.helix.packages.${prev.system}.default; + website = inputs.website.packages.${prev.system}.default; + resume = inputs.resume.packages.${prev.system}.default; + git-age = inputs.git-age.packages.${prev.system}.default; + gist = inputs.gist.packages.${prev.system}.default; + tmpl = inputs.tmpl.packages.${prev.system}.default; + gomodinit = inputs.gomodinit.packages.${prev.system}.default; + cfg = inputs.cfg.packages.${prev.system}.default; + blog = inputs.blog.packages.${prev.system}.default; + bennet = inputs.bennet.packages.${prev.system}.default; + }; + tclip = inputs.tclip.packages.${prev.system}.tclip; + templ = inputs.templ.packages.${prev.system}.templ; + }) + inputs.golink.overlay + ]; + pkgs = import inputs.nixpkgs { + inherit overlays system; + config.allowUnfree = true; }; - }; - username = "jolheiser"; - system = "x86_64-linux"; - homeManagerModules = [ - agenix.homeManagerModules.age - { - home = { - inherit username; - homeDirectory = "/home/${username}"; - }; - age = { - secretsDir = "/home/${username}/.agenix/agenix"; - secretsMountPoint = "/home/${username}/.agenix/agenix.d"; - identityPaths = ["/home/${username}/.ssh/nix"]; - secrets = { - ssh-config.file = ./secrets/shared/ssh-config.age; - spotify = { - file = ./secrets/shared/spotify.age; - path = "/home/${username}/.cache/spotify-player/credentials.json"; - }; - irc-pw.file = ./secrets/shared/irc-pw.age; - gist-pw.file = ./secrets/shared/gist-pw.age; - git-send-email.file = ./secrets/shared/git-send-email.age; - cachix = { - file = ./secrets/shared/cachix.age; - path = "/home/${username}/.config/cachix/cachix.dhall"; - }; + commonConfig = + { config, ... }: + { + config = { + nixpkgs.overlays = overlays; + # TODO Remove when apps are updated + nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ]; }; }; - } - ./apps/gui - ]; - in { - inherit homeManagerModules; - homeConfigurations = { - "jolheiser" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = homeManagerModules; - }; - }; - nixosConfigurations = { - "matcha" = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - ./machines/matcha - commonConfig - ]; - }; - "genmaicha" = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - nixos-hardware.nixosModules.framework-13-7040-amd - ./machines/genmaicha - commonConfig - ]; - }; - "sencha" = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - ./machines/sencha - commonConfig - ]; - }; - }; - colmena = { - meta = { - nixpkgs = import nixpkgs { - inherit overlays system; + username = "jolheiser"; + system = "x86_64-linux"; + homeManagerModules = [ + agenix.homeManagerModules.age + { + home = { + inherit username; + homeDirectory = "/home/${username}"; + }; + age = { + secretsDir = "/home/${username}/.agenix/agenix"; + secretsMountPoint = "/home/${username}/.agenix/agenix.d"; + identityPaths = [ "/home/${username}/.ssh/nix" ]; + secrets = { + ssh-config.file = ./secrets/shared/ssh-config.age; + spotify = { + file = ./secrets/shared/spotify.age; + path = "/home/${username}/.cache/spotify-player/credentials.json"; + }; + irc-pw.file = ./secrets/shared/irc-pw.age; + gist-pw.file = ./secrets/shared/gist-pw.age; + git-send-email.file = ./secrets/shared/git-send-email.age; + cachix = { + file = ./secrets/shared/cachix.age; + path = "/home/${username}/.config/cachix/cachix.dhall"; + }; + }; + }; + } + ./apps/gui + ]; + in + { + inherit homeManagerModules; + homeConfigurations = { + "jolheiser" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = homeManagerModules; }; }; - dragonwell = {pkgs, ...}: { - imports = [ - inputs.agenix.nixosModules.default - inputs.golink.nixosModules.default - inputs.ugit.nixosModules.default - inputs.git-pr.nixosModules.default - inputs.actual.nixosModules.default - inputs.tsnet-serve.nixosModules.default - ./modules/tclip - ./machines/dragonwell + nixosConfigurations = { + "matcha" = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + ./machines/matcha + commonConfig + ]; + }; + "genmaicha" = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + nixos-hardware.nixosModules.framework-13-7040-amd + ./machines/genmaicha + commonConfig + ]; + }; + "sencha" = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + ./machines/sencha + commonConfig + ]; + }; + }; + colmena = { + meta = { + nixpkgs = import nixpkgs { inherit overlays system; }; + }; + dragonwell = + { pkgs, ... }: + { + imports = [ + inputs.agenix.nixosModules.default + inputs.golink.nixosModules.default + inputs.ugit.nixosModules.default + inputs.git-pr.nixosModules.default + inputs.actual.nixosModules.default + inputs.tsnet-serve.nixosModules.default + ./modules/tclip + ./machines/dragonwell + ]; + services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd; + }; + }; + nixConfig = { + extra-substitutors = [ "https://jolheiser.cachix.org" ]; + extra-trusted-public-keys = [ + "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg=" + ]; + }; + devShells.${system}.default = pkgs.mkShell { + nativeBuildInputs = [ + agenix.packages.${system}.agenix + pkgs.colmena ]; - services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd; }; }; - nixConfig = { - extra-substitutors = ["https://jolheiser.cachix.org"]; - extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="]; - }; - devShells.${system}.default = pkgs.mkShell { - nativeBuildInputs = [ - agenix.packages.${system}.agenix - pkgs.colmena - ]; - }; - }; } diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix index 1c509f0..cb20107 100644 --- a/machines/common/gui/default.nix +++ b/machines/common/gui/default.nix @@ -1,9 +1,12 @@ -{pkgs, ...}: { - imports = [../nogui]; +{ pkgs, ... }: +{ + imports = [ ../nogui ]; sound.enable = true; hardware.pulseaudio.enable = false; - security = {rtkit.enable = true;}; + security = { + rtkit.enable = true; + }; services = { pipewire = { enable = true; @@ -20,6 +23,15 @@ }; }; }; - fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono" "Iosevka" "Hack"];}) monaspace]; - environment.systemPackages = [pkgs.tailscale-systray]; + fonts.packages = with pkgs; [ + (nerdfonts.override { + fonts = [ + "JetBrainsMono" + "Iosevka" + "Hack" + ]; + }) + monaspace + ]; + environment.systemPackages = [ pkgs.tailscale-systray ]; } diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix index 2343af3..8bc8c87 100644 --- a/machines/common/nogui/default.nix +++ b/machines/common/nogui/default.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ console.colors = [ "1e1e2e" "585b70" @@ -45,12 +46,20 @@ gc.automatic = true; package = pkgs.nixVersions.stable; settings = { - trusted-users = ["@sudo" "@wheel" "jolheiser"]; - experimental-features = ["flakes" "nix-command" "repl-flake"]; + trusted-users = [ + "@sudo" + "@wheel" + "jolheiser" + ]; + experimental-features = [ + "flakes" + "nix-command" + "repl-flake" + ]; auto-optimise-store = true; warn-dirty = false; - substituters = ["https://jolheiser.cachix.org"]; - trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="]; + substituters = [ "https://jolheiser.cachix.org" ]; + trusted-public-keys = [ "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg=" ]; }; }; @@ -64,6 +73,10 @@ services.tailscale.enable = true; environment = { - systemPackages = with pkgs; [podman podman-compose podman-tui]; + systemPackages = with pkgs; [ + podman + podman-compose + podman-tui + ]; }; } diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 52b1774..7621f1a 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -1,6 +1,8 @@ -{pkgs, ...}: let +{ pkgs, ... }: +let modules = import ./go.nix; -in { +in +{ services.caddy = { enable = true; virtualHosts = { @@ -8,15 +10,17 @@ in { extraConfig = '' handle_path /.well-known/webfinger { header Content-Type application/jrd+json - respond ${builtins.toJSON { - subject = "acct:john@jolheiser.com"; - links = [ - { - rel = "http://openid.net/specs/connect/1.0/issuer"; - href = "https://auth.jolheiser.com"; + respond ${ + builtins.toJSON { + subject = "acct:john@jolheiser.com"; + links = [ + { + rel = "http://openid.net/specs/connect/1.0/issuer"; + href = "https://auth.jolheiser.com"; + } + ]; } - ]; - }} + } } handle_path /bennet* { root * ${pkgs.jolheiser.bennet} @@ -32,7 +36,7 @@ in { file_server } ''; - serverAliases = ["www.jolheiser.com"]; + serverAliases = [ "www.jolheiser.com" ]; }; "blog.jolheiser.com" = { extraConfig = '' diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index b0f1391..f380867 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -1,8 +1,23 @@ let username = "jolheiser"; key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser''; -in { - imports = [./actual.nix ./caddy.nix ./dex.nix ./git-pr.nix ./golink.nix ./gotosocial.nix ./restic.nix ./soju.nix ./tandoor.nix ./tclip.nix ./ugit.nix ./vikunja.nix ./hardware.nix]; +in +{ + imports = [ + ./actual.nix + ./caddy.nix + ./dex.nix + ./git-pr.nix + ./golink.nix + ./gotosocial.nix + ./restic.nix + ./soju.nix + ./tandoor.nix + ./tclip.nix + ./ugit.nix + ./vikunja.nix + ./hardware.nix + ]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; @@ -12,7 +27,11 @@ in { firewall = { enable = true; - allowedTCPPorts = [80 443 6697]; + allowedTCPPorts = [ + 80 + 443 + 6697 + ]; }; }; @@ -23,13 +42,15 @@ in { users.users = { "${username}" = { - extraGroups = ["wheel" "docker" "storage"]; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - key + extraGroups = [ + "wheel" + "docker" + "storage" ]; + isNormalUser = true; + openssh.authorizedKeys.keys = [ key ]; }; - "root".openssh.authorizedKeys.keys = [key]; + "root".openssh.authorizedKeys.keys = [ key ]; }; system.stateVersion = "22.11"; diff --git a/machines/dragonwell/dex.nix b/machines/dragonwell/dex.nix index aa5a673bf95dc124dec800dd61b90b830434a4fc..58047b98252dd528c264c155ccd26b081273facc 100644 GIT binary patch delta 1932 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 - - - - Redirecting to https://pkg.go.dev/go.jolheiser.com/${module.name} - ` - '') - modules) +builtins.concatStringsSep "\n" ( + builtins.map (module: '' + respond /${module.name}* ` + + + + Redirecting to https://pkg.go.dev/go.jolheiser.com/${module.name} + ` + '') modules +) diff --git a/machines/dragonwell/golink.nix b/machines/dragonwell/golink.nix index 6230005..9e65524 100644 --- a/machines/dragonwell/golink.nix +++ b/machines/dragonwell/golink.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ services.golink = { enable = true; tailscaleAuthKeyFile = pkgs.writeText "tskey" "tskey-auth-kGaKxz5CNTRL-nvyRLm7J38B37QZ2gCDM8BqtwyC6zJUh7"; # One-time key diff --git a/machines/dragonwell/hardware.nix b/machines/dragonwell/hardware.nix index 329ed8a..8ec4311 100644 --- a/machines/dragonwell/hardware.nix +++ b/machines/dragonwell/hardware.nix @@ -1,8 +1,14 @@ -{modulesPath, ...}: { - imports = [(modulesPath + "/profiles/qemu-guest.nix")]; +{ modulesPath, ... }: +{ + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; boot.loader.grub.device = "/dev/sda"; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; - boot.initrd.kernelModules = ["nvme"]; + boot.initrd.availableKernelModules = [ + "ata_piix" + "uhci_hcd" + "xen_blkfront" + "vmw_pvscsi" + ]; + boot.initrd.kernelModules = [ "nvme" ]; fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; diff --git a/machines/dragonwell/restic.nix b/machines/dragonwell/restic.nix index ffe0bf2..81b7ee0 100644 --- a/machines/dragonwell/restic.nix +++ b/machines/dragonwell/restic.nix @@ -1,4 +1,5 @@ -{config, ...}: { +{ config, ... }: +{ age.secrets = { restic-env.file = ../../secrets/personal/restic-env.age; restic-pass.file = ../../secrets/personal/restic-pass.age; @@ -9,8 +10,12 @@ environmentFile = config.age.secrets.restic-env.path; passwordFile = config.age.secrets.restic-pass.path; repositoryFile = config.age.secrets.restic-repo.path; - paths = ["/var/lib/ugit/repos"]; - pruneOpts = ["--keep-daily 7" "--keep-weekly 2" "--keep-monthly 2"]; + paths = [ "/var/lib/ugit/repos" ]; + pruneOpts = [ + "--keep-daily 7" + "--keep-weekly 2" + "--keep-monthly 2" + ]; timerConfig = { OnCalendar = "daily"; Persistent = true; diff --git a/machines/dragonwell/soju.nix b/machines/dragonwell/soju.nix index a750536..6f5e86c 100644 --- a/machines/dragonwell/soju.nix +++ b/machines/dragonwell/soju.nix @@ -1,6 +1,8 @@ -{lib, ...}: let +{ lib, ... }: +let baseCertPath = "/var/lib/acme/irc.jolheiser.com"; -in { +in +{ security.acme = { acceptTerms = true; email = "irc@jolheiser.com"; @@ -26,6 +28,6 @@ in { isSystemUser = true; group = "soju"; }; - groups.soju = {}; + groups.soju = { }; }; } diff --git a/machines/dragonwell/ugit.nix b/machines/dragonwell/ugit.nix index 6dcf563..ab53191 100644 --- a/machines/dragonwell/ugit.nix +++ b/machines/dragonwell/ugit.nix @@ -2,7 +2,9 @@ services.ugit = { enable = true; openFirewall = true; - authorizedKeys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"]; + authorizedKeys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx" + ]; tsAuthKey = "tskey-auth-kRUJE7zxH621CNTRL-Td29STXSrtTUHdacaKaYtTD82uyDXZj7"; # One-time key config = { ssh.clone-url = "ugit@git.jolheiser.com"; diff --git a/machines/genmaicha/default.nix b/machines/genmaicha/default.nix index 0045499..2ecbd2f 100644 --- a/machines/genmaicha/default.nix +++ b/machines/genmaicha/default.nix @@ -1,11 +1,19 @@ -{pkgs, ...}: let +{ pkgs, ... }: +let username = "jolheiser"; -in { - imports = [./hardware.nix ../common/gui]; +in +{ + imports = [ + ./hardware.nix + ../common/gui + ]; boot = { kernelPackages = pkgs.linuxPackages_latest; - kernelParams = ["quiet" "splash"]; + kernelParams = [ + "quiet" + "splash" + ]; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; @@ -28,7 +36,11 @@ in { virtualisation.docker.enable = true; users.users."${username}" = { - extraGroups = ["wheel" "docker" "storage"]; + extraGroups = [ + "wheel" + "docker" + "storage" + ]; isNormalUser = true; }; diff --git a/machines/genmaicha/hardware.nix b/machines/genmaicha/hardware.nix index 63f30c0..907d7a8 100644 --- a/machines/genmaicha/hardware.nix +++ b/machines/genmaicha/hardware.nix @@ -6,15 +6,20 @@ lib, modulesPath, ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; +}: +{ + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "thunderbolt" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/90652083-df9c-42df-8c8a-8d979a3e1e0c"; @@ -26,9 +31,7 @@ fsType = "vfat"; }; - swapDevices = [ - {device = "/dev/disk/by-uuid/2034b9e4-011b-4715-a7a2-5f5445dc2849";} - ]; + swapDevices = [ { device = "/dev/disk/by-uuid/2034b9e4-011b-4715-a7a2-5f5445dc2849"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/machines/matcha/default.nix b/machines/matcha/default.nix index da157fe..6a277fd 100644 --- a/machines/matcha/default.nix +++ b/machines/matcha/default.nix @@ -1,11 +1,19 @@ -{pkgs, ...}: let +{ pkgs, ... }: +let username = "jolheiser"; -in { - imports = [./hardware.nix ../common/gui]; +in +{ + imports = [ + ./hardware.nix + ../common/gui + ]; boot = { kernelPackages = pkgs.linuxPackages_latest; - kernelParams = ["quiet" "splash"]; + kernelParams = [ + "quiet" + "splash" + ]; loader.grub = { enable = true; device = "/dev/sda"; @@ -14,7 +22,9 @@ in { }; }; - boot.initrd.secrets = {"/crypto_keyfile.bin" = null;}; + boot.initrd.secrets = { + "/crypto_keyfile.bin" = null; + }; boot.initrd.luks.devices = { "luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".keyFile = "/crypto_keyfile.bin"; @@ -24,7 +34,9 @@ in { }; }; - hardware = {bluetooth.enable = true;}; + hardware = { + bluetooth.enable = true; + }; networking = { hostName = "matcha"; @@ -41,7 +53,11 @@ in { virtualisation.docker.enable = true; users.users."${username}" = { - extraGroups = ["wheel" "docker" "storage"]; + extraGroups = [ + "wheel" + "docker" + "storage" + ]; isNormalUser = true; }; diff --git a/machines/matcha/hardware.nix b/machines/matcha/hardware.nix index 1ebefc6..2621ef4 100644 --- a/machines/matcha/hardware.nix +++ b/machines/matcha/hardware.nix @@ -6,8 +6,9 @@ lib, modulesPath, ... -}: { - imports = [(modulesPath + "/installer/scan/not-detected.nix")]; +}: +{ + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" @@ -18,9 +19,9 @@ "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/a3e3e496-9497-4340-9750-2104e2ab22ab"; @@ -34,7 +35,7 @@ boot.initrd.luks.devices."luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".device = "/dev/disk/by-uuid/1f9bde68-9c4c-423c-a95f-17aa170dd2b4"; - swapDevices = [{device = "/dev/disk/by-uuid/7e84d904-b00a-4c6c-aba4-ec1dde2dff85";}]; + swapDevices = [ { device = "/dev/disk/by-uuid/7e84d904-b00a-4c6c-aba4-ec1dde2dff85"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -45,6 +46,5 @@ # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/machines/sencha/default.nix b/machines/sencha/default.nix index 0bb0cbd..ef35308 100644 --- a/machines/sencha/default.nix +++ b/machines/sencha/default.nix @@ -1,9 +1,16 @@ -{pkgs, ...}: { - imports = [./hardware.nix ../common/gui]; +{ pkgs, ... }: +{ + imports = [ + ./hardware.nix + ../common/gui + ]; boot = { kernelPackages = pkgs.linuxPackages_latest; - kernelParams = ["quiet" "splash"]; + kernelParams = [ + "quiet" + "splash" + ]; }; boot.loader.systemd-boot.enable = true; @@ -11,14 +18,16 @@ boot.initrd.luks.devices."luks-c1c666de-2c68-4d50-98f1-3974ef424ff3".device = "/dev/disk/by-uuid/c1c666de-2c68-4d50-98f1-3974ef424ff3"; - hardware = {bluetooth.enable = true;}; + hardware = { + bluetooth.enable = true; + }; networking = { hostName = "sencha"; networkmanager.enable = true; firewall = { enable = true; - allowedTCPPorts = [8096]; + allowedTCPPorts = [ 8096 ]; }; }; @@ -28,7 +37,10 @@ pcscd.enable = true; printing = { enable = true; - drivers = [pkgs.canon-cups-ufr2 pkgs.cnijfilter_4_00]; + drivers = [ + pkgs.canon-cups-ufr2 + pkgs.cnijfilter_4_00 + ]; }; jellyfin.enable = true; mullvad-vpn = { @@ -44,11 +56,19 @@ users = { olheiser.isNormalUser = true; jolheiser = { - extraGroups = ["wheel" "docker" "storage"]; + extraGroups = [ + "wheel" + "docker" + "storage" + ]; isNormalUser = true; }; }; - groups.media.members = ["jolheiser" "olheiser" "jellyfin"]; + groups.media.members = [ + "jolheiser" + "olheiser" + "jellyfin" + ]; }; environment.systemPackages = with pkgs; [ diff --git a/machines/sencha/hardware.nix b/machines/sencha/hardware.nix index fcd7fc4..2acdb6a 100644 --- a/machines/sencha/hardware.nix +++ b/machines/sencha/hardware.nix @@ -6,15 +6,22 @@ lib, modulesPath, ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; +}: +{ + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "usbhid" + "usb_storage" + "sd_mod" + "sr_mod" + "rtsx_usb_sdmmc" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/d1f561b1-bc50-4e34-9ca6-e973d2d9437a"; @@ -28,9 +35,7 @@ fsType = "vfat"; }; - swapDevices = [ - {device = "/dev/disk/by-uuid/5c3eb124-674b-4315-890d-137275aab504";} - ]; + swapDevices = [ { device = "/dev/disk/by-uuid/5c3eb124-674b-4315-890d-137275aab504"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/modules/tclip/default.nix b/modules/tclip/default.nix index 69b5a35..c8c6876 100644 --- a/modules/tclip/default.nix +++ b/modules/tclip/default.nix @@ -1,10 +1,8 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.services.tclip; -in { +in +{ options.services.tclip = { enable = lib.mkEnableOption "tclip service"; @@ -71,31 +69,29 @@ in { config = lib.mkIf cfg.enable { systemd.services.tclip = { description = "tclip Service"; - after = ["network.target"]; - wantedBy = ["multi-user.target"]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = let - args = - lib.optionals (cfg.httpPort != null) [ - "--http-port=${cfg.httpPort}" - ] - ++ lib.optionals (cfg.controlURL != null) [ - "--control-url=${cfg.controlURL}" - ] - ++ [ - (lib.optionalString cfg.disableHTTPS "--disable-https") - "--hostname=${cfg.hostname}" - "--data-location=${cfg.dataLocation}" - (lib.optionalString cfg.tsnetVerbose "--tsnet-verbose") - (lib.optionalString cfg.useFunnel "--use-funnel") - (lib.optionalString cfg.hideFunnelUsers "--hide-funnel-users") - ]; - in "${cfg.package}/bin/tclipd ${lib.concatStringsSep " " args}"; + ExecStart = + let + args = + lib.optionals (cfg.httpPort != null) [ "--http-port=${cfg.httpPort}" ] + ++ lib.optionals (cfg.controlURL != null) [ "--control-url=${cfg.controlURL}" ] + ++ [ + (lib.optionalString cfg.disableHTTPS "--disable-https") + "--hostname=${cfg.hostname}" + "--data-location=${cfg.dataLocation}" + (lib.optionalString cfg.tsnetVerbose "--tsnet-verbose") + (lib.optionalString cfg.useFunnel "--use-funnel") + (lib.optionalString cfg.hideFunnelUsers "--hide-funnel-users") + ]; + in + "${cfg.package}/bin/tclipd ${lib.concatStringsSep " " args}"; Restart = "always"; User = "tclip"; Group = "tclip"; - Environment = ["TS_AUTHKEY=${cfg.authKey}"]; + Environment = [ "TS_AUTHKEY=${cfg.authKey}" ]; }; }; @@ -107,6 +103,6 @@ in { createHome = true; }; - users.groups.tclip = {}; + users.groups.tclip = { }; }; } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index c093580..58cd839 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,19 +5,47 @@ let sencha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJurjAMu4IXgpBwgUP0QvE2ySE5/Orn/yflkdWVvy6Am"; dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53"; - all = [jolheiser matcha genmaicha sencha dragonwell]; -in { + all = [ + jolheiser + matcha + genmaicha + sencha + dragonwell + ]; +in +{ "shared/cachix.age".publicKeys = all; "shared/ssh-config.age".publicKeys = all; "shared/spotify.age".publicKeys = all; "shared/irc-pw.age".publicKeys = all; "shared/gist-pw.age".publicKeys = all; "shared/git-send-email.age".publicKeys = all; - "personal/restic-env.age".publicKeys = [jolheiser dragonwell]; - "personal/restic-pass.age".publicKeys = [jolheiser dragonwell]; - "personal/restic-repo.age".publicKeys = [jolheiser dragonwell]; - "personal/dex.age".publicKeys = [jolheiser dragonwell]; - "personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell]; - "personal/dex-vikunja.age".publicKeys = [jolheiser dragonwell]; - "personal/dex-tandoor.age".publicKeys = [jolheiser dragonwell]; + "personal/restic-env.age".publicKeys = [ + jolheiser + dragonwell + ]; + "personal/restic-pass.age".publicKeys = [ + jolheiser + dragonwell + ]; + "personal/restic-repo.age".publicKeys = [ + jolheiser + dragonwell + ]; + "personal/dex.age".publicKeys = [ + jolheiser + dragonwell + ]; + "personal/dex-tailscale.age".publicKeys = [ + jolheiser + dragonwell + ]; + "personal/dex-vikunja.age".publicKeys = [ + jolheiser + dragonwell + ]; + "personal/dex-tandoor.age".publicKeys = [ + jolheiser + dragonwell + ]; }