diff --git a/nix/os/devices/steveej-laptop/boot.nix b/nix/os/devices/steveej-laptop/boot.nix deleted file mode 100644 index 7c689ce..0000000 --- a/nix/os/devices/steveej-laptop/boot.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - # workaround to disable CPU wining - # current CPU has 9 idle cstates. - boot.kernelParams = [ "intel_idle.max_cstate=9" ]; -} diff --git a/nix/os/devices/steveej-laptop/configuration.nix b/nix/os/devices/steveej-laptop/configuration.nix deleted file mode 100644 index 794bafd..0000000 --- a/nix/os/devices/steveej-laptop/configuration.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: - -{ - imports = [ - ../../profiles/common/configuration.nix - ../../profiles/graphical/configuration.nix - - ./pkg.nix - ./system.nix - ./hw.nix - ./user.nix - ./boot.nix - ]; -} diff --git a/nix/os/devices/steveej-laptop/hw.nix b/nix/os/devices/steveej-laptop/hw.nix deleted file mode 100644 index 9e66240..0000000 --- a/nix/os/devices/steveej-laptop/hw.nix +++ /dev/null @@ -1,62 +0,0 @@ -# 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, ... }: - -{ - boot.initrd.availableKernelModules = [ - "aesni_intel" - "kvm-intel" - "aes_x86_64" - ]; - - boot.extraModprobeConfig = '' - options kvm-intel nested=1 - options kvm-intel enable_shadow_vmcs=1 - options kvm-intel enable_apicv=1 - options kvm-intel ept=1 - ''; - - # TODO: migrate this to the encryptedDisk module - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/445D-DBAA"; - fsType = "vfat"; - }; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/948e84dc-5c4f-4051-8a13-efb30155839f"; - fsType = "btrfs"; - options = [ "subvol=nixos" ]; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/948e84dc-5c4f-4051-8a13-efb30155839f"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/var/lib/rkt" = { - fsType = "tmpfs"; - }; - - fileSystems."/var/lib/cni" = { - fsType = "tmpfs"; - }; - - swapDevices = [ - { label = "vg0swap"; } - ]; - - boot.loader.grub = { - device = "/dev/sda"; - efiSupport = true; - }; - - boot.initrd.luks.devices = [ { - name = "btrfsroot"; - device = "/dev/disk/by-uuid/0e6b5751-0e6d-4de7-84c3-17fe525c4c72"; - preLVM = true; - allowDiscards = true; - } - ]; -} diff --git a/nix/os/devices/steveej-laptop/pkg.nix b/nix/os/devices/steveej-laptop/pkg.nix deleted file mode 100644 index 4c01731..0000000 --- a/nix/os/devices/steveej-laptop/pkg.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ config, - pkgs, - ... }: - -let - -in { - nixpkgs.config = { - allowBroken = false; - allowUnfree = true; - - packageOverrides = pkgs: rec { - # libvirt = unstablepkgs.libvirt; - - myLinuxPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor - (pkgs.linux_latest.override { - kernelPatches = pkgs.linux_latest.kernelPatches ++ [ - { - name = "bfq1"; - patch = pkgs.fetchurl { - url = "ftp://teambelgium.net/bfq/patches/4.7.0-v8r3/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0.patch"; - sha256 = "116jfdgjgmy1fv6kzz7dm1c7rjy1pbsfzzcjv5mgsb7pnaxq3gd6"; - }; - } - { - name = "bfq2"; - patch = pkgs.fetchurl { - url = "ftp://teambelgium.net/bfq/patches/4.7.0-v8r3/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0.patch"; - sha256 = "0wjmnym2ycglx42f513n97b45x3xqi33q7z4cs0aiz0zbblm8jql"; - }; - } - { - name = "bfq3"; - patch = pkgs.fetchurl { - url = "ftp://teambelgium.net/bfq/patches/4.7.0-v8r3/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch"; - sha256 = "0898aklynxb9dr0nb0kdhc2incjkjihds9dakxvdy0mwjqr0jd6v"; - }; - } - { - name = "bfq4"; - patch = pkgs.fetchurl { - url = "ftp://teambelgium.net/bfq/patches/4.7.0-v8r3/0004-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r3-for.patch"; - sha256 = "09ya3g39zk9k3hzjx4fkl60qkxdgzllnx3kk9dyi7lvydmhp4y6v"; - }; - } - ]; - extraConfig = '' - BFQ_GROUP_IOSCHED y - IOSCHED_BFQ y - DEFAULT_BFQ y - ''; - }) - pkgs.linuxPackages_latest - ); - }; - }; - - environment.systemPackages = with pkgs; [ - ]; -} diff --git a/nix/os/devices/steveej-laptop/system.nix b/nix/os/devices/steveej-laptop/system.nix deleted file mode 100644 index c75bfde..0000000 --- a/nix/os/devices/steveej-laptop/system.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ config -, lib -, pkgs -, ... -}: - -let - unstablepkgs = import { config = config.nixpkgs; }; - -in { - # The NixOS release to be compatible with for stateful data such as databases. - # system.stateVersion = "unstable"; - - networking.hostName = "steveej-laptop"; # Define your hostname. - - # Used for testing local Tectonic clusters - environment.etc."NetworkManager/dnsmasq.d/tectonic.conf".text = '' - server=/tt.testing/192.168.124.1 - server=/tectonic-ci.de/192.168.124.1 - server=/tectonic-ci.lan/192.168.124.1 - ''; - networking.firewall.enable = lib.mkForce false; - networking.firewall.checkReversePath = false; - - networking.bridges."virbr1".interfaces = []; - networking.interfaces."virbr1".ipv4.addresses = [ - { address = "10.254.254.254"; prefixLength = 24; } - ]; - - services.printing = { - enable = true; - drivers = with pkgs; [ - hplip - ]; - }; - - services.nix-serve.enable = true; - - services.fprintd.enable = true; - security.pam.services = { - login.fprintAuth = true; - sudo.fprintAuth = true; - }; - - # Kubernetes - # services.kubernetes.roles = ["master" "node"]; - - # virtualization - virtualisation = { - libvirtd.enable = true; - virtualbox.host.enable = true; - virtualbox.host.addNetworkInterface = true; - docker.enable = true; - }; -} diff --git a/nix/os/devices/steveej-laptop/user.nix b/nix/os/devices/steveej-laptop/user.nix deleted file mode 100644 index 5f385ed..0000000 --- a/nix/os/devices/steveej-laptop/user.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config -, pkgs -, ... }: - -let - inherit (import ../../lib/default.nix { }) mkUser; - -in -{ - users.extraUsers.steveej2 = mkUser { - uid = 1001; - }; - - users.extraUsers.steveej3 = mkUser { - uid = 1002; - }; -} - diff --git a/nix/os/devices/steveej-laptop/versions.nix b/nix/os/devices/steveej-laptop/versions.nix deleted file mode 100644 index 52734ca..0000000 --- a/nix/os/devices/steveej-laptop/versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - channelsNixosStable = { - ref = "nixos-18.09"; - rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a"; - }; - channelsNixosUnstable = { - ref = "nixos-unstable"; - rev = "44b02b52ea6a49674f124f50009299f192ed78bb"; - }; -}