diff options
| -rw-r--r-- | krebs/3modules/tv/default.nix | 12 | ||||
| -rw-r--r-- | lass/1systems/mors.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/nixpkgs.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/teamviewer.nix | 6 | ||||
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/nomic.nix | 12 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 2 |
7 files changed, 22 insertions, 16 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 3315dd157..d44c322aa 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -391,11 +391,13 @@ with import <stockholm/lib>; zu = { cores = 4; nets = { - #gg23 = { - # ip4.addr = ""; - # aliases = ["zu.gg23"]; - # ssh.port = 11423; - #}; + gg23 = { + ip4.addr = "10.23.1.39"; + aliases = [ + "zu.gg23" + ]; + ssh.port = 11423; + }; retiolum = { ip4.addr = "10.243.13.40"; ip6.addr = "42:0:0:0:0:0:0:1340"; diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 9f2cec9a1..594f342db 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -18,13 +18,13 @@ with import <stockholm/lib>; ../2configs/wine.nix ../2configs/git.nix ../2configs/skype.nix - ../2configs/teamviewer.nix ../2configs/libvirt.nix ../2configs/fetchWallpaper.nix #../2configs/c-base.nix ../2configs/mail.nix ../2configs/krebs-pass.nix ../2configs/repo-sync.nix + ../2configs/ircd.nix { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index fd331e90d..e2bdd5755 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "76f346d61d537f5bbe4f365f9f659df7024602b4"; + ref = "2a97e149e50e1c701a957c6bd060cc74b7e9a905"; }; } diff --git a/lass/2configs/teamviewer.nix b/lass/2configs/teamviewer.nix deleted file mode 100644 index 87b6fbac3..000000000 --- a/lass/2configs/teamviewer.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, pkgs, ... }: - -with import <stockholm/lib>; -{ - services.teamviewer.enable = true; -} diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 2a6df06ff..76e13412b 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -151,7 +151,7 @@ in { description = "maintenance acc for domsen"; home = "/home/domsen"; useDefaultShell = true; - extraGroups = [ "nginx" ]; + extraGroups = [ "nginx" "download" ]; createHome = true; }; diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 7d6a1d682..5469fffd5 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -7,7 +7,7 @@ with import <stockholm/lib>; imports = [ ../. - ../2configs/hw/AO753.nix + ../2configs/hw/x220.nix ../2configs/exim-retiolum.nix ../2configs/git.nix ../2configs/im.nix @@ -25,6 +25,16 @@ with import <stockholm/lib>; ]; }; + # Don't use UEFI because current disk was partitioned/formatted for AO753. + # TODO remove following bool.loader section after repartitioning/reformatting + boot.loader = { + grub = { + device = "/dev/sda"; + splashImage = null; + }; + systemd-boot.enable = mkForce false; + }; + fileSystems."/" = { device = "/dev/mapper/nomic1-root"; fsType = "btrfs"; diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 8852100e2..ea97b1957 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import <stockholm/lib>; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "728a9578e31a0f78f6ad07a3a2ec706ec5290f10"; + ref = "81428dd022c26764e9066d381ece90b1e88bd0d2"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; |