diff options
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/alpha/configuration.nix | 9 | ||||
-rw-r--r-- | nixos/beta/configuration.nix | 29 | ||||
-rw-r--r-- | nixos/default.nix | 2 | ||||
-rw-r--r-- | nixos/modules/cachix/caches/chaotic-nixpkgs.nix | 12 |
4 files changed, 1 insertions, 51 deletions
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=" - ]; - }; -} |