From 858bae561079b26ab78ad17fda59bdb932375bfc Mon Sep 17 00:00:00 2001 From: kat witch Date: Thu, 12 Nov 2020 17:05:08 +0000 Subject: [PATCH] New system (Mabon). Renamed "unstable" to nixpkgs-master for correctness. Added Google Chrome and VLC to the desktop profile for Chromecast usage. Added MultiMC to the gaming profile. --- configuration/hosts/default.nix | 8 +++-- configuration/hosts/mabon/configuration.nix | 36 +++++++++++++++++++ .../hosts/mabon/hardware-configuration.nix | 26 ++++++++++++++ configuration/profiles/common/users.nix | 1 + configuration/profiles/desktop/default.nix | 10 +++--- configuration/profiles/gaming/default.nix | 2 +- 6 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 configuration/hosts/mabon/configuration.nix create mode 100644 configuration/hosts/mabon/hardware-configuration.nix diff --git a/configuration/hosts/default.nix b/configuration/hosts/default.nix index b312553f..083b223b 100644 --- a/configuration/hosts/default.nix +++ b/configuration/hosts/default.nix @@ -2,7 +2,7 @@ let hosts = { yule = { ssh.host = "kat@yule"; - groups = [ "desktop" "personal" ]; + groups = [ "laptop" "personal" ]; }; beltane = { ssh.host = "kat@beltane"; @@ -14,7 +14,11 @@ let }; litha = { ssh.host = "root@litha"; - groups = [ "desktop" "personal" ]; + groups = [ "laptop" "personal" ]; + }; + mabon = { + ssh.host = "root@192.168.1.218"; + groups = [ "laptop" "personal"]; }; }; pkgs = import { }; diff --git a/configuration/hosts/mabon/configuration.nix b/configuration/hosts/mabon/configuration.nix new file mode 100644 index 00000000..1b93757f --- /dev/null +++ b/configuration/hosts/mabon/configuration.nix @@ -0,0 +1,36 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ../../profiles/common + ../../profiles/desktop + ../../profiles/xfce + ../../profiles/network + ../../profiles/yubikey + ]; + + + # Use the GRUB 2 boot loader. + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + + networking.hostName = "mabon"; # Define your hostname. + + networking.useDHCP = false; + networking.interfaces.enp0s25.useDHCP = true; + networking.interfaces.wls3.useDHCP = true; + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + system.stateVersion = "20.09"; # Did you read the comment? + +} + + diff --git a/configuration/hosts/mabon/hardware-configuration.nix b/configuration/hosts/mabon/hardware-configuration.nix new file mode 100644 index 00000000..614e4dfa --- /dev/null +++ b/configuration/hosts/mabon/hardware-configuration.nix @@ -0,0 +1,26 @@ +# 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, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "ahci" "firewire_ohci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/05829271-4036-4d81-85b0-cd8c8197d40f"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/aacb9f81-bc7a-46f9-8cac-04942d078318"; } + ]; + + networking.enableIntel3945ABGFirmware = true; +} diff --git a/configuration/profiles/common/users.nix b/configuration/profiles/common/users.nix index 2d4c40f3..a2985163 100644 --- a/configuration/profiles/common/users.nix +++ b/configuration/profiles/common/users.nix @@ -69,6 +69,7 @@ "samhain" = { hostname = "192.168.1.135"; } // kat; "litha" = { hostname = "192.168.1.240"; } // kat; "yule" = { hostname = "192.168.1.92"; } // kat; + "lughnasadh" = { hostname = "192.168.1.102"; } // kat; }; }; diff --git a/configuration/profiles/desktop/default.nix b/configuration/profiles/desktop/default.nix index 1d21c88b..c9918da4 100644 --- a/configuration/profiles/desktop/default.nix +++ b/configuration/profiles/desktop/default.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: let - unstable = import - (fetchTarball "https://github.com/NixOS/nixpkgs/archive/master.tar.gz") { }; + nixpkgs-master = import + (fetchTarball "https://github.com/NixOS/nixpkgs/archive/master.tar.gz") { config.allowUnfree = true; }; in { nixpkgs.config = { mumble.speechdSupport = true; }; @@ -11,8 +11,10 @@ in { pkgs._1password pkgs.mpv pkgs.mumble - unstable.pkgs.syncplay - unstable.pkgs.youtube-dl + pkgs.vlc + nixpkgs-master.pkgs.syncplay + nixpkgs-master.pkgs.youtube-dl + nixpkgs-master.google-chrome pkgs.transmission-gtk pkgs.jdk11 pkgs.lm_sensors diff --git a/configuration/profiles/gaming/default.nix b/configuration/profiles/gaming/default.nix index d9e8bf15..2dadd3ec 100644 --- a/configuration/profiles/gaming/default.nix +++ b/configuration/profiles/gaming/default.nix @@ -3,5 +3,5 @@ hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; hardware.pulseaudio.support32Bit = true; - home-manager.users.kat = { home.packages = [ pkgs.steam pkgs.steam-run ]; }; + home-manager.users.kat = { home.packages = [ pkgs.steam pkgs.steam-run pkgs.multimc ]; }; }