Restructure home management

- Home config is now imported as a module from the host config - The configuration takes variables to decide which settings to activate - Extra fonts were added - Some packages were added/reactivated
2022-04-03 18:03:55 +02:00
parent fbaf7caeb6
commit cad1f6abe5
8 changed files with 358 additions and 463 deletions
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -0,0 +1,126 @@
+{ pkgs, config, inputs, specialArgs, ... }:
+let
+  inherit (pkgs) lib;
+in {
+  time.timeZone = "Europe/Oslo";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  # nixpkgs.config = {
+  #   allowUnfree = true;
+  # };
+
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
+
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+	    builders-use-substitutes = true
+    '';
+  };
+
+  environment = {
+    variables = {
+      EDITOR = "nvim";
+      VISUAL = "nvim";
+    };
+
+    shells = with pkgs; [
+      bashInteractive
+      zsh
+      dash
+    ];
+
+    etc = {
+      # TODO: move this out of etc, and reference it directly in sudo config.
+      sudoLecture = {
+        target = "sudo.lecture";
+        text = lib.termColors.front.red "Be careful or something, idk...\n";
+      };
+
+      "resolv.conf".source = let
+        inherit (lib.strings) concatStringsSep;
+        inherit (pkgs) writeText;
+      in writeText "resolv.conf" ''
+        ${concatStringsSep "\n" (map (ns: "nameserver ${ns}") config.networking.nameservers)}
+        options edns0
+      '';
+
+      currentSystemPackages = {
+        target = "current-system-packages";
+        text = let
+          inherit (lib.strings) concatStringsSep;
+          inherit (lib.lists) sort;
+          inherit (lib.trivial) lessThan;
+          packages = map (p: "${p.name}") config.environment.systemPackages;
+          sortedUnique = sort lessThan (lib.unique packages);
+        in concatStringsSep "\n" sortedUnique;
+      };
+    };
+  };
+
+  fonts = {
+    enableDefaultFonts = true;
+
+    fonts = with pkgs; [
+      cm_unicode
+      dejavu_fonts
+      fira-code
+      fira-code-symbols
+      powerline-fonts
+      iosevka
+      symbola
+      corefonts
+      ipaexfont
+      ipafont
+      liberation_ttf
+      migmix
+      noto-fonts
+      noto-fonts-cjk
+      noto-fonts-emoji
+      open-sans
+      source-han-sans
+      source-sans
+      ubuntu_font_family
+      victor-mono
+      (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
+      inputs.fonts
+    ];
+
+    fontconfig = {
+      defaultFonts = {
+        serif = [ "Droid Sans Serif" "Ubuntu" ];
+        sansSerif = [ "Droid Sans" "Ubuntu" ];
+        monospace = [ "Fira Code" "Ubuntu" ];
+        emoji = [ "Noto Sans Emoji" ];
+      };
+    };
+  };
+
+  users.users.h7x4 = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+  };
+
+  home-manager = {
+    useGlobalPkgs = true;
+    extraSpecialArgs = specialArgs;
+
+    # TODO: figure out why specialArgs isn't accessible from the root home file.
+    users.h7x4 = import ../home.nix {
+      inherit pkgs;
+      inherit (specialArgs) machineVars;
+    };
+  };
+
+  security.sudo.extraConfig = ''
+    Defaults    lecture = always
+    Defaults    lecture_file = /etc/${config.environment.etc.sudoLecture.target}
+  '';
+ 
+  system.stateVersion = "21.11";
+}
--- a/hosts/eisei/configuration.nix
+++ b/hosts/eisei/configuration.nix
@@ -25,8 +25,6 @@ in {
    };
  };

