Move machine nixos and home-manager config into machines directory, update makefile accordingly

2023-06-17 10:27:02 +01:00 · 2023-06-17 10:27:02 +01:00 · bf81136d18
parent 60595d7ed9
commit bf81136d18
22 changed files with 117 additions and 197 deletions
--- a/4
+++ b/4
@ -1,5 +1,5 @@
 $(eval HOSTNAME=$(shell hostname))
-HOMEMANAGER_CONFIG := $(PWD)/home/$(HOSTNAME)/$(USER).nix
+HOMEMANAGER_CONFIG := $(PWD)/machines/$(HOSTNAME)/$(USER).nix
 CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config)
 HOMEMANAGER_CONFIG_DIR := $(CONFIG_DIR)/home-manager

@ -14,7 +14,7 @@ clean:
 	[ -e /etc/nixos ] && sudo rm /etc/nixos/config || rm -rf $(HOMEMANAGER_CONFIG_DIR)

 nixos: /etc/nixos/config
-	sudo nixos-rebuild switch
+	grep -i ./config/machines/$$(hostname) /etc/nixos/configuration.nix && sudo nixos-rebuild switch

 home: $(HOMEMANAGER_CONFIG_DIR)/home.nix
 	home-manager switch
--- a/Vanguard.nix
+++ b/Vanguard.nix
@ -1,52 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./common.nix
-    ./hardware/audio.nix
-    ./hardware/bluetooth.nix
-    ./locales/en_GB.nix
-    ./desktop/plasma.nix
-    ./services/syncthing/Vanguard.nix
-  ];
-  environment.systemPackages = with pkgs; [
-    mesa
-    lutris
-    wine-wayland
-    mono
-    winetricks
-  ];
-
-  networking = {
-    hostName = "Vanguard"; # Define your hostname.
-    nameservers = ["192.168.1.166" "9.9.9.9"];
-    firewall = {enable = true;};
-  };
-  services.xserver.displayManager = {
-    defaultSession = "plasma";
-    autoLogin.user = "xenia";
-  };
-
-  users.users.xenia = {
-    isNormalUser = true;
-    description = "Evie Litherland-Smith";
-    extraGroups = ["networkmanager" "wheel"];
-    shell = pkgs.fish;
-  };
-  home-manager.users.xenia = import ./home/Vanguard/xenia.nix;
-
-  # Steam
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-  };
-  hardware.steam-hardware.enable = true;
-  hardware.opengl.driSupport32Bit = true;
-
-  # Requirements for Star Citizen
-  boot.kernel.sysctl."vm.max_map_count" = 16777216;
-
-  # Extra hardware configuration
-  hardware.openrazer = {
-    enable = true;
-    users = ["xenia"];
-  };
-}
--- a/common.nix
+++ b/common.nix
@ -1,8 +1,4 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
+{lib, ...}: let
  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
 in {
  imports = [(import "${home-manager}/nixos")];
--- a/home/H0615/elitherl.nix
+++ b/home/H0615/elitherl.nix
@ -1,16 +0,0 @@
-{pkgs, ...}: {
-  imports = [../work.nix ../desktop/picom.nix];
-  home.username = "elitherl";
-  home.homeDirectory = "/home/elitherl";
-  home.stateVersion = "22.11";
-  home.packages = with pkgs; [zotero];
-
-  programs.fish.functions.nvsync = ''
-    rsync -avz --filter=':- .gitignore' --exclude='.git*'\
-      --delete-during --delete-excluded\
-      $HOME/.config/nvim/ heimdall003.jet.uk:.config/nvim
-    rsync -avz --filter=':- .gitignore' --exclude='.git*'\
-      --delete-during --delete-excluded\
-      $HOME/.config/nvim/ freia:.config/nvim
-  '';
-}
--- a/home/H0615/hypr/hyprland.conf
+++ b/home/H0615/hypr/hyprland.conf
@ -1,19 +0,0 @@
-source=./common.conf
-
-monitor=HDMI-A-1,preferred,auto,auto
-monitor=DP-1,preferred,auto,auto,transform,1
-
-windowrule = float, title:^([Zz]oom).*$
-windowrule = float, ^(Nxplayer.bin)$
-windowrule = center, title:^([Zz]oom).*$
-windowrule = workspace 4, title:^([Zz]oom).*$
-windowrule = workspace 5 silent, ^(Nxplayer.bin)$
-
-windowrule = monitor 1, title:^(Zoom)(.*)$
-windowrule = monitor 1, ^(Nxplayer.bin)$
-
-wsbind=1,HDMI-A-1
-wsbind=2,HDMI-A-1
-wsbind=3,HDMI-A-1
-wsbind=4,HDMI-A-1
-wsbind=5,HDMI-A-1
--- a/home/H0615/hypr/hyprpaper.conf
+++ b/home/H0615/hypr/hyprpaper.conf
@ -1,2 +0,0 @@
-preload = ~/nixos/wallpaper.jpg
-wallpaper = ,~/nixos/wallpaper.jpg
--- a/home/J0162/elitherl.nix
+++ b/home/J0162/elitherl.nix
@ -1,16 +0,0 @@
-{pkgs, ...}: {
-  imports = [../work.nix ../desktop/picom.nix];
-  home.username = "elitherl";
-  home.homeDirectory = "/home/elitherl";
-  home.stateVersion = "22.11";
-  home.packages = with pkgs; [zotero];
-
-  programs.fish.functions.nvsync = ''
-    rsync -avz --filter=':- .gitignore' --exclude='.git*'\
-      --delete-during --delete-excluded\
-      $HOME/.config/nvim/ heimdall003.jet.uk:.config/nvim
-    rsync -avz --filter=':- .gitignore' --exclude='.git*'\
-      --delete-during --delete-excluded\
-      $HOME/.config/nvim/ freia:.config/nvim
-  '';
-}
--- a/home/J0162/hypr/hyprland.conf
+++ b/home/J0162/hypr/hyprland.conf
@ -1,7 +0,0 @@
-source=./common.conf
-
-windowrule = float, title:^([Zz]oom).*$
-windowrule = float, ^(Nxplayer.bin)$
-windowrule = center, title:^([Zz]oom).*$
-windowrule = workspace 4, title:^([Zz]oom).*$
-windowrule = workspace 5 silent, ^(Nxplayer.bin)$
--- a/home/J0162/hypr/hyprpaper.conf
+++ b/home/J0162/hypr/hyprpaper.conf
@ -1,2 +0,0 @@
-preload = ~/nixos/wallpaper.jpg
-wallpaper = ,~/nixos/wallpaper.jpg
--- a/home/Vanguard/hypr/hyprland.conf
+++ b/home/Vanguard/hypr/hyprland.conf
@ -1,9 +0,0 @@
-source=./common.conf
-misc {
-  vrr = 2
-}
-monitor=DP-2,highrr,auto,1
-
-windowrule = workspace 4 silent, ^(discord)$
-windowrule = workspace 5 silent, ^(Steam|steamwebhelper)$
-windowrule = monitor 1, ^(Steam|steamwebhelper)$
--- a/home/Vanguard/hypr/hyprpaper.conf
+++ b/home/Vanguard/hypr/hyprpaper.conf
@ -1,2 +0,0 @@
-preload = ~/nixos/wallpaper.jpg
-wallpaper = ,~/nixos/wallpaper.jpg
--- a/home/Vanguard/xenia.nix
+++ b/home/Vanguard/xenia.nix
@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  imports = [../personal.nix ../desktop/picom.nix];
-  home.username = "xenia";
-  home.homeDirectory = "/home/xenia";
-  home.stateVersion = "22.11";
-  home.packages = with pkgs; [prismlauncher nomachine-client];
-}
--- a/machines/H0615/default.nix
+++ b/machines/H0615/default.nix
@ -1,10 +1,10 @@
 {pkgs, ...}: {
  imports = [
-    ./common.nix
-    ./hardware/audio.nix
-    ./locales/en_GB.nix
-    ./desktop/plasma.nix
-    ./services/syncthing/H0615.nix
+    ../../common.nix
+    ../../hardware/audio.nix
+    ../../locales/en_GB.nix
+    ../../desktop/plasma.nix
+    ../../services/syncthing/H0615.nix
  ];

  networking.hostName = "H0615"; # Define your hostname.
@ -12,17 +12,15 @@
    defaultSession = "plasma";
    autoLogin.user = "elitherl";
  };
