1 Commits

Author SHA1 Message Date
Tom Alexander
c2619b4344 Update packages. 2026-09-07 17:42:46 -04:00
40 changed files with 14 additions and 97 deletions

View File

@@ -28,7 +28,6 @@ in
./roles/d2 ./roles/d2
./roles/direnv ./roles/direnv
./roles/disko ./roles/disko
./roles/displaylink
./roles/distributed_build ./roles/distributed_build
./roles/doas ./roles/doas
./roles/docker ./roles/docker
@@ -274,7 +273,6 @@ in
} }
); );
}) })
(disableTests "ada") # test failing with http url is not idempotent.
]; ];
# This option defines the first version of NixOS you have installed on this particular machine, # This option defines the first version of NixOS you have installed on this particular machine,

View File

@@ -20,7 +20,7 @@
config = { config = {
networking = networking =
let let
interface = "enp0s10"; interface = "enp0s2";
in in
{ {
# Generate with `head -c4 /dev/urandom | od -A none -t x4` # Generate with `head -c4 /dev/urandom | od -A none -t x4`

View File

@@ -92,7 +92,6 @@
me.chromium.enable = true; me.chromium.enable = true;
me.d2.enable = true; me.d2.enable = true;
me.direnv.enable = true; me.direnv.enable = true;
me.displaylink.enable = true;
me.doas.enable = true; me.doas.enable = true;
me.docker.enable = false; me.docker.enable = false;
me.dont_use_substituters.enable = true; me.dont_use_substituters.enable = true;

View File

@@ -1,40 +0,0 @@
{
config,
lib,
pkgs,
...
}:
{
imports = [ ];
options.me = {
displaylink.enable = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = "Whether we want to install displaylink.";
};
};
config = lib.mkIf config.me.displaylink.enable (
lib.mkMerge [
{
environment.systemPackages = with pkgs; [
displaylink
];
allowedUnfree = [ "displaylink" ];
boot = {
extraModulePackages = [ config.boot.kernelPackages.evdi ];
initrd.kernelModules = [
"evdi"
];
};
}
(lib.mkIf config.me.graphical {
})
]
);
}

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(setq gc-cons-threshold (* 128 1024 1024)) ;; 128MiB Increase garbage collection threshold for performance (default 800000) (setq gc-cons-threshold (* 128 1024 1024)) ;; 128MiB Increase garbage collection threshold for performance (default 800000)
;; Increase amount of data read from processes, default 4k ;; Increase amount of data read from processes, default 4k
(when (version<= "27.0" emacs-version) (when (version<= "27.0" emacs-version)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(use-package diminish) (use-package diminish)
;; Eglot recommends pulling the latest of the standard libraries it ;; Eglot recommends pulling the latest of the standard libraries it

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
;; ========== Function to reload current file ================= ;; ========== Function to reload current file =================
(defun reload-file () (defun reload-file ()
@@ -12,9 +11,10 @@
"Run a command using the current buffer as stdin and replacing its contents if the command succeeds with the stdout from the command. This is useful for code formatters." "Run a command using the current buffer as stdin and replacing its contents if the command succeeds with the stdout from the command. This is useful for code formatters."
(let ( (let (
(stdout-buffer (generate-new-buffer "tmp-stdout" t)) (stdout-buffer (generate-new-buffer "tmp-stdout" t))
(full-cmd (append '(call-process-region nil nil cmd nil stdout-buffer nil) args))
) )
(unwind-protect (unwind-protect
(let ((exit-status (apply #'call-process-region nil nil cmd nil (list stdout-buffer nil) nil args))) (let ((exit-status (eval full-cmd)))
(if (eq exit-status 0) (if (eq exit-status 0)
(save-excursion (save-excursion
(replace-buffer-contents stdout-buffer) (replace-buffer-contents stdout-buffer)
@@ -31,9 +31,10 @@
"Run a command using the current buffer as stdin and replacing its contents if the command succeeds with the stdout from the command. This is useful for code formatters. This version only replaces the buffer contents if the command output some text." "Run a command using the current buffer as stdin and replacing its contents if the command succeeds with the stdout from the command. This is useful for code formatters. This version only replaces the buffer contents if the command output some text."
(let ( (let (
(stdout-buffer (generate-new-buffer "tmp-stdout" t)) (stdout-buffer (generate-new-buffer "tmp-stdout" t))
(full-cmd (append '(call-process-region nil nil cmd nil stdout-buffer nil) args))
) )
(unwind-protect (unwind-protect
(let ((exit-status (apply #'call-process-region nil nil cmd nil (list stdout-buffer nil) nil args))) (let ((exit-status (eval full-cmd)))
(if (eq exit-status 0) (if (eq exit-status 0)
(if (> (buffer-size stdout-buffer) 0) (if (> (buffer-size stdout-buffer) 0)
(save-excursion (save-excursion
@@ -54,9 +55,10 @@
(let ( (let (
(default-directory (or dir default-directory)) (default-directory (or dir default-directory))
(stdout-buffer (generate-new-buffer "tmp-stdout" t)) (stdout-buffer (generate-new-buffer "tmp-stdout" t))
(full-cmd (append '(call-process cmd nil (list stdout-buffer nil) nil) args))
) )
(unwind-protect (unwind-protect
(let ((exit-status (condition-case nil (apply #'call-process cmd nil (list stdout-buffer nil) nil args) (file-missing nil)))) (let ((exit-status (condition-case nil (eval full-cmd) (file-missing nil))))
(if (eq exit-status 0) (if (eq exit-status 0)
(progn (progn
(with-current-buffer stdout-buffer (with-current-buffer stdout-buffer

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
;; Add your keys here, as such ;; Add your keys here, as such
;; Disable the suspend frame hotkeys ;; Disable the suspend frame hotkeys

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
;; Set theme ;; Set theme
(load-theme 'tango-dark t) (load-theme 'tango-dark t)
(set-face-attribute 'default nil :background "black") (set-face-attribute 'default nil :background "black")

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(package-initialize) (package-initialize)
(use-package use-package (use-package use-package
:custom :custom

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(use-package eglot (use-package eglot
;; This is an emacs built-in but we're pulling the latest version ;; This is an emacs built-in but we're pulling the latest version
:pin gnu :pin gnu

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'util-tree-sitter) (require 'util-tree-sitter)
(use-package bash-ts-mode (use-package bash-ts-mode

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'common-lsp) (require 'common-lsp)
(require 'util-tree-sitter) (require 'util-tree-sitter)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'common-lsp) (require 'common-lsp)
(use-package cmake-mode (use-package cmake-mode

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(defun d2-format-buffer () (defun d2-format-buffer ()
"Run prettier." "Run prettier."
(interactive) (interactive)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(use-package dockerfile-ts-mode (use-package dockerfile-ts-mode
:pin manual :pin manual
:mode ( :mode (

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'common-lsp) (require 'common-lsp)
(require 'util-tree-sitter) (require 'util-tree-sitter)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'common-lsp) (require 'common-lsp)
(require 'util-tree-sitter) (require 'util-tree-sitter)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(defun lua-format-buffer () (defun lua-format-buffer ()
"Run stylua." "Run stylua."
(interactive) (interactive)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(use-package markdown-mode (use-package markdown-mode
:ensure t :ensure t
:commands (markdown-mode gfm-mode) :commands (markdown-mode gfm-mode)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(use-package nftables-mode (use-package nftables-mode
:commands nftables-mode :commands nftables-mode
) )

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'common-lsp) (require 'common-lsp)
(require 'util-tree-sitter) (require 'util-tree-sitter)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'color) (require 'color)
(let ((bg (face-attribute 'default :background))) (let ((bg (face-attribute 'default :background)))
(use-package org (use-package org

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'common-lsp) (require 'common-lsp)
(require 'util-tree-sitter) (require 'util-tree-sitter)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'common-lsp) (require 'common-lsp)
(require 'util-tree-sitter) (require 'util-tree-sitter)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(require 'common-lsp) (require 'common-lsp)
(require 'util-tree-sitter) (require 'util-tree-sitter)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(defun xml-fmt () (defun xml-fmt ()
"Run xmllint --format." "Run xmllint --format."
(run-command-on-buffer "xmllint" "--format" "-") (run-command-on-buffer "xmllint" "--format" "-")

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(defun yaml-format-buffer () (defun yaml-format-buffer ()
"Run prettier." "Run prettier."
(interactive) (interactive)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(use-package flymake (use-package flymake
:pin manual :pin manual
:ensure nil :ensure nil

View File

@@ -1,5 +1,3 @@
;; -*- lexical-binding: t; -*-
;; (add-to-list 'major-mode-remap-alist '(c-mode . c-ts-mode)) ;; (add-to-list 'major-mode-remap-alist '(c-mode . c-ts-mode))
(use-package treesit (use-package treesit
@@ -15,8 +13,6 @@
;; :custom ;; :custom
;; (treesit-font-lock-level 3) ;; (treesit-font-lock-level 3)
(setq treesit-font-lock-level 4) (setq treesit-font-lock-level 4)
;; (setq treesit-auto-install-grammar t)
;; (setq treesit-enabled-modes t)
) )
(provide 'util-tree-sitter) (provide 'util-tree-sitter)

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(defun my/minibuffer-delete (arg) (defun my/minibuffer-delete (arg)
"When looking for files, go up an entire directory with the backspace button if theres no text after the directory." "When looking for files, go up an entire directory with the backspace button if theres no text after the directory."
(interactive "p") (interactive "p")

View File

@@ -1,4 +1,3 @@
;; -*- lexical-binding: t; -*-
(add-to-list 'load-path (concat user-emacs-directory "elisp")) (add-to-list 'load-path (concat user-emacs-directory "elisp"))
(require 'base) (require 'base)

View File

@@ -20,7 +20,7 @@
config = { config = {
networking = networking =
let let
interface = "enp0s10"; interface = "enp0s2";
in in
{ {
# Generate with `head -c4 /dev/urandom | od -A none -t x4` # Generate with `head -c4 /dev/urandom | od -A none -t x4`

View File

@@ -20,7 +20,7 @@
config = { config = {
networking = networking =
let let
interface = "enp0s10"; interface = "enp0s2";
in in
{ {
# Generate with `head -c4 /dev/urandom | od -A none -t x4` # Generate with `head -c4 /dev/urandom | od -A none -t x4`

View File

@@ -20,7 +20,7 @@
config = { config = {
networking = networking =
let let
interface = "enp0s10"; interface = "enp0s2";
in in
{ {
# Generate with `head -c4 /dev/urandom | od -A none -t x4` # Generate with `head -c4 /dev/urandom | od -A none -t x4`

View File

@@ -20,7 +20,7 @@
config = { config = {
networking = networking =
let let
interface = "enp0s10"; interface = "enp0s2";
in in
{ {
# Generate with `head -c4 /dev/urandom | od -A none -t x4` # Generate with `head -c4 /dev/urandom | od -A none -t x4`

View File

@@ -20,7 +20,7 @@
config = { config = {
networking = networking =
let let
interface = "enp0s10"; interface = "enp0s2";
in in
{ {
# Generate with `head -c4 /dev/urandom | od -A none -t x4` # Generate with `head -c4 /dev/urandom | od -A none -t x4`

View File

@@ -20,7 +20,7 @@
config = { config = {
networking = networking =
let let
interface = "enp0s10"; interface = "enp0s2";
in in
{ {
# Generate with `head -c4 /dev/urandom | od -A none -t x4` # Generate with `head -c4 /dev/urandom | od -A none -t x4`

View File

@@ -134,18 +134,6 @@ let
"nix-pull-through-cache" = { "nix-pull-through-cache" = {
"CACHE_GET_TOKEN" = (builtins.readFile "${./secrets/nix-pull-through-cache/auth/CACHE_GET_TOKEN}"); "CACHE_GET_TOKEN" = (builtins.readFile "${./secrets/nix-pull-through-cache/auth/CACHE_GET_TOKEN}");
}; };
"registry-credentials" =
(generate_docker_secret {
username = builtins.readFile "${./secrets/flux-system/registry-credentials/username}";
password = builtins.readFile "${./secrets/flux-system/registry-credentials/password}";
email = builtins.readFile "${./secrets/flux-system/registry-credentials/email}";
address = builtins.readFile "${./secrets/flux-system/registry-credentials/address}";
})
// {
# "__annotations" = {
# "tekton.dev/docker-0" = "https://harbor.fizz.buzz";
# };
};
}; };
}; };
encrypted_secrets = ( encrypted_secrets = (

View File

@@ -21,7 +21,7 @@
assertions = [ assertions = [
{ {
# Kubernetes should only upgrade 1 minor version at a time, so this assert is here to prevent unwittingly jumping versions. # Kubernetes should only upgrade 1 minor version at a time, so this assert is here to prevent unwittingly jumping versions.
assertion = lib.hasPrefix "1.37." pkgs.kubernetes.version; assertion = lib.hasPrefix "1.36." pkgs.kubernetes.version;
message = "Unexpected Kubernetes package version: ${pkgs.kubernetes.version}"; message = "Unexpected Kubernetes package version: ${pkgs.kubernetes.version}";
} }
]; ];