From c8bd8acd8b9f45bd75581b7698771be4c02fa3c3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 13 Oct 2023 21:27:03 +0200 Subject: [PATCH] Things --- flake.lock | 259 +++++++++++++++++++++--------------- flake.nix | 3 +- hmModules/emacs/default.nix | 4 +- hmModules/shell/default.nix | 3 +- hosts/default.nix | 28 ++-- hosts/pbp/default.nix | 39 +++--- hosts/pbp/disko.nix | 80 ++++++----- 7 files changed, 240 insertions(+), 176 deletions(-) diff --git a/flake.lock b/flake.lock index 6055540..79e9249 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1696548100, - "narHash": "sha256-BVUfuzpIVrpAImF6s1E1U6v57AQh3C9Y0ZbbJ+W0NiU=", + "lastModified": 1697107555, + "narHash": "sha256-AWLVyjzPcuvb8ZeHA4mdmuKp2qLxAYT5SO3TlPg7/Ks=", "owner": "aciceri", "repo": "emacs", - "rev": "06fe3622e036160d00e8d487a491bf9b2bee9c84", + "rev": "122a0b4e70513382ba7c251e0296c333096dbc3a", "type": "github" }, "original": { @@ -213,6 +213,29 @@ } }, "dream2nix": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_2", + "nix-unit": "nix-unit", + "nixpkgs": "nixpkgs_5", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1697064937, + "narHash": "sha256-yZ5OlQkPnNUDnEzUY/Su2gu52i1+w7h5HHK/kBk5oUg=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "1caf997f694c3144ed8fa6752c4af36d1e68851c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, + "dream2nix_2": { "inputs": { "all-cabal-json": [ "helix", @@ -224,7 +247,7 @@ "nci" ], "drv-parts": "drv-parts", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": [ "helix", "nci", @@ -283,29 +306,6 @@ "type": "github" } }, - "dream2nix_2": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_4", - "nix-unit": "nix-unit", - "nixpkgs": "nixpkgs_8", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1696016853, - "narHash": "sha256-DDBdY0iKCmGOd+vcSPas8n51kHFW9vgYfAlP07Zyngw=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "657c329d0bf0e074e852978f9e5cb2d7cce01852", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, "drv-parts": { "inputs": { "flake-compat": [ @@ -665,6 +665,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675933616, + "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, @@ -681,7 +702,7 @@ "type": "indirect" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "hercules-ci-effects", @@ -703,20 +724,16 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { - "nixpkgs-lib": [ - "llm-workflow-engine", - "dream2nix", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "lastModified": 1685662779, + "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", "type": "github" }, "original": { @@ -725,9 +742,9 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_5" + "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { "lastModified": 1678379998, @@ -781,11 +798,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -799,11 +816,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -955,7 +972,7 @@ "helix": { "inputs": { "nci": "nci", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "parts": "parts_2", "rust-overlay": "rust-overlay" }, @@ -975,9 +992,9 @@ }, "hercules-ci-agent": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1686721748, @@ -994,9 +1011,9 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "hercules-ci-agent": "hercules-ci-agent", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1686830987, @@ -1091,29 +1108,6 @@ "type": "github" } }, - "llm-workflow-engine": { - "inputs": { - "dream2nix": "dream2nix_2", - "nixpkgs": [ - "llm-workflow-engine", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696034092, - "narHash": "sha256-BFTkNCVv9z7P/N8IZDe+JH0yAV8mXQlvgGhg/NzBDk4=", - "owner": "davHau", - "repo": "llm-workflow-engine", - "rev": "9a66b3665a9ec9e7e830e5059813c32b5c14ab53", - "type": "github" - }, - "original": { - "owner": "davHau", - "repo": "llm-workflow-engine", - "type": "github" - } - }, "mk-naked-shell": { "flake": false, "locked": { @@ -1176,7 +1170,7 @@ }, "nci": { "inputs": { - "dream2nix": "dream2nix", + "dream2nix": "dream2nix_2", "mk-naked-shell": "mk-naked-shell", "nixpkgs": [ "helix", @@ -1225,7 +1219,6 @@ "nix-github-actions": { "inputs": { "nixpkgs": [ - "llm-workflow-engine", "dream2nix", "nix-unit", "nixpkgs" @@ -1270,13 +1263,11 @@ "nix-unit": { "inputs": { "flake-parts": [ - "llm-workflow-engine", "dream2nix", "flake-parts" ], "nix-github-actions": "nix-github-actions", "nixpkgs": [ - "llm-workflow-engine", "dream2nix", "nixpkgs" ], @@ -1296,6 +1287,25 @@ "type": "github" } }, + "nixd": { + "inputs": { + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1697038389, + "narHash": "sha256-hbzFPXyQQxJObRdb+CsylUXii29UfFV7866WWgWYs6Y=", + "owner": "nix-community", + "repo": "nixd", + "rev": "29904e121cc775e7caaf4fffa6bc7da09376a43b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1680397293, @@ -1334,7 +1344,7 @@ }, "nixos-vscode-server": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1676501444, @@ -1352,11 +1362,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1680070330, - "narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=", + "lastModified": 1697100850, + "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421", + "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", "type": "github" }, "original": { @@ -1470,6 +1480,24 @@ } }, "nixpkgs-lib_5": { + "locked": { + "dir": "lib", + "lastModified": 1685564631, + "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_6": { "locked": { "dir": "lib", "lastModified": 1678375444, @@ -1567,6 +1595,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1686398752, + "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1672441588, "narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=", @@ -1580,7 +1624,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1675942811, "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", @@ -1595,7 +1639,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1678470307, "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=", @@ -1660,6 +1704,21 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1696604326, + "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1683408522, "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", @@ -1675,7 +1734,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1686501370, "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", @@ -1691,7 +1750,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1686804192, "narHash": "sha256-+VyQUManoec9GcNAS10HM83DkvFuS8IB/efIfSbNU5A=", @@ -1706,21 +1765,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nixpkgs_9": { "locked": { "lastModified": 1690441914, @@ -1740,7 +1784,7 @@ "nom": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { @@ -1830,9 +1874,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ - "llm-workflow-engine", "dream2nix", "nixpkgs" ] @@ -1908,9 +1951,9 @@ "rock5b": { "inputs": { "fan-control": "fan-control", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "kernel-src": "kernel-src", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "nixpkgs-kernel": "nixpkgs-kernel", "panfork": "panfork", "tow-boot": "tow-boot", @@ -1939,14 +1982,15 @@ "comma": "comma", "deadnix": "deadnix", "disko": "disko", + "dream2nix": "dream2nix", "flakeParts": "flakeParts", "helix": "helix", "hercules-ci-effects": "hercules-ci-effects", "homeManager": "homeManager", "homeManagerGitWorkspace": "homeManagerGitWorkspace", - "llm-workflow-engine": "llm-workflow-engine", "nil": "nil", "nix-serve-ng": "nix-serve-ng", + "nixd": "nixd", "nixos-generators": "nixos-generators", "nixos-vscode-server": "nixos-vscode-server", "nixosHardware": "nixosHardware", @@ -1996,7 +2040,7 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "helix", "nixpkgs" @@ -2142,7 +2186,6 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "llm-workflow-engine", "dream2nix", "nix-unit", "nixpkgs" diff --git a/flake.nix b/flake.nix index 9462006..72f78d1 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ nixos-vscode-server.url = "github:msteen/nixos-vscode-server"; helix.url = "github:helix-editor/helix"; nil.url = "github:oxalica/nil"; + nixd.url = "github:nix-community/nixd"; nom.url = "github:maralorn/nix-output-monitor"; treefmt-nix = { url = "github:numtide/treefmt-nix"; @@ -69,7 +70,7 @@ inputs.nixpkgs.follows = "nixpkgsUnstable"; }; hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects"; - llm-workflow-engine.url = "github:davHau/llm-workflow-engine"; + dream2nix.url = "github:nix-community/dream2nix"; }; outputs = inputs @ {flakeParts, ...}: diff --git a/hmModules/emacs/default.nix b/hmModules/emacs/default.nix index 084bc1f..d037e7e 100644 --- a/hmModules/emacs/default.nix +++ b/hmModules/emacs/default.nix @@ -7,7 +7,5 @@ ccrEmacs.enable = true; home.sessionVariables.EDITOR = lib.mkForce "emacsclient"; systemd.user.services.emacs.Service.EnvironmentFile = age.secrets.chatgpt-token.path; - home.packages = [ - pkgs.llm-workflow-engine - ]; + home.packages = lib.lists.optional pkgs.stdenv.isx86_64 pkgs.llm-workflow-engine; } diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index a84a3e4..23fc133 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -175,9 +175,10 @@ nix-zsh-completions carapace # used by nushell nil # TODO probably not best place + nixd # TODO probably not best place terraform-lsp # TODO probably not best place python3Packages.jedi-language-server # TODO probably not best place - # TODO probably not best place + cntr # TODO probably not best place # nom # FIXME disable on aarch64-linux, breaks everything :( ]; } diff --git a/hosts/default.nix b/hosts/default.nix index 84e95bc..8b36c7b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -208,19 +208,21 @@ }; colmena.deployment.buildOnTarget = true; }; - # pbp = { - # system = "aarch64-linux"; - # extraModules = with inputs; [ - # nixosHardware.nixosModules.pine64-pinebook-pro - # disko.nixosModules.disko - # ]; - # extraHmModules = [ - # # inputs.ccrEmacs.hmModules.default - # ]; - # secrets = { - # "pbp-wireguard-private-key" = {}; - # }; - # }; + pbp = { + system = "aarch64-linux"; + extraModules = with inputs; [ + nixosHardware.nixosModules.pine64-pinebook-pro + disko.nixosModules.disko + ]; + extraHmModules = [ + inputs.ccrEmacs.hmModules.default + ]; + secrets = { + "pbp-wireguard-private-key" = {}; + "cachix-personal-token".owner = "ccr"; + "chatgpt-token".owner = "ccr"; + }; + }; # hs = {}; mothership = { extraModules = with inputs; [ diff --git a/hosts/pbp/default.nix b/hosts/pbp/default.nix index 9246316..71b4595 100644 --- a/hosts/pbp/default.nix +++ b/hosts/pbp/default.nix @@ -12,34 +12,43 @@ "common" "ssh" "ccr" - "mara" - "xfce" + # "mara" + # "xfce" "battery" "printing" "wireguard-client" ]; - ccr.enable = true; - mara = { + ccr = { enable = true; modules = [ "shell" "mpv" - "firefox" + # "firefox" "git" - "chrome" - "udiskie" - ]; - packages = with pkgs; [ - remmina - rdesktop - freerdp + # "chrome" + # "udiskie" + # "emacs" ]; }; + # mara = { + # enable = true; + # modules = [ + # "shell" + # "mpv" + # "firefox" + # "git" + # "chrome" + # "udiskie" + # ]; + # packages = with pkgs; [ + # remmina + # rdesktop + # freerdp + # ]; + # }; - home-manager.users.mara = { + home-manager.users.ccr = { programs.chromium.package = lib.mkForce pkgs.chromium; }; - - i18n.defaultLocale = lib.mkForce "it_IT.UTF-8"; } diff --git a/hosts/pbp/disko.nix b/hosts/pbp/disko.nix index 041720a..5de9629 100644 --- a/hosts/pbp/disko.nix +++ b/hosts/pbp/disko.nix @@ -1,37 +1,37 @@ _: { disk = { - emmc = { - device = "/dev/mmcblk2"; - type = "disk"; - content = { - type = "table"; - format = "gpt"; - partitions = [ - { - name = "root"; - start = "1MiB"; - end = "-4G"; - part-type = "primary"; - bootable = false; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - } - { - name = "swap"; - start = "-4G"; - end = "100%"; - part-type = "primary"; - content = { - type = "swap"; - randomEncryption = true; - }; - } - ]; - }; - }; + # emmc = { + # device = "/dev/mmcblk2"; + # type = "disk"; + # content = { + # type = "table"; + # format = "gpt"; + # partitions = [ + # { + # name = "root"; + # start = "1MiB"; + # end = "-4G"; + # part-type = "primary"; + # bootable = false; + # content = { + # type = "filesystem"; + # format = "ext4"; + # mountpoint = "/"; + # }; + # } + # { + # name = "swap"; + # start = "-4G"; + # end = "100%"; + # part-type = "primary"; + # content = { + # type = "swap"; + # randomEncryption = true; + # }; + # } + # ]; + # }; + # }; ssd = { device = "/dev/nvme0n1"; type = "disk"; @@ -51,15 +51,25 @@ _: { }; } { - name = "home"; + name = "root"; start = "1024MiB"; - end = "100%"; + end = "-8G"; part-type = "primary"; bootable = false; content = { type = "filesystem"; format = "ext4"; - mountpoint = "/home"; + mountpoint = "/"; + }; + } + { + name = "swap"; + start = "-8G"; + end = "100%"; + part-type = "primary"; + content = { + type = "swap"; + randomEncryption = true; }; } ];