Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Yuge commit with all kinds of stuff that chained into each other, including a new server because the old one suddenly broke (?), lots of new new-modules, the localserver module thing, a mail server (!), and much more.. Changes: - enable plymouth for all desktop machines - regenerated mac and pc hardware config. The latter fixed the mirrored zpool not importing one of the devices on boot (specifically the uas kernel module). Also mounts /betty now - Add the new server yuri - With nice zfs datasets having everything to backup under main/root/data. The "root" part allows for using the same pool and transitioning to e.g. encryption eventually. - Has proper ipv6 config with bind and everything - remove namecoind - remove konsole stuff - simple console new-module, enabled by default - include java in eth6 package - mine.hardware options for setting battery, cpus, swap, touchpad, wlan, audio. Can be used by other modules, e.g. the xmobar one to set battery display, the same for htop - remove git host for now - centralized htop new-module, switching the config depending on hardware values - ipfs new-module with gateway - centralized keylayout new-module - localserver new-module! Somewhat easy but centralized configuration of remote port forwarding stuff. - somewhat Cetralized music new-module, should handle local/remote mpd server too(but i split it into 3 files for now because it was too big, and they're all over the place right now but I need to commit this shit now or else i won't ever do it and end up just keep adding stuff) - Added new-module profiles, one for desktop, one for server. They enable other new-modules options, no import hell! - Enabling grub splash image, i want to put some nice pic there, doing this to remind myself of it - Mail Server! - Using nixos-mailserver - with correct dns bind settings - Set digitalocean droplet name to mail.<domain> to have rDNS be correct - youtubeDl new-module (is somewhat coupled to the music one :/) - Disabled automatic scrubs, as this might've been the cause of the last server dying (RIP paul) - draft of proper dns record module in bind.nix, but it's just kinda WIP work that's in there and i should clean that up - webserver, webkeys new-module - Nice znc newmodule with nice options to set channels and detachedChannels for each network. All personal info separated. - new-module for ssh-keys, setting them in another place - personal folder for personal config stuff - test module to test stuff (test user, test subdomain for now) - X, dunst, live-wallpaper new-module, needs more options though - zsh for all main users (so root has a nice shell now) - nixops file layout now one for each host that declares network related settingns, the default.nix nixops file only specifies the deployment host, which could be different depending on where you deploy for (later nixops' set-args can be used to pass these hosts). - Removed some nfs config stains and some stuff i didn't know what it was for or experimental stuff - updated nixpkgs - add sunrise to bind allowed queriers - more pkgs - pics - screenshot - update some private stuff related to this commit
- Loading branch information
Showing
74 changed files
with
2,427 additions
and
1,819 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,5 @@ with lib; | |
| efiSupport = true; | ||
| efiInstallAsRemovable = true; | ||
| }; | ||
|
|
||
| plymouth.enable = true; | ||
| }; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { config, pkgs, ... }: | ||
|
|
||
| { | ||
| imports = [ | ||
| ./hardware-configuration.nix | ||
| ]; | ||
|
|
||
| boot = { | ||
| loader.grub.device = "/dev/vda"; | ||
| zfs.devNodes = "/dev"; | ||
| kernelParams = [ "net.ifnames=0" ]; | ||
| }; | ||
|
|
||
| mine.hardware = { | ||
| cpuCount = 1; | ||
| swap = true; | ||
| }; | ||
|
|
||
| services.znapzend = { | ||
| enable = true; | ||
| autoCreation = true; | ||
| pure = true; | ||
| zetup = { | ||
| "main/root/data" = { | ||
| plan = "1hour=>10mins,1day=>1hour,1week=>1day,1month=>1week"; | ||
| recursive = true; | ||
| destinations.pc = { | ||
| host = "pc"; | ||
| dataset = "main/backup/server"; | ||
| plan = "1day=>1hour,1week=>1day,1month=>1week,1year=>1month"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| users.users.root.openssh.authorizedKeys.keys = [ | ||
| "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7zf2O8yBXxh2tX9v/3ZztXtYeV4W9vTY2iSrm92HSErjz5KcIY/AAKaqbWXHZgsZk2pehBqNbQMOwn0WWdLvil2+Ah97cvl7d9b9XdCkfOPhNB6FKcTzPmMp5Rivi/IodVMhT2xO9S1zO0Y2Q7dsYgk5leKyiD10pkcw23p6MPMKhKV2DPgY6BiszrTEVmtyOHpGkji9rE1iB9MyOINY9eC4etmnNINXMlwttV0GjbJI9WXXEQN2mRaPPp1PBWaPOgoP3ufKi9MR1hEhAantyrfBm2SeqjUvXG5JN1RyooohIWIHWXNJlYFldFPsCD/C1HnE5ylJeLBbZEw0TPb6x infinisil@NixOS" | ||
| ]; | ||
|
|
||
| services.openssh.enable = true; | ||
|
|
||
| system.stateVersion = "18.03"; # Did you read the comment? | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| # Do not modify this file! It was generated by ‘nixos-generate-config’ | ||
| # and may be overwritten by future invocations. Please make changes | ||
| # to /etc/nixos/configuration.nix instead. | ||
| { config, lib, pkgs, ... }: | ||
|
|
||
| { | ||
| imports = | ||
| [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> | ||
| ]; | ||
|
|
||
| boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_blk" ]; | ||
| boot.kernelModules = [ "kvm-intel" ]; | ||
| boot.extraModulePackages = [ ]; | ||
|
|
||
| fileSystems."/" = | ||
| { device = "main/root"; | ||
| fsType = "zfs"; | ||
| }; | ||
|
|
||
| fileSystems."/nix" = | ||
| { device = "main/root/nix"; | ||
| fsType = "zfs"; | ||
| }; | ||
|
|
||
| fileSystems."/boot" = | ||
| { device = "/dev/disk/by-uuid/d5f30c4e-5f44-4998-9c8b-7e62fe2113ce"; | ||
| fsType = "ext4"; | ||
| }; | ||
|
|
||
| fileSystems."/home" = | ||
| { device = "main/root/data/home"; | ||
| fsType = "zfs"; | ||
| }; | ||
|
|
||
| fileSystems."/root" = | ||
| { device = "main/root/data/root"; | ||
| fsType = "zfs"; | ||
| }; | ||
|
|
||
| fileSystems."/var/lib" = | ||
| { device = "main/root/data/varlib"; | ||
| fsType = "zfs"; | ||
| }; | ||
|
|
||
| fileSystems."/home/infinisil/music" = | ||
| { device = "main/root/data/music"; | ||
| fsType = "zfs"; | ||
| }; | ||
|
|
||
| swapDevices = | ||
| [ { device = "/dev/disk/by-uuid/5a75abf7-1fd3-4ec8-81ea-a872a3848e4a"; } | ||
| ]; | ||
|
|
||
| nix.maxJobs = lib.mkDefault 1; | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.