aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2023-02-16 11:40:35 +0900
committersefidel <contact@sefidel.net>2023-02-16 11:41:05 +0900
commit927bd07cab5ad31bdd97353b3fce5550cdbbbfaf (patch)
tree499ef2b60d5ec7f58d51746b78ded61896556347
parent625bb16a078148c6ea49bf8369b8f5a6172ad455 (diff)
downloadnixrc-927bd07cab5ad31bdd97353b3fce5550cdbbbfaf.zip
feat: remove input chaotic-nixpkgs
-rw-r--r--flake.lock60
-rw-r--r--flake.nix3
-rw-r--r--home/default.nix2
-rw-r--r--nixos/alpha/configuration.nix9
-rw-r--r--nixos/beta/configuration.nix29
-rw-r--r--nixos/default.nix2
-rw-r--r--nixos/modules/cachix/caches/chaotic-nixpkgs.nix12
7 files changed, 5 insertions, 112 deletions
diff --git a/flake.lock b/flake.lock
index 9b218f3..a9e8f0d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,28 +37,6 @@
"url": "https://git.exotic.sh/pub/sefidel/asahi-firmware"
}
},
- "chaotic-nixpkgs": {
- "inputs": {
- "flake-compat": "flake-compat",
- "flake-utils": "flake-utils",
- "nixpkgs": [
- "unstable"
- ]
- },
- "locked": {
- "lastModified": 1648873252,
- "narHash": "sha256-dA2wycziAYkEPK38tb/A43wayWehtlx1cUSkDJZKYkY=",
- "owner": "~zachel",
- "repo": "chaotic-nixpkgs",
- "rev": "3f1752fecaee826781e66f4b17e5a4d580717c3e",
- "type": "sourcehut"
- },
- "original": {
- "owner": "~zachel",
- "repo": "chaotic-nixpkgs",
- "type": "sourcehut"
- }
- },
"darwin": {
"inputs": {
"nixpkgs": [
@@ -79,39 +57,8 @@
"type": "github"
}
},
- "flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1641205782,
- "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-utils": {
"locked": {
- "lastModified": 1644229661,
- "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_2": {
- "locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
@@ -125,7 +72,7 @@
"type": "github"
}
},
- "flake-utils_3": {
+ "flake-utils_2": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -178,7 +125,7 @@
},
"neovim": {
"inputs": {
- "flake-utils": "flake-utils_2",
+ "flake-utils": "flake-utils",
"nixpkgs": [
"unstable"
]
@@ -235,7 +182,6 @@
"inputs": {
"apple-silicon": "apple-silicon",
"asahi-firmware": "asahi-firmware",
- "chaotic-nixpkgs": "chaotic-nixpkgs",
"darwin": "darwin",
"home-manager": "home-manager",
"impermanence": "impermanence",
@@ -249,7 +195,7 @@
},
"rust": {
"inputs": {
- "flake-utils": "flake-utils_3",
+ "flake-utils": "flake-utils_2",
"nixpkgs": [
"unstable"
]
diff --git a/flake.nix b/flake.nix
index 49ad1ee..33c0d05 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,9 +28,6 @@
rust.url = "github:oxalica/rust-overlay";
rust.inputs.nixpkgs.follows = "unstable";
-
- chaotic-nixpkgs.url = "sourcehut:~zachel/chaotic-nixpkgs";
- chaotic-nixpkgs.inputs.nixpkgs.follows = "unstable";
};
outputs = { self, ... } @ inputs:
diff --git a/home/default.nix b/home/default.nix
index f83c954..d10a387 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -6,7 +6,7 @@
"sefidel@alpha" = self.lib.mkHome {
username = "sefidel";
hostname = "alpha";
- pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ chaotic-nixpkgs.overlay rust.overlays.default /*neovim.overlay*/ ]; };
+ pkgs = import unstable { system = "x86_64-linux"; overlays = with inputs; [ rust.overlays.default /*neovim.overlay*/ ]; };
extraModules = [
./profiles/populate.nix
diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix
index 22b7feb..23d4796 100644
--- a/nixos/alpha/configuration.nix
+++ b/nixos/alpha/configuration.nix
@@ -146,20 +146,15 @@
fontDir.enable = true;
fonts = with pkgs; [
- bitmap-font-collections
cozette
dina-font
envypn-font
- #iosevka-pure-bin # TODO: FIX
- nanum-gothic
- nanum-myeongjo
- readable-cherry
+ nanum
sarasa-gothic
siji
jetbrains-mono
tamzen
twemoji-color-font
- terminus-font-ll2-td1
emacs-all-the-icons-fonts
(nerdfonts.override { fonts = [ "Iosevka" "JetBrainsMono" ]; })
];
@@ -183,8 +178,6 @@
monospace = [
"Dina"
"Terminus"
- "cherry"
- "Iosevka Pure"
"Iosevka Nerd Font"
"JetBrainsMono Nerd Font"
];
diff --git a/nixos/beta/configuration.nix b/nixos/beta/configuration.nix
index ec00aab..989e4fa 100644
--- a/nixos/beta/configuration.nix
+++ b/nixos/beta/configuration.nix
@@ -21,35 +21,6 @@
services.openssh.enable = true;
services.openssh.settings.PasswordAuthentication = false;
- # Enable the ZNC IRC Bouncer.
- services.znc = {
- enable = true;
- openFirewall = true;
- useLegacyConfig = false;
- modulePackages = with pkgs; [
- zncModules.clientbuffer
- zncModules.playback
- zncMiscModules.chanfilter
- ];
-
- config = {
- LoadModule = [ "webadmin" ];
- User.zachel = {
- Admin = true;
- Nick = "zachel";
- RealName = "zachel";
- QuitMsg = "Bye: Quitting";
- LoadModule = [ "chansaver" "controlpanel" ];
- Pass.password = {
- # xkcdpass, not exposed to public.
- Method = "sha256";
- Hash = "c263f7c1934a65c0b20a741cc09339c245279da574b2d47482c0a6ea9ba56d6f";
- Salt = "PvDopS:MC3YLR-TTfb*:";
- };
- };
- };
- };
-
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/nixos/default.nix b/nixos/default.nix
index c8af864..611aa1d 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -4,7 +4,6 @@
alpha = self.lib.mkSystem {
name = "alpha";
nixpkgs = unstable;
- overlays = with inputs; [ chaotic-nixpkgs.overlay ];
extraModules = [
./modules/security.nix
./modules/cachix
@@ -16,7 +15,6 @@
name = "beta";
system = "aarch64-linux";
nixpkgs = unstable-small;
- overlays = with inputs; [ chaotic-nixpkgs.overlay ];
extraModules = [
./modules/security.nix
];
diff --git a/nixos/modules/cachix/caches/chaotic-nixpkgs.nix b/nixos/modules/cachix/caches/chaotic-nixpkgs.nix
deleted file mode 100644
index d6c9844..0000000
--- a/nixos/modules/cachix/caches/chaotic-nixpkgs.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, ... }:
-
-{
- nix.settings = {
- substituters = [
- "https://chaotic-nixpkgs.cachix.org"
- ];
- trusted-public-keys = [
- "chaotic-nixpkgs.cachix.org-1:xm/PZVLgwIlMc8K5+ZxGIkEXovfL9Bll5HolvzN1wIQ="
- ];
- };
-}