darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

flake.lock: Update #152

Merged
DarkKirb merged 13 commits from update_flake_lock_action into main 2023-01-29 07:06:59 +00:00
Conversation 15 Commits 13 Files changed 9 +261 -241
9 changed files with 261 additions and 241 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
config/archetype-desktop.nix
View file

@ -1,15 +0,0 @@
{
imports = [
./desktop.nix
./systemd-boot.nix
];
fileSystems."/" = {
device = "tank/local/root";
fsType = "zfs";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/6557-C4A0";
fsType = "vfat";
};
}

15
config/archetype-server.nix
View file

@ -1,15 +0,0 @@
{
imports = [
./server.nix
./systemd-boot.nix
];
fileSystems."/" = {
device = "tank/local/root";
fsType = "zfs";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/6557-C4A0";
fsType = "vfat";
};
}

5
config/default.nix
View file

@ -87,9 +87,4 @@
path = "/home/darkkirb/.ssh/builder_id_ed25519"; path = "/home/darkkirb/.ssh/builder_id_ed25519";
}; };
networking.nameservers = ["fd0d:a262:1fa6:e621:b4e1:08ff:e658:6f49" "fd0d:a262:1fa6:e621:746d:4523:5c04:1453"]; networking.nameservers = ["fd0d:a262:1fa6:e621:b4e1:08ff:e658:6f49" "fd0d:a262:1fa6:e621:746d:4523:5c04:1453"];
# Archetype configuration
networking.hostName = lib.mkDefault "nixos";
networking.hostId = lib.mkDefault "00000000";
networking.wireguard.interfaces."wg0".ips = lib.mkDefault ["fd0d:a262:1fa6:e621::/64"];
} }

28
config/programs/helix/languages.nix
View file

@ -570,20 +570,20 @@
roots = []; roots = [];
scope = "text.html.basic"; scope = "text.html.basic";
} }
{ # {
comment-token = "#"; # comment-token = "#";
file-types = ["py"]; # file-types = ["py"];
indent = { # indent = {
tab-width = 4; # tab-width = 4;
unit = " "; # unit = " ";
}; # };
injection-regex = "python"; # injection-regex = "python";
language-server.command = "${pkgs.python3Packages.python-lsp-server}/bin/pylsp"; # language-server.command = "${pkgs.python3Packages.python-lsp-server}/bin/pylsp";
name = "python"; # name = "python";
roots = []; # roots = [];
scope = "source.python"; # scope = "source.python";
shebangs = ["python"]; # shebangs = ["python"];
} # }
{ {
comment-token = "#"; comment-token = "#";
file-types = ["ncl"]; file-types = ["ncl"];

1
config/services/akkoma/mediaproxy.nix
View file

@ -35,5 +35,4 @@
"d '/var/cache/mediacache' 0750 nginx nginx - -" "d '/var/cache/mediacache' 0750 nginx nginx - -"
]; ];
systemd.services.nginx.serviceConfig.ReadWritePaths = ["/var/cache/mediacache"]; systemd.services.nginx.serviceConfig.ReadWritePaths = ["/var/cache/mediacache"];
services.nginx.validateConfig = false;
} }

3
config/services/atticd.nix
View file

