aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
Andrea Ciceri 2023-06-18 23:53:26 +02:00
parent df4eb3c079
commit 6c7771f864
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg
7 changed files with 172 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
checks/default.nix
View file

@ -26,7 +26,7 @@
build = _: nc: nc.config.system.build.toplevel; build = _: nc: nc.config.system.build.toplevel;
in { in {
x86_64-linux = lib.mapAttrs build { x86_64-linux = lib.mapAttrs build {
inherit (self.nixosConfigurations) hs thinkpad mothership; inherit (self.nixosConfigurations) thinkpad mothership;
}; };
aarch64-linux = { aarch64-linux = {
inherit (self.nixosConfigurations) pbp rock5b; inherit (self.nixosConfigurations) pbp rock5b;

293
flake.lock generated
View file

@ -41,35 +41,10 @@
"type": "github" "type": "github"
} }
}, },
"ccrEmacs": {
"inputs": {
"emacs-overlay": "emacs-overlay",
"emacs-src": "emacs-src",
"flake-parts": "flake-parts",
"nixpkgs": [
"ccrEmacs",
"emacs-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1683798766,
"narHash": "sha256-HY0Arq4uGqfMM0WiSKrOlVt7KTTN9jtpxCHDAtEp8Vs=",
"owner": "aciceri",
"repo": "emacs",
"rev": "7f3ee2413d6b0756ade8435e0fa9ff3317e4c000",
"type": "github"
},
"original": {
"owner": "aciceri",
"repo": "emacs",
"type": "github"
}
},
"colmena": { "colmena": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgsUnstable" "nixpkgsUnstable"
], ],
@ -95,7 +70,7 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -299,42 +274,6 @@
"type": "github" "type": "github"
} }
}, },
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1678296165,
"narHash": "sha256-nEU+1PKIvYfD+oQ53KO13J2LwMPzUgWc89tFzrES9K4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "5b3d95676be5c6963c4d16f21ecf82beb14c6c05",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"emacs-src": {
"flake": false,
"locked": {
"lastModified": 1677076548,
"narHash": "sha256-yWln8CoiNJpQ8CmjNYaXFj00aJa5mSUIYLdkN+c5KbQ=",
"ref": "emacs-29",
"rev": "20c654b6f8fa24ff458e09a1eb101ba198e671f8",
"revCount": 164627,
"type": "git",
"url": "git://git.savannah.gnu.org/emacs.git"
},
"original": {
"ref": "emacs-29",
"type": "git",
"url": "git://git.savannah.gnu.org/emacs.git"
}
},
"fan-control": { "fan-control": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -493,14 +432,35 @@
}, },
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib_3"
}, },
"locked": { "locked": {
"lastModified": 1675933616, "lastModified": 1685662779,
"narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "47478a4a003e745402acf63be7f9a092d51b83d7", "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"hercules-ci-effects",
"hercules-ci-agent",
"nixpkgs"
]
},
"locked": {
"lastModified": 1685662779,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,7 +469,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": { "flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib_4" "nixpkgs-lib": "nixpkgs-lib_4"
}, },
@ -528,21 +488,6 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -557,7 +502,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
@ -575,7 +520,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1678901627, "lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
@ -590,7 +535,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": { "flake-utils_4": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -604,7 +549,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-utils_6": { "flake-utils_5": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -637,7 +582,7 @@
}, },
"flakeParts": { "flakeParts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1680392223, "lastModified": 1680392223,
@ -696,10 +641,26 @@
"type": "github" "type": "github"
} }
}, },
"haskell-flake": {
"locked": {
"lastModified": 1684780604,
"narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "0.3.0",
"repo": "haskell-flake",
"type": "github"
}
},
"helix": { "helix": {
"inputs": { "inputs": {
"nci": "nci", "nci": "nci",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"parts": "parts_2", "parts": "parts_2",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
@ -717,6 +678,45 @@
"type": "github" "type": "github"
} }
}, },
"hercules-ci-agent": {
"inputs": {
"flake-parts": "flake-parts_2",
"haskell-flake": "haskell-flake",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1686721748,
"narHash": "sha256-ilD6ANYID+b0/+GTFbuZXfmu92bqVqY5ITKXSxqIp5A=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "7192b83935ab292a8e894db590dfd44f976e183b",
"type": "github"
},
"original": {
"id": "hercules-ci-agent",
"type": "indirect"
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts",
"hercules-ci-agent": "hercules-ci-agent",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1686830987,
"narHash": "sha256-1XLTM0lFr3NV+0rd55SQW/8oQ3ACnqlYcda3FelIwHU=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "04e4ab63b9eed2452edee1bb698827e1cb8265c6",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"homeManager": { "homeManager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -931,8 +931,8 @@
}, },
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_6",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
@ -1009,7 +1009,7 @@
}, },
"nixos-vscode-server": { "nixos-vscode-server": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1676501444, "lastModified": 1676501444,
@ -1073,24 +1073,6 @@
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1675183161,
"narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1680213900, "lastModified": 1680213900,
@ -1108,7 +1090,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_3": { "nixpkgs-lib_2": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1682879489, "lastModified": 1682879489,
@ -1126,6 +1108,24 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_3": {
"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_4": { "nixpkgs-lib_4": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
@ -1208,22 +1208,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1673540789,
"narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1663235518, "lastModified": 1663235518,
"narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=", "narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=",
@ -1239,7 +1223,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1683408522, "lastModified": 1683408522,
"narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
@ -1255,7 +1239,38 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1686501370,
"narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": { "nixpkgs_5": {
"locked": {
"lastModified": 1686804192,
"narHash": "sha256-+VyQUManoec9GcNAS10HM83DkvFuS8IB/efIfSbNU5A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "979b4232b33873e4e52692e7d1d0ebadc87d0633",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1680487167, "lastModified": 1680487167,
"narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=",
@ -1271,7 +1286,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1672441588, "lastModified": 1672441588,
"narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=", "narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=",
@ -1285,7 +1300,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_7": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1675942811, "lastModified": 1675942811,
"narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=",
@ -1300,7 +1315,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1678470307, "lastModified": 1678470307,
"narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=", "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
@ -1318,8 +1333,8 @@
}, },
"nom": { "nom": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_8",
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
@ -1391,7 +1406,7 @@
}, },
"parts_2": { "parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib_3" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1683560683, "lastModified": 1683560683,
@ -1438,7 +1453,7 @@
"pre-commit-hooks_2": { "pre-commit-hooks_2": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_5",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgsUnstable" "nixpkgsUnstable"
@ -1464,9 +1479,9 @@
"rock5b": { "rock5b": {
"inputs": { "inputs": {
"fan-control": "fan-control", "fan-control": "fan-control",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_3",
"kernel-src": "kernel-src", "kernel-src": "kernel-src",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_9",
"nixpkgs-kernel": "nixpkgs-kernel", "nixpkgs-kernel": "nixpkgs-kernel",
"panfork": "panfork", "panfork": "panfork",
"tow-boot": "tow-boot", "tow-boot": "tow-boot",
@ -1490,13 +1505,13 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"alejandra": "alejandra", "alejandra": "alejandra",
"ccrEmacs": "ccrEmacs",
"colmena": "colmena", "colmena": "colmena",
"comma": "comma", "comma": "comma",
"deadnix": "deadnix", "deadnix": "deadnix",
"disko": "disko", "disko": "disko",
"flakeParts": "flakeParts", "flakeParts": "flakeParts",
"helix": "helix", "helix": "helix",
"hercules-ci-effects": "hercules-ci-effects",
"homeManager": "homeManager", "homeManager": "homeManager",
"homeManagerGitWorkspace": "homeManagerGitWorkspace", "homeManagerGitWorkspace": "homeManagerGitWorkspace",
"hyprland": "hyprland", "hyprland": "hyprland",
@ -1552,7 +1567,7 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
"nixpkgs" "nixpkgs"

16
flake.nix
View file

@ -30,7 +30,7 @@
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
comma.url = "github:nix-community/comma"; comma.url = "github:nix-community/comma";
rock5b.url = "github:aciceri/rock5b-nixos"; rock5b.url = "github:aciceri/rock5b-nixos";
ccrEmacs.url = "github:aciceri/emacs"; # ccrEmacs.url = "github:aciceri/emacs";
# ccrEmacs.url = "/home/ccr/.config/emacs"; # ccrEmacs.url = "/home/ccr/.config/emacs";
hyprland = { hyprland = {
url = "github:hyprwm/hyprland/v0.26.0"; url = "github:hyprwm/hyprland/v0.26.0";
@ -76,10 +76,11 @@
url = "github:kamadorueda/alejandra"; url = "github:kamadorueda/alejandra";
inputs.nixpkgs.follows = "nixpkgsUnstable"; inputs.nixpkgs.follows = "nixpkgsUnstable";
}; };
hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects";
}; };
outputs = inputs @ {flakeParts, ...}: outputs = inputs @ {flakeParts, ...}:
flakeParts.lib.mkFlake {inherit inputs;} { flakeParts.lib.mkFlake {inherit inputs;} ({lib, ...}: {
imports = [ imports = [
# TODO export modules as flake outputs # TODO export modules as flake outputs
# ./modules # ./modules
@ -88,24 +89,25 @@
./packages ./packages
./shell ./shell
./checks ./checks
inputs.hercules-ci-effects.flakeModule
]; ];
systems = ["x86_64-linux" "aarch64-linux"]; systems = ["x86_64-linux" "aarch64-linux"];
herculesCI = {...}: {
ciSystems = ["x86_64-linux" "aarch64-linux"];
}; };
});
nixConfig = { nixConfig = {
extra-substituters = [ extra-substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://aciceri-fleet.cachix.org"
"https://aciceri-emacs.cachix.org"
"https://rock5b-nixos.cachix.org" "https://rock5b-nixos.cachix.org"
"https://helix.cachix.org" "https://helix.cachix.org"
"https://cache.aciceri.dev"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"aciceri-fleet.cachix.org-1:e1AodrwmzRWy0eQi3lUY71M41fp9Sq+UpuKKv705xsI="
"aciceri-emacs.cachix.org-1:kxDGDFWV6LUj41tb8xmPRBI56UJSZOVveN49LZDUKdA="
"rock5b-nixos.cachix.org-1:bXHDewFS0d8pT90A+/YZan/3SjcyuPZ/QRgRSuhSPnA=" "rock5b-nixos.cachix.org-1:bXHDewFS0d8pT90A+/YZan/3SjcyuPZ/QRgRSuhSPnA="
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
"cache.aciceri.dev:4e9sFjWPUOjGwTJE98PXinJJZLwPz0m5nKsAe63MY3E="
]; ];
}; };
} }

8
hosts/default.nix
View file

@ -168,7 +168,7 @@
hyprland.nixosModules.default hyprland.nixosModules.default
]; ];
extraHmModules = with inputs; [ extraHmModules = with inputs; [
ccrEmacs.hmModules.default # ccrEmacs.hmModules.default
hyprland.homeManagerModules.default hyprland.homeManagerModules.default
]; ];
overlays = [inputs.nil.overlays.default]; overlays = [inputs.nil.overlays.default];
@ -197,13 +197,13 @@
disko.nixosModules.disko disko.nixosModules.disko
]; ];
extraHmModules = [ extraHmModules = [
inputs.ccrEmacs.hmModules.default # inputs.ccrEmacs.hmModules.default
]; ];
secrets = { secrets = {
"pbp-wireguard-private-key" = {}; "pbp-wireguard-private-key" = {};
}; };
}; };
hs = {}; # hs = {};
mothership = { mothership = {
extraModules = with inputs; [ extraModules = with inputs; [
disko.nixosModules.disko disko.nixosModules.disko
@ -211,7 +211,7 @@
# hydra.nixosModules.hydra # hydra.nixosModules.hydra
]; ];
extraHmModules = [ extraHmModules = [
inputs.ccrEmacs.hmModules.default # inputs.ccrEmacs.hmModules.default
{ {
# TODO: remove after https://github.com/nix-community/home-manager/pull/3811 # TODO: remove after https://github.com/nix-community/home-manager/pull/3811
imports = let imports = let

2
hosts/devbox/default.nix
View file

@ -21,7 +21,7 @@
enable = true; enable = true;
autologin = true; autologin = true;
modules = [ modules = [
"emacs" # "emacs"
"git" "git"
"gpg" "gpg"
"helix" "helix"

2
hosts/mothership/default.nix
View file

@ -27,7 +27,7 @@
enable = true; enable = true;
autologin = true; autologin = true;
modules = [ modules = [
"emacs" # "emacs"
"git" "git"
"gpg" "gpg"
"helix" "helix"

2
hosts/thinkpad/default.nix
View file

@ -44,7 +44,7 @@
"element" "element"
# "thunderbird" # "thunderbird"
"aerc" "aerc"
"emacs" # "emacs"
"firefox" "firefox"
"git" "git"
"gpg" "gpg"