-
+  system.autoUpgrade = {
+    enable = false;
+    allowReboot = false;
+  };
  users.users.elitherl = {
    isNormalUser = true;
    description = "Evie Litherland-Smith";
    extraGroups = ["networkmanager" "wheel"];
    shell = pkgs.fish;
  };
-  home-manager.users.elitherl = import ./home/H0615/elitherl.nix;
-
-  system.autoUpgrade = {
-    enable = false;
-    allowReboot = false;
-  };
+  home-manager.users.elitherl = import ./elitherl.nix;
 }
--- a/machines/H0615/elitherl.nix
+++ b/machines/H0615/elitherl.nix
@ -0,0 +1,13 @@
+{pkgs, ...}: {
+  imports = [../../home/work.nix ../../home/gui ../../home/desktop/picom.nix];
+  home.username = "elitherl";
+  home.homeDirectory = "/home/elitherl";
+  home.stateVersion = "22.11";
+  home.packages = with pkgs; [
+    zotero
+    openfortivpn
+    nomachine-client
+    teams-for-linux
+    zoom-us
+  ];
+}
--- a/machines/J0162/default.nix
+++ b/machines/J0162/default.nix
@ -1,11 +1,11 @@
 {pkgs, ...}: {
  imports = [
-    ./common.nix
-    ./hardware/audio.nix
-    ./hardware/bluetooth.nix
-    ./locales/en_GB.nix
-    ./desktop/plasma.nix
-    ./services/syncthing/J0162.nix
+    ../../common.nix
+    ../../hardware/audio.nix
+    ../../hardware/bluetooth.nix
+    ../../locales/en_GB.nix
+    ../../desktop/plasma.nix
+    ../../services/syncthing/J0162.nix
  ];

  networking.hostName = "J0162"; # Define your hostname.
@ -13,21 +13,18 @@
    defaultSession = "plasma";
    autoLogin.user = "elitherl";
  };