@ -2,11 +2,14 @@
attic, attic,
config, config,
lib, lib,
nix-packages,
system,
... ...
}: { }: {
imports = [attic.nixosModules.atticd]; imports = [attic.nixosModules.atticd];
services.atticd = { services.atticd = {
enable = true; enable = true;
package = attic.packages.${system}.attic-server;
credentialsFile = config.sops.secrets."services/attic".path; credentialsFile = config.sops.secrets."services/attic".path;
settings = { settings = {
listen = "[::1]:57448"; listen = "[::1]:57448";

304
flake.lock
View file

@ -10,16 +10,46 @@
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs-for-crane"
],
"nixpkgs-stable": [
"nixpkgs-for-crane"
]
},
"locked": {
"lastModified": 1674800265,
"narHash": "sha256-i9D3Ne4ktffiNfyM+jp7dOhRDkktm2SgtBCxkkFZP5E=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "54d93ff61f98639d41d7897f7059aacabcb07772",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"repo": "attic",
"type": "github"
}
},
"attic_2": {
"inputs": {
"crane": "crane_2",
"flake-compat": "flake-compat_4",
"flake-utils": [
"nix-packages",
"flake-utils"
],
"nixpkgs": [
"nix-packages",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1673903654, "lastModified": 1674800265,
"narHash": "sha256-KbrCEtEYfuaGhbaDqc18QvfrG3/f6hMbjGE9WwxxjA4=", "narHash": "sha256-i9D3Ne4ktffiNfyM+jp7dOhRDkktm2SgtBCxkkFZP5E=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "49bd872153180a3ac705d6cb86071f9f290ef1a4", "rev": "54d93ff61f98639d41d7897f7059aacabcb07772",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,6 +100,21 @@
"type": "github" "type": "github"
} }
}, },
"check-flake_2": {
"locked": {
"lastModified": 1662502605,
"narHash": "sha256-jAT55UhabAxLAVGanxjnNdzH2/oX2ZjLsL4i2jPIP+g=",
"owner": "srid",
"repo": "check-flake",
"rev": "48a17393ed4fcd523399d6602c283775b5127295",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "check-flake",
"type": "github"
}
},
"chir-rs": { "chir-rs": {
"inputs": { "inputs": {
"cargo2nix": [ "cargo2nix": [
@ -84,11 +129,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1673690903, "lastModified": 1674678757,
"narHash": "sha256-tBeEIbm7XK2ce4/H6zwSo5dasussj6yraaQ7c3jp7DY=", "narHash": "sha256-STlC5Ghw7/ZCc7Y+1Ryz37Xa+txeVxZcwyTLw9gCOs4=",
"owner": "DarkKirb", "owner": "DarkKirb",
"repo": "chir.rs", "repo": "chir.rs",
"rev": "e3a2e5779044e18cc67707bac3b2d91de912e187", "rev": "6ae3e28ea6905733b12e466e63ac1d7410f7355f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,16 +149,51 @@
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs-for-crane"
],
"rust-overlay": [
"rust-overlay"
]
},
"locked": {
"lastModified": 1674934931,
"narHash": "sha256-TmGfRDBK7EkR0VY8Jr0WU4WdyzZxiXDGVGUzIXPFXRI=",
"owner": "DarkKirb",
"repo": "crane",
"rev": "42c3f329daa267857c6bc6d21c9eec468e97e2d7",
"type": "github"
},
"original": {
"owner": "DarkKirb",
"repo": "crane",
"type": "github"
}
},
"crane_2": {
"inputs": {
"flake-compat": [
"nix-packages",
"attic",
"flake-compat"
],
"flake-utils": [
"nix-packages",
"attic",
"flake-utils"
],
"nixpkgs": [
"nix-packages",
"attic",
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1673405853, "lastModified": 1672095661,
"narHash": "sha256-6Nq9DuOo+gE2I8z5UZaKuumykz2xxZ9JGYmUthOuwSA=", "narHash": "sha256-7NTsdCn3qsvU7A+1/7tY8pxbq0DYy1pFYNpzN6he9lI=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "b13963c8c18026aa694acd98d14f66d24666f70b", "rev": "98894bb39b03bfb379c5e10523cd61160e1ac782",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,16 +227,19 @@
}, },
"ema": { "ema": {
"inputs": { "inputs": {
"check-flake": "check-flake",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-root": "flake-root",
"haskell-flake": "haskell-flake", "haskell-flake": "haskell-flake",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1672890976, "lastModified": 1674319430,
"narHash": "sha256-qOgNfkq0GuOFMPtTpT81eKjP+VA8AbursJdQXvBRBbc=", "narHash": "sha256-Snp0Pi8aBdh4CHcgfxo65+gY0McR9N6WQZwOlsPN4gA=",
"owner": "EmaApps", "owner": "EmaApps",
"repo": "ema", "repo": "ema",
"rev": "39013719e69f60088c153f861df584ed16bd826d", "rev": "4cd2ec14c2f91f852c6d270c7434f3332668cb78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,14 +250,14 @@
}, },
"emanote": { "emanote": {
"inputs": { "inputs": {
"check-flake": "check-flake", "check-flake": "check-flake_2",
"ema": [ "ema": [
"ema" "ema"
], ],
"flake-parts": [ "flake-parts": [
"flake-parts" "flake-parts"
], ],
"flake-root": "flake-root", "flake-root": "flake-root_2",
"haskell-flake": [ "haskell-flake": [
"haskell-flake" "haskell-flake"
], ],
@ -183,14 +266,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1673544293, "lastModified": 1674572755,
"narHash": "sha256-DWH36a7HAfys+IkvRHr1DFNit1wibOU7xNlNVtCan0Y=", "narHash": "sha256-8UmDkZ4PsAezrAlrJ9fAuN6Z7Fs6Mfc+G5Sn1Zb9JgA=",
"owner": "EmaApps", "owner": "EmaApps",
"repo": "emanote", "repo": "emanote",
"rev": "584d52c4c7071e643ce738db9db0196f17071518", "rev": "0977bc1dd34d6ebf0eea045b121ed86dce5e2e88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,6 +346,38 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
@ -288,11 +403,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673362319, "lastModified": 1674771137,
"narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=", "narHash": "sha256-Zpk1GbEsYrqKmuIZkx+f+8pU0qcCYJoSUwNz1Zk+R00=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f", "rev": "7c7a8bce3dffe71203dcd4276504d1cb49dfe05f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -316,6 +431,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-root_2": {
"locked": {
"lastModified": 1671378805,
"narHash": "sha256-yqGxyzMN2GuppwG3dTWD1oiKxi+jGYP7D1qUSc5vKhI=",
"owner": "srid",
"repo": "flake-root",
"rev": "dc7ba6166e478804a9da6881aa48c45d300075cf",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -333,11 +463,11 @@
}, },
"haskell-flake": { "haskell-flake": {
"locked": { "locked": {
"lastModified": 1671460011, "lastModified": 1674066917,
"narHash": "sha256-Do7coaucS6ZjNysizQsVPYLLFkq6eQse8n7bzzjAy2I=", "narHash": "sha256-nRSAb7N64zmAbXUoVVqY/s2LbSIdDTdfN0sSKG5/CCY=",
"owner": "srid", "owner": "srid",
"repo": "haskell-flake", "repo": "haskell-flake",
"rev": "54334cfae9bbb73732bbb1437260017044f68d0b", "rev": "c6ff897db9abdd4e5ff7911b5f9234a1380c6611",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -348,11 +478,11 @@
}, },
"haskell-flake_2": { "haskell-flake_2": {
"locked": { "locked": {
"lastModified": 1673460110, "lastModified": 1674483307,
"narHash": "sha256-D4J7FfHOrLPIZBmypjuwxXriOhOnxllUeYkmLzTcc2M=", "narHash": "sha256-NlohHWCqOsMY4q2fmKR6VAAX4y09Cr85Ezgbx4Q2hbc=",
"owner": "srid", "owner": "srid",
"repo": "haskell-flake", "repo": "haskell-flake",
"rev": "6a56fbd3e4bb7e040b5ac98ba9fe7afcb5e285c0", "rev": "8688fb2deaa193795467eedb4d2473dbeaba19b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +531,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1673343300, "lastModified": 1674771519,
"narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=", "narHash": "sha256-U0W3S1nX6yEvLh3Vq70EORbmXecAKXfmEfCfaA4A+I8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e", "rev": "bb4b25b302dbf0f527f190461b080b5262871756",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +547,11 @@
"hosts-list": { "hosts-list": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673624576, "lastModified": 1674878399,
"narHash": "sha256-dkYKi2P8qLoCe2SlVmaB1dIZze8cnuHs5vuTapxL7x8=", "narHash": "sha256-Q9YGPQeMKQqUdeBJawkkIZ2NaAt2o8Cv6B5w2vz4mSc=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "47d6b2a17b7b7558fa0915fc6497c03232ce3580", "rev": "5ca7ad227954736bbcfc91e7461cec415bde0918",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -508,6 +638,8 @@
}, },
"nix-packages": { "nix-packages": {
"inputs": { "inputs": {
"attic": "attic_2",
"flake-compat": "flake-compat_5",
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
@ -516,11 +648,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673095329, "lastModified": 1674723167,
"narHash": "sha256-FGIa9JvLlow/CPAxldHnXf16HGVsKLE6uh5erSlFhwE=", "narHash": "sha256-gzJK/sbsQ7OeKY5F+iRJ5RpD0JwL977ck9l3xL7Ud+g=",
"owner": "DarkKirb", "owner": "DarkKirb",
"repo": "nix-packages", "repo": "nix-packages",
"rev": "9a8aa15d919b8caeeffbe92d7267e7bad3245323", "rev": "2b1b6f4d7a322f1e3c4cb5b04b268e2c94fb38f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -531,11 +663,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1673440569, "lastModified": 1674550793,
"narHash": "sha256-FQ5o0yI+MH9MgfseeGDsVIIpIqv3BCgq+0NzncuZ9Zo=", "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "88016c96c3c338aa801695cdd9f186820bcfe4d6", "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -546,11 +678,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1672756850, "lastModified": 1674096995,
"narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=", "narHash": "sha256-/vw7At/SztpZjTeM11foA7YdOFmdwSn+ARo8oy+mlUU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "298add347c2bbce14020fcb54051f517c391196b", "rev": "676c80dcc2f0ba780c8ab204f92c5abd69fa1245",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -560,6 +692,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-for-crane": {
"locked": {
"lastModified": 1673681449,
"narHash": "sha256-0Sd00uFoVsO7xgd15FZst7wlw6Wvt7rJ7y7Q5BWKMgA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3ae365afb80773c3bb67e52294a82e329a9e5be0",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3ae365afb80773c3bb67e52294a82e329a9e5be0",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
@ -644,11 +792,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1673681449, "lastModified": 1674895870,
"narHash": "sha256-0Sd00uFoVsO7xgd15FZst7wlw6Wvt7rJ7y7Q5BWKMgA=", "narHash": "sha256-eCObaRvyPVAn1IQZ64Ptg4uXnBh+hr7YN/U/GSbphXY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ae365afb80773c3bb67e52294a82e329a9e5be0", "rev": "45e5242a5c98882c09b410458cce5f3b9bd0623a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -659,11 +807,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1673675147, "lastModified": 1674888299,
"narHash": "sha256-sSGAGJy824JyyPAXXbdSLPvtDv+EtFvMjVhzlUU2Qrs=", "narHash": "sha256-5g0shs1K4vxmv3W8SqgI7cmSnlotT4AWmxdBO9tvmTM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "54252f1df660dc3c0800bce91a3161bd6ae18027", "rev": "22eafe11a555362dadd49b3f76b1ceae7e17e4d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -674,18 +822,18 @@
}, },
"prismmc": { "prismmc": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_6",
"libnbtplusplus": "libnbtplusplus", "libnbtplusplus": "libnbtplusplus",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1673641272, "lastModified": 1674845749,
"narHash": "sha256-GLDUpYEeer4CgxYGRS8ZKmwbS3sQdGRDHgCTcfVZCh8=", "narHash": "sha256-QgVEztK1+sLjxFMifPXANtKporRRKaO6r6go40ofFR4=",
"owner": "PrismLauncher", "owner": "PrismLauncher",
"repo": "PrismLauncher", "repo": "PrismLauncher",
"rev": "3de681d2d64339fe8f46043278c21748907f33ad", "rev": "c78db5459ef7afbc8fd5a5b81b03f672f94235bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -712,6 +860,7 @@
"nix-packages": "nix-packages", "nix-packages": "nix-packages",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-for-crane": "nixpkgs-for-crane",
"nixpkgs-noto-variable": "nixpkgs-noto-variable", "nixpkgs-noto-variable": "nixpkgs-noto-variable",
"nur": "nur", "nur": "nur",
"prismmc": "prismmc", "prismmc": "prismmc",
@ -732,11 +881,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673404037, "lastModified": 1674008920,
"narHash": "sha256-9yhRzFiqzVQaJN5jsAIwApDolkORRQ3EJi7D4yu58ig=", "narHash": "sha256-ugwPxKjvmJ5GpzN/MHg8tuhe8nYi3SbJm5nWNy7CB0Q=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a979c85ed4691bf996af88504522b32e9611ccfe", "rev": "eecc44934a0f6c02c02856b38bd3b6af3bec0870",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -748,20 +897,24 @@
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"nix-packages",
"attic",
"crane", "crane",
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"nix-packages",
"attic",
"crane", "crane",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1672712534, "lastModified": 1670034122,
"narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", "narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", "rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -780,11 +933,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673662873, "lastModified": 1674872860,
"narHash": "sha256-/YOtiDKPUXKKpIhsAds11llfC42ScGW27bbHnNZebco=", "narHash": "sha256-IH6FckXyjJ4atdYzIIkBBILucoFmjAqvm+NWqFqcmHg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "90163bbbadce526f8b248a5fe545b06c59597108", "rev": "bbc57d7aac4ac1ec0a68ff77a22d03622cc11246",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -803,11 +956,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673481602, "lastModified": 1674546403,
"narHash": "sha256-P80X38fOM2MtoYdgkyuksGOQPDhIhNJW2W2jMeMIZzE=", "narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "32187b33ac6ec9b628dcd08dd941a715e6241dda", "rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -819,11 +972,11 @@
"tomlplusplus": { "tomlplusplus": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1671534690, "lastModified": 1674419205,
"narHash": "sha256-ThvnS3sBKNDd26ykj27+jp+/l6Av26ttDjerbWJjgOA=", "narHash": "sha256-OUw3/CCPz1nMa/y6wkAOcSIjbLb5P90m/2hZWOdvJ/Q=",
"owner": "marzer", "owner": "marzer",
"repo": "tomlplusplus", "repo": "tomlplusplus",
"rev": "698285d9b2f3f6756fcdab8b93f60352325764e1", "rev": "d8bb7176d59a258e80be3d1675902b89d0436c99",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -833,6 +986,21 @@
} }
}, },
"treefmt-nix": { "treefmt-nix": {
"locked": {
"lastModified": 1672931382,
"narHash": "sha256-lgtc2Sct/xtvqkdzlJ4AL3Vesw0Wz/fxqNGOBFS7YXU=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "6717065d6a432bc3f5b827007ad959e6032d5856",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"locked": { "locked": {
"lastModified": 1671882555, "lastModified": 1671882555,
"narHash": "sha256-43HxY5gNaDMkKckeEXbhua4Ay1/S1HnYzqZBIVhzeqI=", "narHash": "sha256-43HxY5gNaDMkKckeEXbhua4Ay1/S1HnYzqZBIVhzeqI=",

129
flake.nix
View file

@ -8,7 +8,8 @@ rec {
url = "github:zhaofengli/attic"; url = "github:zhaofengli/attic";
inputs.crane.follows = "crane"; inputs.crane.follows = "crane";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs-for-crane";
inputs.nixpkgs-stable.follows = "nixpkgs-for-crane";
}; };
cargo2nix = { cargo2nix = {
url = "github:cargo2nix/cargo2nix"; url = "github:cargo2nix/cargo2nix";
@ -21,12 +22,12 @@ rec {
inputs.cargo2nix.follows = "cargo2nix"; inputs.cargo2nix.follows = "cargo2nix";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.attic.follows = "attic";
}; };
crane = { crane = {
url = "github:ipetkov/crane"; url = "github:DarkKirb/crane";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs-for-crane";
inputs.rust-overlay.follows = "rust-overlay";
}; };
dns = { dns = {
url = "github:DarkKirb/dns.nix"; url = "github:DarkKirb/dns.nix";
@ -62,11 +63,13 @@ rec {
}; };
nix-packages = { nix-packages = {
url = "github:DarkKirb/nix-packages"; url = "github:DarkKirb/nix-packages";
#inputs.attic.follows = "attic";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs.url = "github:NixOS/nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs";
nixpkgs-for-crane.url = "github:NixOS/nixpkgs/3ae365afb80773c3bb67e52294a82e329a9e5be0";
nixpkgs-noto-variable.url = "github:NixOS/nixpkgs/1988f9a17fc1c2ab11f5817adf34a4eb8d06454d"; nixpkgs-noto-variable.url = "github:NixOS/nixpkgs/1988f9a17fc1c2ab11f5817adf34a4eb8d06454d";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
prismmc = { prismmc = {
@ -118,21 +121,6 @@ rec {
name = "instance-20221213-1915"; # Oracle server name = "instance-20221213-1915"; # Oracle server
system = "aarch64-linux"; system = "aarch64-linux";
} }
{
name = "server-x86_64"; # archetype
system = "x86_64-linux";
configName = "archetype-server";
}
{
name = "server-aarch64"; # archetype
system = "aarch64-linux";
configName = "archetype-server";
}
{
name = "desktop-x86_64"; # archetype
system = "x86_64-linux";
configName = "archetype-desktop";
}
]; ];
in rec { in rec {
nixosConfigurations = builtins.listToAttrs (map nixosConfigurations = builtins.listToAttrs (map
@ -194,108 +182,6 @@ rec {
]; ];
}; };
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
homeConfigurations = builtins.listToAttrs (nixpkgs.lib.foldr (a: b: a ++ b) [] (map (system: let
pkgs = import nixpkgs {
inherit system;
overlays = [
self.overlays.${system}
nur.overlay
args.prismmc.overlay
];
config.allowUnfree = true;
};
in [
{
name = "base-${system}";
value = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
(import ./config/home-manager/base.nix false)
{
home.username = "base";
home.homeDirectory = "/home/base";
}
];
extraSpecialArgs = args // {inherit system;};
};
}
{
name = "base-desktop-${system}";
value = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
(import ./config/home-manager/base.nix true)
{
home.username = "base";
home.homeDirectory = "/home/base";
}
];
extraSpecialArgs = args // {inherit system;};
};
}
{
name = "root-${system}";
value = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
./config/home-manager/root.nix
{
home.username = "root";
home.homeDirectory = "/root";
}
];
extraSpecialArgs = args // {inherit system;};
};
}
{
name = "darkkirb-${system}";
value = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
(import ./config/home-manager/darkkirb.nix {
desktop = false;
args = {};
})
{
home.username = "darkkirb";
home.homeDirectory = "/home/darkkirb";
}
];
extraSpecialArgs = args // {inherit system;};
};
}
{
name = "darkkirb-desktop-${system}";
value = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
(import ./config/home-manager/darkkirb.nix {
desktop = true;
args = {};
})
{
home.username = "darkkirb";
home.homeDirectory = "/home/darkkirb";
}
];
extraSpecialArgs = args // {inherit system;};
};
}
{
name = "miifox-${system}";
value = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
./config/home-manager/miifox.nix
{
home.username = "miifox";
home.homeDirectory = "/home/miifox";
}
];
extraSpecialArgs = args // {inherit system;};
};
}
]) ["x86_64-linux" "aarch64-linux"]));
hydraJobs = hydraJobs =
(builtins.listToAttrs (map (builtins.listToAttrs (map
({ ({
@ -311,7 +197,6 @@ rec {
systems)) systems))
// { // {
inherit devShell; inherit devShell;
homeConfigurations = nixpkgs.lib.mapAttrs (_: v: v.activationPackage) self.homeConfigurations;
# Uncomment the line to build an installer image # Uncomment the line to build an installer image
# This is EXTREMELY LARGE and will make builds take forever # This is EXTREMELY LARGE and will make builds take forever
# installer.x86_64-linux = nixosConfigurations.installer.config.system.build.isoImage; # installer.x86_64-linux = nixosConfigurations.installer.config.system.build.isoImage;

2
overlays/default.nix
View file

@ -29,7 +29,7 @@ in
}; };
}); });
inherit (noto-variable) noto-fonts-cjk; inherit (noto-variable) noto-fonts-cjk;
nix = nix-packages.packages.${system}.nix-s3-dedup.overrideAttrs (old: rec { nix = prev.nix.overrideAttrs (old: rec {
postPatchPhase = '' postPatchPhase = ''
sed 's/getBoolAttr."allowSubstitutes", true./true/' src/libstore/parsed-derivations.cc sed 's/getBoolAttr."allowSubstitutes", true./true/' src/libstore/parsed-derivations.cc
''; '';