From a3ac254912653b956557802afaf662d9b067884f Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Mon, 19 Jan 2026 08:48:51 -0800 Subject: [PATCH] Fix issues after updating lockfile --- AGENTS.md | 4 +- devenv.nix | 4 +- flake.lock | 322 ++++++++++-------- flake.nix | 1 + modules/home/programs/rofi/default.nix | 3 +- modules/home/tools/zsh/default.nix | 1 + .../home/windowManagers/hyprland/default.nix | 2 +- modules/nixos/nix/default.nix | 2 +- modules/nixos/services/hydra/default.nix | 28 +- modules/nixos/suites/utils/default.nix | 2 +- systems/x86_64-linux/carbon/default.nix | 2 +- systems/x86_64-linux/gospel/default.nix | 1 - 12 files changed, 215 insertions(+), 157 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 4fb7ac4..202d09a 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -13,7 +13,7 @@ - **Deploy**: `nix run github:serokell/deploy-rs -- .#` (e.g., `.#gospel`) ## Code Style Guidelines -- **Formatter**: Use nixfmt-rfc-style for Nix code formatting (managed by devenv pre-commit hooks) +- **Formatter**: Use nixfmt for Nix code formatting (managed by devenv pre-commit hooks) - **Pre-commit**: Hooks run automatically on commit via devenv (trailing whitespace, YAML validation, etc.) - **Imports**: Group function parameters in curly braces, use `...` for extensibility - **Naming**: Use camelCase for variables, kebab-case for hostnames/services @@ -31,4 +31,4 @@ - `homes/`: Home Manager configurations - `modules/`: Reusable modules (nixos/ and home/) - `packages/`: Custom package definitions -- `.envrc`: Direnv configuration for automatic shell activation \ No newline at end of file +- `.envrc`: Direnv configuration for automatic shell activation diff --git a/devenv.nix b/devenv.nix index 5fb0c8d..9d4d3b0 100644 --- a/devenv.nix +++ b/devenv.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { packages = [ - pkgs.nixfmt-rfc-style + pkgs.nixfmt pkgs.nixd pkgs.deploy-rs pkgs.git @@ -16,6 +16,6 @@ enable = true; excludes = [ ".*\\.png$" ]; }; - nixfmt-rfc-style.enable = true; + nixfmt.enable = true; }; } diff --git a/flake.lock b/flake.lock index 4453dc7..dee6521 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1765990358, - "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=", + "lastModified": 1768575137, + "narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=", "owner": "catppuccin", "repo": "nix", - "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161", + "rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611", "type": "github" }, "original": { @@ -77,12 +77,17 @@ } }, "catppuccin-nix-palette": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "palette": "palette", + "systems": "systems_2" + }, "locked": { - "lastModified": 1766206652, - "narHash": "sha256-pWAwRFfJx83jIqoqoHUlzsMTaCWy14JO87ot2ji+XRI=", + "lastModified": 1766250142, + "narHash": "sha256-if8WlHrQElcdcnNM3nqw1UIXf7ByGk6jbXKMirnJfnw=", "ref": "main", - "rev": "4e42cc79579e082baade513ebbba9806b4fa7363", - "revCount": 1, + "rev": "397e0a08b155cec1738fd8b46fb9b9fc6b8fb15f", + "revCount": 2, "type": "git", "url": "https://git.alejandr0angul0.dev/alejandro-angulo/catppuccin-nix-palette" }, @@ -121,16 +126,17 @@ "flake-parts": "flake-parts", "git-hooks": "git-hooks", "nix": "nix", + "nixd": "nixd", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1766087669, - "narHash": "sha256-1+LJXcOaeX5YCFCCCY+bh6nSQBS5fPVcudQs5/G2+P4=", + "lastModified": 1768738650, + "narHash": "sha256-oe9/b2DkYNlGg1GdX7n8U87y49CvXHED7nMGEE3WzjI=", "owner": "cachix", "repo": "devenv", - "rev": "c03eed645ea94da7afbee29da76436b7ce33a5cb", + "rev": "43328b8bc4096055622390ee4fc21b5977aab2e3", "type": "github" }, "original": { @@ -213,11 +219,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -235,11 +241,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -248,44 +254,22 @@ "type": "github" } }, + "flake-root": { + "locked": { + "lastModified": 1723604017, + "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", + "owner": "srid", + "repo": "flake-root", + "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils-plus": { - "inputs": { - "flake-utils": "flake-utils_2" - }, - "locked": { - "lastModified": 1715533576, - "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems_5" }, @@ -303,6 +287,25 @@ "type": "github" } }, + "flake-utils-plus": { + "inputs": { + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -358,11 +361,11 @@ ] }, "locked": { - "lastModified": 1766171975, - "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", + "lastModified": 1768770171, + "narHash": "sha256-JPmLGZgdWa8QcQbbtBqyZhpmxIHZ3lUO48laERjw+4k=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", + "rev": "521d5ea1a229ba315dd1cceaf869946ddcc83d36", "type": "github" }, "original": { @@ -372,36 +375,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "nix": { "inputs": { "flake-compat": [ @@ -428,20 +401,47 @@ ] }, "locked": { - "lastModified": 1761648602, - "narHash": "sha256-H97KSB/luq/aGobKRuHahOvT1r7C03BgB6D5HBZsbN8=", + "lastModified": 1768491252, + "narHash": "sha256-ZlIPlKCYXwQJsw9WYVeyCapF5Y8JZL2Hctf22+IbHqo=", "owner": "cachix", "repo": "nix", - "rev": "3e5644da6830ef65f0a2f7ec22830c46285bfff6", + "rev": "9f0da1cd90b271569752a4c83f3ff700b8fcbe12", "type": "github" }, "original": { "owner": "cachix", - "ref": "devenv-2.30.6", + "ref": "devenv-2.32", "repo": "nix", "type": "github" } }, + "nixd": { + "inputs": { + "flake-parts": [ + "devenv", + "flake-parts" + ], + "flake-root": "flake-root", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1763964548, + "narHash": "sha256-JTRoaEWvPsVIMFJWeS4G2isPo15wqXY/otsiHPN0zww=", + "owner": "nix-community", + "repo": "nixd", + "rev": "d4bf15e56540422e2acc7bc26b20b0a0934e3f5e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -480,11 +480,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1768736227, + "narHash": "sha256-qgGq7CfrYKc3IBYQ7qp0Z/ZXndQVC5Bj0N8HW9mS2rM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "d447553bcbc6a178618d37e61648b19e744370df", "type": "github" }, "original": { @@ -496,11 +496,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1768305791, + "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "type": "github" }, "original": { @@ -512,11 +512,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -525,6 +525,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1768621446, + "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1766070988, @@ -543,11 +559,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764138170, - "narHash": "sha256-2bCmfCUZyi2yj9FFXYKwsDiaZmizN75cLhI/eWmf3tk=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1767242400, + "narHash": "sha256-knFaYjeg7swqG1dljj1hOxfg39zrIy8pfGuicjm9s+o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bb813de6d2241bcb1b5af2d3059f560c66329967", + "rev": "c04833a1e584401bb63c1a63ddc51a71e6aa457a", "type": "github" }, "original": { @@ -557,13 +589,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1763618868, - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", + "lastModified": 1767026758, + "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", + "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", "type": "github" }, "original": { @@ -576,15 +608,15 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1764206843, - "narHash": "sha256-ieuOUoc2ZIKR6ZR8HnjnsX9k/3EJr6b/WQ3yZDaxDKg=", + "lastModified": 1767329285, + "narHash": "sha256-9b85YlqVN0/QIhkvoygWxevoYIIxCyi/dwzHn8FilJM=", "ref": "main", - "rev": "926db427f465f44f454a3ac48216ec461b4a42e8", - "revCount": 52, + "rev": "28ea6a41fe966ad12af5d92a1a6a535939fe63ac", + "revCount": 55, "type": "git", "url": "https://git.alejandr0angul0.dev/alejandro-angulo/nixvim-config" }, @@ -597,16 +629,15 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4", - "nuschtosSearch": "nuschtosSearch", + "nixpkgs": "nixpkgs_5", "systems": "systems_4" }, "locked": { - "lastModified": 1764148348, - "narHash": "sha256-C9UobzCvMaLwNtRaFrt26TA/SkQtcDhJFmlVQ6DPHyA=", + "lastModified": 1767185101, + "narHash": "sha256-gyNczVfQMoi+OQghxBik6wx8XLsCelok9SMl1bMLUoc=", "owner": "nix-community", "repo": "nixvim", - "rev": "7fe6951bf8c2719f437f74224adf3a2e875d6781", + "rev": "df9d3637e80b98c5b937fc73a465d0eea2c3aa88", "type": "github" }, "original": { @@ -615,38 +646,30 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, + "palette": { + "flake": false, "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", + "lastModified": 1742245182, + "narHash": "sha256-R52Q1FVAclvBk7xNgj/Jl+GPCIbORNf6YbJ1nxH3Gzs=", + "owner": "catppuccin", + "repo": "palette", + "rev": "0df7db6fe201b437d91e7288fa22807bb0e44701", "type": "github" }, "original": { - "owner": "NuschtOS", - "repo": "search", + "owner": "catppuccin", + "repo": "palette", "type": "github" } }, "powerlevel10k": { "flake": false, "locked": { - "lastModified": 1745931653, - "narHash": "sha256-BRJyGn+gTGUWifpJ1ziBKVHACcWw+R5N/HdUi8HzSvY=", + "lastModified": 1767778682, + "narHash": "sha256-4sXacLFQsfTVgk4UhJbmAuNP7OPwtcz8eQupwHxgUAs=", "owner": "romkatv", "repo": "powerlevel10k", - "rev": "36f3045d69d1ba402db09d09eb12b42eebe0fa3b", + "rev": "efc9ddd9b615a0042b5bcc36f97f070ca6fdf09e", "type": "github" }, "original": { @@ -666,7 +689,8 @@ "home-manager": "home-manager", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim", "powerlevel10k": "powerlevel10k", "snowfall-lib": "snowfall-lib", @@ -770,9 +794,31 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "devenv", + "nixd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 6a2e6e8..451d62a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/home/programs/rofi/default.nix b/modules/home/programs/rofi/default.nix index 9201af6..b456ede 100644 --- a/modules/home/programs/rofi/default.nix +++ b/modules/home/programs/rofi/default.nix @@ -16,11 +16,12 @@ in }; config = mkIf cfg.enable { + catppuccin.rofi.enable = true; + programs.rofi = { enable = true; # TODO: How to ensure this font is installed? font = "Hack Nerd Font 10"; - catppuccin.enable = true; plugins = [ pkgs.rofi-emoji ]; extraConfig = { show-icons = true; diff --git a/modules/home/tools/zsh/default.nix b/modules/home/tools/zsh/default.nix index db5c3a4..7ee6b88 100644 --- a/modules/home/tools/zsh/default.nix +++ b/modules/home/tools/zsh/default.nix @@ -19,6 +19,7 @@ in config = mkIf cfg.enable { programs.zsh = { enable = true; + dotDir = "${config.xdg.configHome}/zsh"; autosuggestion.enable = true; enableCompletion = true; envExtra = '' diff --git a/modules/home/windowManagers/hyprland/default.nix b/modules/home/windowManagers/hyprland/default.nix index a0d96c1..5e73c06 100644 --- a/modules/home/windowManagers/hyprland/default.nix +++ b/modules/home/windowManagers/hyprland/default.nix @@ -245,7 +245,7 @@ in settings = { ipc = "on"; splash = false; - splash_offset = 2.0; + splash_offset = 2; preload = [ "${config.xdg.dataHome}/${cfg.wallpaperPath}" diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 3f02e2c..608bb89 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -49,7 +49,7 @@ in { environment.systemPackages = with pkgs; [ nix-prefetch - nixfmt-rfc-style + nixfmt ]; nix = diff --git a/modules/nixos/services/hydra/default.nix b/modules/nixos/services/hydra/default.nix index 9190b83..be4435f 100644 --- a/modules/nixos/services/hydra/default.nix +++ b/modules/nixos/services/hydra/default.nix @@ -2,10 +2,20 @@ config, lib, namespace, + inputs, + pkgs, ... }: let cfg = config.${namespace}.services.hydra; + + pkgs-stable = import inputs.nixpkgs-stable { + inherit (pkgs) system; + config = { + allowUnfree = true; + permittedInsecurePackages = pkgs.config.permittedInsecurePackages or [ ]; + }; + }; in { options.${namespace}.services.hydra = with lib; { @@ -72,6 +82,7 @@ in services.hydra = { enable = true; + package = pkgs-stable.hydra; # Use older Hydra version from nixpkgs stable hydraURL = "https://${cfg.hostname}"; notificationSender = "hydra@localhost"; buildMachinesFiles = [ ]; @@ -88,16 +99,15 @@ in services.nginx = { enable = true; recommendedProxySettings = true; - virtualHosts."hydra.kilonull.com" = - { - locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.hydra.port}"; - }; - } - // lib.optionalAttrs (cfg.acmeCertName != "") { - forceSSL = true; - useACMEHost = cfg.acmeCertName; + virtualHosts."hydra.kilonull.com" = { + locations."/" = { + proxyPass = "http://127.0.0.1:${toString config.services.hydra.port}"; }; + } + // lib.optionalAttrs (cfg.acmeCertName != "") { + forceSSL = true; + useACMEHost = cfg.acmeCertName; + }; }; nix.settings = { diff --git a/modules/nixos/suites/utils/default.nix b/modules/nixos/suites/utils/default.nix index 5ceb85d..82ac1f9 100644 --- a/modules/nixos/suites/utils/default.nix +++ b/modules/nixos/suites/utils/default.nix @@ -31,7 +31,7 @@ in jq killall lsof - nixfmt-rfc-style + nixfmt pre-commit progress python3 diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix index 7e03843..d050c1b 100644 --- a/systems/x86_64-linux/carbon/default.nix +++ b/systems/x86_64-linux/carbon/default.nix @@ -64,6 +64,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + android-tools sanoid # Below 3 installed for sanoid pv @@ -85,7 +86,6 @@ "/share/xdg-desktop-portal" ]; - programs.adb.enable = true; programs.light.enable = true; # This value determines the NixOS release from which the default diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix index 06df61b..65d48ef 100644 --- a/systems/x86_64-linux/gospel/default.nix +++ b/systems/x86_64-linux/gospel/default.nix @@ -159,7 +159,6 @@ nix-index vlc - xfce.thunar prusa-slicer esptool minicom