+  system.autoUpgrade = {
+    enable = false;
+    allowReboot = false;
+  };
  environment.etc."ppp/options".text = ''
    ipcp-accept-remote
  '';
-  services.jupyter.password = "'sha1:005773a53a70:a5c53a779fa0e1498ada0f8fdb48ad1fef1257ff'";
-
  users.users.elitherl = {
    isNormalUser = true;
    description = "Evie Litherland-Smith";
    extraGroups = ["networkmanager" "wheel"];
    shell = pkgs.fish;
  };
-  home-manager.users.elitherl = import ./home/J0162/elitherl.nix;
-
-  system.autoUpgrade = {
-    enable = false;
-    allowReboot = false;
-  };
+  home-manager.users.elitherl = import ./elitherl.nix;
 }
--- a/machines/J0162/elitherl.nix
+++ b/machines/J0162/elitherl.nix
@ -0,0 +1,13 @@
+{pkgs, ...}: {
+  imports = [../../home/work.nix ../../home/gui ../../home/desktop/picom.nix];
+  home.username = "elitherl";
+  home.homeDirectory = "/home/elitherl";
+  home.stateVersion = "22.11";
+  home.packages = with pkgs; [
+    zotero
+    openfortivpn
+    nomachine-client
+    teams-for-linux
+    zoom-us
+  ];
+}
--- a/machines/Legion/default.nix
+++ b/machines/Legion/default.nix
@ -1,25 +1,14 @@
 {pkgs, ...}: {
  imports = [
-    ./common.nix
-    ./locales/en_GB.nix
-    ./services/Legion.nix
+    ../../common.nix
+    ../../locales/en_GB.nix
+    ../../services/Legion.nix
  ];
-
  networking = {
    hostName = "Legion"; # Define your hostname.
-    nameservers = ["9.9.9.9"];
+    nameservers = ["192.168.1.230" "127.0.0.1" "9.9.9.9"];
    firewall = {enable = true;};
  };
-
-  users.users.xenia = {
-    isNormalUser = true;
-    description = "Evie Litherland-Smith";
-    extraGroups = ["networkmanager" "wheel"];
-    shell = pkgs.fish;
-    openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix;
-  };
-  home-manager.users.xenia = import ./home/Legion/xenia.nix;
-
  system.autoUpgrade = {
    enable = true;
    dates = "03:00";
@ -29,4 +18,12 @@
      upper = "05:00";
    };
  };
