summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Finlinson <devin.finlinson@pm.me>2024-05-24 23:36:01 -0600
committerDevin Finlinson <devin.finlinson@pm.me>2024-05-24 23:36:01 -0600
commit93972203887ed6bc5e9bb1f029f8a3a309ada51a (patch)
tree6f849e2c4bdc0904bd426f6de687e55efac9f4a1
parentc5df241cef1b62f174a9fb6aa52ee711963c307a (diff)
parent7715422d7758787c55fc56e46bf10791439529a7 (diff)
Merge branch 'master' of ssh://bosco:/srv/git/.flake
chaos merge update
-rw-r--r--flake.lock10
-rw-r--r--flake.nix7
2 files changed, 9 insertions, 8 deletions
diff --git a/flake.lock b/flake.lock
index 24313ff..b3b4d3e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -369,15 +369,15 @@
"nushell-scripts": {
"flake": false,
"locked": {
- "lastModified": 1716413736,
- "narHash": "sha256-V2GL14M+MudPse1WFNhPL6Uvqjfm85n4J6dZki6uvzE=",
- "owner": "doolphin",
+ "lastModified": 1716399661,
+ "narHash": "sha256-dFEr4tntEPMiwrBYeyWQbkkqu5xsXMYyEj7mJ3Kp7yw=",
+ "owner": "nushell",
"repo": "nu_scripts",
- "rev": "3958f0ba7e3fd2762a01d6bb003fdfd4dd7598d8",
+ "rev": "407a313bbb13bd5ce2de16768ab2ebec7c111657",
"type": "github"
},
"original": {
- "owner": "doolphin",
+ "owner": "nushell",
"repo": "nu_scripts",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index c12bcca..9bbea91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,8 +48,8 @@
# useful nushell scripts, such as auto_completion
nushell-scripts = {
- url = "github:doolphin/nu_scripts";
- # url = "github:nushell/nu_scripts";
+ # url = "github:doolphin/nu_scripts";
+ url = "github:nushell/nu_scripts";
flake = false;
};
@@ -134,8 +134,9 @@
outputs = inputs@{ self, ...}: with inputs; {
packages.x86_64-linux = {
+ # packages.x86_64-linux = {
ISO = nixos-generators.nixosGenerate {
- system = "x86_64-linux";
+ system = "aarch64-linux";
modules = [
./modules/users/defin.nix
./modules/nixos/system-packages.nix