-  time.timeZone = "Europe/Oslo";
-
  networking = {
    hostName = "Eisei";
    networkmanager.enable = true;
@@ -45,8 +43,6 @@ in {
  };

  i18n = {
-    defaultLocale = "en_US.UTF-8";
-
    inputMethod = {
      enabled = "fcitx";
      fcitx.engines = with pkgs.fcitx-engines; [ mozc ];
@@ -61,11 +57,6 @@ in {
    # };
  };

-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-
  services = {
    openssh.enable = true;
    gnome.gnome-keyring.enable = true;
@@ -106,20 +97,11 @@ in {

  hardware.bluetooth.enable = true;

-  nixpkgs.config = {
-    allowUnfree = true;
-  };
-
  nix = {
    distributedBuilds = true;
-    package = pkgs.nixFlakes;
    binaryCaches = [
      "https://cache.nixos.org/"
    ];
-    extraOptions = ''
-      experimental-features = nix-command flakes
-	    builders-use-substitutes = true
-    '';

    buildMachines = [
      {
@@ -139,94 +121,21 @@ in {

  };

-  users.users.h7x4 = {
-    isNormalUser = true;
-    extraGroups = [
-      "wheel"
-      "networkmanager"
-      "docker"
-      "disk"
-      "audio"
-      "video"
-      "libvirtd"
-      "input"
-    ];
-    shell = pkgs.zsh;
-  };
+  users.users.h7x4.extraGroups = [
+    "wheel"
+    "networkmanager"
+    "docker"
+    "disk"
+    "audio"
+    "video"
+    "libvirtd"
+    "input"
+  ];

-  environment = {
-    variables = {
-      EDITOR = "nvim";
-      VISUAL = "nvim";
-    };
-
-    systemPackages = with pkgs; [
-      wget
-      haskellPackages.xmobar
-    ];
-
-    shells = with pkgs; [
-      bashInteractive
-      zsh
-      dash
-    ];
-
-    etc = {
-      # TODO: move this out of etc, and reference it directly in sudo config.
-      sudoLecture = {
-        target = "sudo.lecture";
-        text = lib.termColors.front.red "Be careful or something, idk...\n";
-      };
-
-      currentSystemPackages = {
-        target = "current-system-packages";
-        text = let
-          inherit (lib.strings) concatStringsSep;
-          inherit (lib.lists) sort;
-          inherit (lib.trivial) lessThan;
-          packages = map (p: "${p.name}") config.environment.systemPackages;
-          sortedUnique = sort lessThan (lib.unique packages);
-        in concatStringsSep "\n" sortedUnique;
-      };
-    };
-  };
-
-  fonts = {
-    enableDefaultFonts = true;
-
-    fonts = with pkgs; [
-      cm_unicode
-      dejavu_fonts
-      fira-code
-      fira-code-symbols
-      powerline-fonts
-      iosevka
-      symbola
-      corefonts
-      ipaexfont
-      ipafont
-      liberation_ttf
-      migmix
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      open-sans
-      source-han-sans
-      source-sans
-      ubuntu_font_family
-      victor-mono
-      (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
-    ];
-
-    fontconfig = {
-      defaultFonts = {
-        serif = [ "Droid Sans Serif" "Ubuntu" ];
-        sansSerif = [ "Droid Sans" "Ubuntu" ];
-        monospace = [ "Fira Code" "Ubuntu" ];
-        emoji = [ "Noto Sans Emoji" ];
-      };
-    };
-  };
+  environment.systemPackages = with pkgs; [
+    wget
+    haskellPackages.xmobar
+  ];

  programs = {
    dconf.enable = true;
@@ -269,16 +178,9 @@ in {
    };
  };

-  security.sudo.extraConfig = ''
-    Defaults    lecture = always
-    Defaults    lecture_file = /etc/${config.environment.etc.sudoLecture.target}
-  '';
-
  virtualisation = {
    docker.enable = true;
    libvirtd.enable = true;
  };
-
-  system.stateVersion = "21.11";
 }

--- a/hosts/kasei/configuration.nix
+++ b/hosts/kasei/configuration.nix
@@ -1,11 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, specialArgs, ... }:
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-
-      ../../pluggables/tools/programming.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix
+    ../../pluggables/tools/programming.nix
+  ];

  systemd.targets = {
    sleep.enable = false;
@@ -14,14 +12,10 @@
    hybrid-sleep.enable = false;
  };

-  nix.package = pkgs.nixFlakes;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-
  # security.pam.services.login.unixAuth = true;

  boot.loader = {
+    efi.canTouchEfiVariables = false;
    grub = {
      enable = true;
      version = 2;
@@ -30,12 +24,8 @@
      device = "nodev";
      efiInstallAsRemovable = true;
    };
-    # efi.efiSysMountPoint = "/boot/efi";
-    # efi.canTouchEfiVariables = true;
  };

-  time.timeZone = "Europe/Oslo";
-
  networking = {
    hostName = "kasei";
    networkmanager.enable = true;
@@ -50,8 +40,6 @@
  };

  i18n = {
-    defaultLocale = "en_US.UTF-8";
-
    inputMethod = {
      enabled = "fcitx";
      fcitx.engines = with pkgs.fcitx-engines; [ mozc ];
@@ -65,126 +53,36 @@
    #   ];
    # };
  };
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };

-  # services = {
-  #   openssh = {
-  #     enable = true;
-  #     passwordAuthentication = false;
-  #     challengeResponseAuthentication = false;
-  #     permitRootLogin = "no";
-  #   };
-  #   printing.enable = true;
-  #   cron = {
-  #     enable = true;
-  #     systemCronJobs = [
-  #   #     "*/5 * * * *      root    date >> /tmp/cron.log"
-  #     ];
-  #   };
-  # };
-
-  users.users = {
-    h7x4 = {
-      isNormalUser = true;
-      extraGroups = [
-        "wheel"
-        "networkmanager"
-        "docker"
-        "audio"
-        "video"
-        "disk"
-        "libvirtd"
-        "input"
-      ];
-      shell = pkgs.zsh;
-    };
-  };
+  users.users.h7x4.extraGroups = [
+    "wheel"
+    "networkmanager"
+    "docker"
+    "audio"
+    "video"
+    "disk"
+    "libvirtd"
+    "input"
+  ];

  environment = {
-    variables = {
-      EDITOR = "nvim";
-      VISUAL = "nvim";
+    shellAliases = {
+      fixscreen = "xrandr --output DP-4 --mode 1920x1080 --pos 0x0 -r 144 --output DVI-D-1 --primary --mode 1920x1080 --pos 1920x0 -r 60";
    };

    systemPackages = with pkgs; [
      wget
      haskellPackages.xmobar
    ];
-
-    shells = with pkgs; [
-      bashInteractive
-      zsh
-      dash
-    ];
-
-    etc = {
-      sudoLecture = {
-        target = "sudo.lecture";
-        text = "[31mBe careful or something, idk...[m\n";
-      };
-
-      "resolv.conf" = with lib; with pkgs; {
-        source = writeText "resolv.conf" ''
-          ${concatStringsSep "\n" (map (ns: "nameserver ${ns}") config.networking.nameservers)}
-          options edns0
-        '';
-      };
-
-      currentSystemPackages = {
-        target = "current-system-packages";
-        text = let
-          inherit (lib.strings) concatStringsSep;
-          inherit (lib.lists) sort;
-          inherit (lib.trivial) lessThan;
-          packages = map (p: "${p.name}") config.environment.systemPackages;
-          sortedUnique = sort lessThan (lib.unique packages);
-        in concatStringsSep "\n" sortedUnique;
-      };
-    };
-  };
-
-  fonts = {
-    enableDefaultFonts = true;
-
-    fonts = with pkgs; [
-      cm_unicode
-      dejavu_fonts
-      fira-code
-      fira-code-symbols
-      powerline-fonts
-      iosevka
-      symbola
-      corefonts
-      ipaexfont
-      ipafont
-      liberation_ttf
-      migmix
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      open-sans
-      source-han-sans
-      source-sans
-      ubuntu_font_family
-      victor-mono
-      (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
-    ];
-
-    fontconfig = {
-      defaultFonts = {
-        serif = [ "Droid Sans Serif" "Ubuntu" ];
-        sansSerif = [ "Droid Sans" "Ubuntu" ];
-        monospace = [ "Fira Code" "Ubuntu" ];
-        emoji = [ "Noto Sans Emoji" ];
-      };
-    };
  };

  services = {
-    openssh.enable = true;
+    openssh = {
+      enable = true;
+      passwordAuthentication = false;
+      challengeResponseAuthentication = false;
+      permitRootLogin = "no";
+    };
    gnome.gnome-keyring.enable = true;
    printing.enable = true;
    dbus = {
@@ -261,17 +159,10 @@
    };
  };

-  security.sudo.extraConfig = ''
-    Defaults    lecture = always
-    Defaults    lecture_file = /etc/${config.environment.etc.sudoLecture.target} 
-  '';
-
  virtualisation = {
    docker.enable = true;
    libvirtd.enable = true;
  };
-
-  system.stateVersion = "21.11";
 }


--- a/hosts/tsuki/configuration.nix
+++ b/hosts/tsuki/configuration.nix
@@ -31,11 +31,6 @@
    hybrid-sleep.enable = false;
  };

-  nix.package = pkgs.nixFlakes;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-
  # security.pam.services.login.unixAuth = true;

  boot.loader = {
@@ -51,8 +46,6 @@
    # efi.canTouchEfiVariables = true;
  };

-  time.timeZone = "Europe/Oslo";
-
  networking = {
    hostName = "Tsuki";
    networkmanager.enable = true;
@@ -65,12 +58,6 @@
    firewall.enable=true;
  };

-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-
  services = {
    openssh = {
      enable = true;
@@ -90,102 +77,23 @@
  users.groups.media = {};

  users.users = {
-    h7x4 = {
-      isNormalUser = true;
-      extraGroups = [
-        "wheel"
-        "networkmanager"
-        "docker"
-        "disk"
-        "libvirtd"
-        "input"
-      ];
-      shell = pkgs.zsh;
-    };
+    h7x4.extraGroups = [
+      "wheel"
+      "networkmanager"
+      "docker"
+      "disk"
+      "libvirtd"
+      "input"
+    ];
    media = {
      isSystemUser = true;
      group = "media";
    };
  };

-  environment = {
-    variables = {
-      EDITOR = "nvim";
-      VISUAL = "nvim";
-    };
-
-    systemPackages = with pkgs; [
-      wget
-    ];
-
-    shells = with pkgs; [
-      bashInteractive
-      zsh
-      dash
-    ];
-
-    etc = {
-      sudoLecture = {
-        target = "sudo.lecture";
-        text = "[31mBe careful or something, idk...[m\n";
-      };
-
-      "resolv.conf" = with lib; with pkgs; {
-        source = writeText "resolv.conf" ''
-          ${concatStringsSep "\n" (map (ns: "nameserver ${ns}") config.networking.nameservers)}
-          options edns0
-        '';
-      };
-
-      currentSystemPackages = {
-        target = "current-system-packages";
-        text = let
-          inherit (lib.strings) concatStringsSep;
-          inherit (lib.lists) sort;
-          inherit (lib.trivial) lessThan;
-          packages = map (p: "${p.name}") config.environment.systemPackages;
-          sortedUnique = sort lessThan (lib.unique packages);
-        in concatStringsSep "\n" sortedUnique;
-      };
-    };
-  };
-
-  fonts = {
-    enableDefaultFonts = true;
-
-    fonts = with pkgs; [
-      cm_unicode
-      dejavu_fonts
-      fira-code
-      fira-code-symbols
-      powerline-fonts
-      iosevka
-      symbola
-      corefonts
-      ipaexfont
-      ipafont
-      liberation_ttf
-      migmix
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      open-sans
-      source-han-sans
-      source-sans
-      ubuntu_font_family
-      victor-mono
-      (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
-    ];
-
-    fontconfig = {
-      defaultFonts = {
-        serif = [ "Droid Sans Serif" "Ubuntu" ];
-        sansSerif = [ "Droid Sans" "Ubuntu" ];
-        monospace = [ "Fira Code" "Ubuntu" ];
-        emoji = [ "Noto Sans Emoji" ];
-      };
-    };
-  };
+  environment.systemPackages = with pkgs; [
+    wget
+  ];

  programs = {
    git.enable = true;
@@ -221,17 +129,8 @@
    };
  };

-  security.sudo.extraConfig = ''
-    Defaults    lecture = always
-    Defaults    lecture_file = /etc/${config.environment.etc.sudoLecture.target} 
-  '';
-
  virtualisation = {
    docker.enable = true;
    libvirtd.enable = true;
  };
-
-  system.stateVersion = "21.11";
 }
-
-