+  users.users.xenia = {
+    isNormalUser = true;
+    description = "Evie Litherland-Smith";
+    extraGroups = ["networkmanager" "wheel"];
+    shell = pkgs.fish;
+    openssh.authorizedKeys.keys = import ../../auth/authorized_keys.nix;
+  };
+  home-manager.users.xenia = import ./xenia.nix;
 }
--- a/machines/Legion/xenia.nix
+++ b/machines/Legion/xenia.nix
@ -1,10 +1,5 @@
 {...}: {
-  imports = [
-    ../env
-    ../tui
-    ../git/personal.nix
-    ../ssh/personal.nix
-  ];
+  imports = [../../home/personal.nix];
  home.username = "xenia";
  home.homeDirectory = "/home/xenia";
  home.stateVersion = "22.11";
--- a/machines/Monarch/tux.nix
+++ b/machines/Monarch/tux.nix
@ -1,10 +1,10 @@
 {pkgs, ...}: {
  imports = [
-    ../env
-    ../tui
-    ../gui/wezterm.nix
-    ../git/personal.nix
-    ../ssh/personal.nix
+    ../../env
+    ../../tui
+    ../../gui/wezterm.nix
+    ../../git/personal.nix
+    ../../ssh/personal.nix
  ];
  # Home Manager needs a bit of information about you and the
  # paths it should manage.
--- a/machines/Northstar/xenia.nix
+++ b/machines/Northstar/xenia.nix
@ -1,11 +1,11 @@
 {pkgs, ...}: {
  imports = [
-    ../env
-    ../tui
-    ../gui/chromium.nix
-    ../gui/foot.nix
-    ../ssh/personal.nix
-    ../git/personal.nix
+    ../../env
+    ../../tui
+    ../../gui/chromium.nix
+    ../../gui/foot.nix
+    ../../ssh/personal.nix
+    ../../git/personal.nix
  ];
  home.username = "xenia";
  home.homeDirectory = "/home/xenia";
--- a/machines/Vanguard/default.nix
+++ b/machines/Vanguard/default.nix
@ -0,0 +1,37 @@
+{pkgs, ...}: {
+  imports = [
+    ../../common.nix
+    ../../hardware/audio.nix
+    ../../hardware/bluetooth.nix
+    ../../locales/en_GB.nix
+  ];
+  networking = {
+    hostName = "Vanguard"; # Define your hostname.
+    nameservers = ["192.168.1.230" "9.9.9.9"];
+    firewall = {enable = true;};
+  };
+  services.xserver.displayManager.defaultSession = "gamescope";
+  environment.systemPackages = with pkgs; [mesa];
+
+  # Steam
+  programs.gamescope.enable = true;
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    gamescopeSession.enable = true;
+  };
+  hardware.steam-hardware.enable = true;
+  hardware.opengl.driSupport32Bit = true;
+
+  # Requirements for Star Citizen
+  boot.kernel.sysctl."vm.max_map_count" = 16777216;
+
+  users.users.xenia = {
+    isNormalUser = true;
+    description = "Evie Litherland-Smith";
+    extraGroups = ["networkmanager" "wheel"];
+    shell = pkgs.fish;
+    openssh.authorizedKeys.keys = import ../../auth/authorized_keys.nix;
+  };
+  home-manager.users.xenia = import ./xenia.nix;
+}
--- a/machines/Vanguard/xenia.nix
+++ b/machines/Vanguard/xenia.nix
@ -0,0 +1,6 @@
+{...}: {
+  imports = [../../home/personal.nix];
+  home.username = "xenia";
+  home.homeDirectory = "/home/xenia";
+  home.stateVersion = "22.11";
+}