From 73b073c3fe037f31e05828a1071c9b4b19f7a2ff Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 1 Jun 2017 12:49:21 +0200 Subject: lass: RIP helios --- lass/1systems/dishfire.nix | 1 - lass/1systems/helios.nix | 130 --------------------------------------------- 2 files changed, 131 deletions(-) delete mode 100644 lass/1systems/helios.nix (limited to 'lass/1systems') diff --git a/lass/1systems/dishfire.nix b/lass/1systems/dishfire.nix index 9c77f909..e12367ac 100644 --- a/lass/1systems/dishfire.nix +++ b/lass/1systems/dishfire.nix @@ -70,7 +70,6 @@ relay_from_hosts = map (host: host.nets.retiolum.ip4.addr) [ config.krebs.hosts.mors config.krebs.hosts.uriel - config.krebs.hosts.helios ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix deleted file mode 100644 index 99760dfd..00000000 --- a/lass/1systems/helios.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ config, pkgs, ... }: - -with builtins; -with import ; - -{ - imports = [ - ../. - ../2configs/retiolum.nix - ../2configs/exim-retiolum.nix - ../2configs/browsers.nix - ../2configs/programs.nix - ../2configs/git.nix - ../2configs/pass.nix - ../2configs/fetchWallpaper.nix - ../2configs/backups.nix - - #{ - # # conflicting stuff with gnome setup - # # TODO: fix this - # imports = [ - # ../2configs/baseX.nix - # ]; - #} - { - # gnome3 for suja - time.timeZone = "Europe/Berlin"; - services.xserver.enable = true; - services.xserver.desktopManager.xfce.enable = true; - networking.wireless.enable = true; - hardware.pulseaudio = { - enable = true; - systemWide = true; - }; - users.users.ferret = { - uid = genid "ferret"; - home = "/home/ferret"; - group = "users"; - createHome = true; - useDefaultShell = true; - extraGroups = [ - ]; - hashedPassword = "$6$SaneLuyep90p8BPn$0IDbvLgNbRGZL96obWavanTmY6IkBG84vs2b/2oqlpbmTZH3retOYbQKF1uVqu6dD0ZGF4eBq9tqPbwUjRyY00"; - }; - environment.systemPackages = with pkgs; [ - firefox - chromium - maven - arandr - libreoffice - mpv - ]; - } - #{ - # users.extraUsers = { - # root = { - # openssh.authorizedKeys.keys = map readFile [ - # ../../krebs/Zpubkeys/uriel.ssh.pub - # ]; - # }; - # }; - #} - #{ - # services.elasticsearch = { - # enable = true; - # }; - #} - { - krebs.power-action.battery = "BAT1"; - } - ]; - - krebs.build.host = config.krebs.hosts.helios; - - - hardware.enableAllFirmware = true; - nixpkgs.config.allowUnfree = true; - - boot = { - loader.grub.enable = true; - loader.grub.version = 2; - loader.grub.device = "/dev/sda"; - - initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ]; - initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; - initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; - #kernelModules = [ "kvm-intel" "msr" ]; - kernelModules = [ "msr" ]; - }; - fileSystems = { - "/" = { - device = "/dev/pool/nix"; - fsType = "ext4"; - }; - - "/boot" = { - device = "/dev/sda1"; - }; - - "/home" = { - device = "/dev/pool/home"; - fsType = "ext4"; - }; - - "/bku" = { - device = "/dev/pool/bku"; - fsType = "ext4"; - }; - "/tmp" = { - device = "tmpfs"; - fsType = "tmpfs"; - options = ["nosuid" "nodev" "noatime"]; - }; - }; - - #services.udev.extraRules = '' - # SUBSYSTEM=="net", ATTR{address}=="64:27:37:7d:d8:ae", NAME="wl0" - # SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:b8:c8:2e", NAME="et0" - #''; - - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - accelFactor = "0.035"; - additionalOptions = '' - Option "FingerHigh" "60" - Option "FingerLow" "60" - ''; - }; -} -- cgit v1.2.3