From 52ff1c36a35115939d00c33c0ecd4674d317a13b Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Wed, 31 May 2023 10:54:57 +0100 Subject: [PATCH] Delete root user config per machine as it's common to all Move root user home-config into home/default.nix so that it's used by all Removed personal/work specific things from root user --- H0615.nix | 2 -- J0162.nix | 6 ++--- Vanguard.nix | 2 -- home/H0615/root.nix | 11 --------- home/J0162/elitherl.nix | 37 +++++++++++++++++++++++++--- home/J0162/root.nix | 11 --------- home/Vanguard/root.nix | 11 --------- home/default.nix | 12 ++++++++- home/git/{common.nix => default.nix} | 0 home/git/personal.nix | 2 +- home/git/work.nix | 2 +- home/ssh/{common.nix => default.nix} | 0 home/ssh/personal.nix | 2 +- home/ssh/work.nix | 2 +- 14 files changed, 51 insertions(+), 49 deletions(-) delete mode 100644 home/H0615/root.nix delete mode 100644 home/J0162/root.nix delete mode 100644 home/Vanguard/root.nix rename home/git/{common.nix => default.nix} (100%) rename home/ssh/{common.nix => default.nix} (100%) diff --git a/H0615.nix b/H0615.nix index b7127528..5caf5bf8 100644 --- a/H0615.nix +++ b/H0615.nix @@ -10,14 +10,12 @@ networking.hostName = "H0615"; # Define your hostname. - users.users.root.shell = pkgs.zsh; users.users.elitherl = { isNormalUser = true; description = "Evie Litherland-Smith"; extraGroups = ["networkmanager" "wheel"]; shell = pkgs.fish; }; - home-manager.users.root = import ./home/H0615/root.nix; home-manager.users.elitherl = import ./home/H0615/elitherl.nix; system.autoUpgrade = { diff --git a/J0162.nix b/J0162.nix index aad7b0c0..b3801564 100644 --- a/J0162.nix +++ b/J0162.nix @@ -2,22 +2,20 @@ imports = [ ./home ./common.nix - ./locales/en_GB.nix - ./desktop/plasma.nix ./hardware/audio.nix ./hardware/bluetooth.nix + ./locales/en_GB.nix + ./desktop/hyprland.nix ]; networking.hostName = "J0162"; # Define your hostname. - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.elitherl = { isNormalUser = true; description = "Evie Litherland-Smith"; extraGroups = ["networkmanager" "wheel"]; shell = pkgs.fish; }; - home-manager.users.root = import ./home/J0162/root.nix; home-manager.users.elitherl = import ./home/J0162/elitherl.nix; system.autoUpgrade = { diff --git a/Vanguard.nix b/Vanguard.nix index 6cc77352..0454f602 100644 --- a/Vanguard.nix +++ b/Vanguard.nix @@ -15,7 +15,6 @@ firewall = {enable = true;}; }; - users.users.root.shell = pkgs.zsh; users.users.xenia = { isNormalUser = true; description = "Evie Litherland-Smith"; @@ -28,7 +27,6 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDI44C35I2x9tqzeZDmIpbzmGJWXfATn/Wp5KzVRdlCi root@debian" ]; }; - home-manager.users.root = import ./home/Vanguard/root.nix; home-manager.users.xenia = import ./home/Vanguard/xenia.nix; # Enable steam with proper integrations diff --git a/home/H0615/root.nix b/home/H0615/root.nix deleted file mode 100644 index ec922de8..00000000 --- a/home/H0615/root.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: { - imports = [ - ../env - ../tui - ../git/work.nix - ../ssh/work.nix - ]; - home.username = "root"; - home.homeDirectory = "/root"; - home.stateVersion = "22.11"; -} diff --git a/home/J0162/elitherl.nix b/home/J0162/elitherl.nix index e7bcefd2..f35ba4e8 100644 --- a/home/J0162/elitherl.nix +++ b/home/J0162/elitherl.nix @@ -1,8 +1,39 @@ {...}: { - imports = [../work.nix]; - # Home Manager needs a bit of information about you and the - # paths it should manage. + imports = [../work.nix ../desktop/hyprland.nix]; home.username = "elitherl"; home.homeDirectory = "/home/elitherl"; home.stateVersion = "22.11"; + + programs.fish.shellAbbrs.hypr = "exec Hyprland"; + xdg.configFile."hypr/hyprpaper.conf".text = '' + preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png + wallpaper = ,/etc/nixos/config/wallpaper/images_dark/1920x1080.png + ''; + wayland.windowManager.hyprland.extraConfig = '' + source=./common.conf + ''; + programs.waybar = { + settings = { + main = { + "include" = [ + "~/.config/waybar/modules.json" + "~/.config/waybar/layout.json" + ]; + "modules-left" = ["wlr/workspaces"]; + "modules-center" = ["clock"]; + "modules-right" = [ + "cpu" + "memory" + "temperature" + "pulseaudio" + "network" + "bluetooth" + "backlight" + "battery" + "battery#bat2" + "tray" + ]; + }; + }; + }; } diff --git a/home/J0162/root.nix b/home/J0162/root.nix deleted file mode 100644 index ec922de8..00000000 --- a/home/J0162/root.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: { - imports = [ - ../env - ../tui - ../git/work.nix - ../ssh/work.nix - ]; - home.username = "root"; - home.homeDirectory = "/root"; - home.stateVersion = "22.11"; -} diff --git a/home/Vanguard/root.nix b/home/Vanguard/root.nix deleted file mode 100644 index f3641116..00000000 --- a/home/Vanguard/root.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: { - imports = [ - ../env - ../tui - ../git/personal.nix - ../ssh/personal.nix - ]; - home.username = "root"; - home.homeDirectory = "/root"; - home.stateVersion = "22.11"; -} diff --git a/home/default.nix b/home/default.nix index 627880cb..84c46ab5 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1 +1,11 @@ -{...}: let home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"; in {imports = [(import "${home-manager}/nixos")];} +{...}: let + home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"; +in { + imports = [(import "${home-manager}/nixos")]; + home-manager.users.root = { + imports = [./env ./ssh ./git]; + home.username = "root"; + home.homeDirectory = "/root"; + home.stateVersion = "22.11"; + }; +} diff --git a/home/git/common.nix b/home/git/default.nix similarity index 100% rename from home/git/common.nix rename to home/git/default.nix diff --git a/home/git/personal.nix b/home/git/personal.nix index f09b769b..08ebf7fd 100644 --- a/home/git/personal.nix +++ b/home/git/personal.nix @@ -1,4 +1,4 @@ {...}: { - imports = [./common.nix]; + imports = [./default.nix]; programs.git.userEmail = "evie@xenia.me.uk"; } diff --git a/home/git/work.nix b/home/git/work.nix index 2e6803a4..94a69e01 100644 --- a/home/git/work.nix +++ b/home/git/work.nix @@ -1,4 +1,4 @@ {...}: { - imports = [./common.nix]; + imports = [./default.nix]; programs.git.userEmail = "evie.litherland-smith@ukaea.uk"; } diff --git a/home/ssh/common.nix b/home/ssh/default.nix similarity index 100% rename from home/ssh/common.nix rename to home/ssh/default.nix diff --git a/home/ssh/personal.nix b/home/ssh/personal.nix index e7d72331..af410d9d 100644 --- a/home/ssh/personal.nix +++ b/home/ssh/personal.nix @@ -1,5 +1,5 @@ {lib, ...}: { - imports = [./common.nix]; + imports = [./default.nix]; programs.ssh.matchBlocks = { "vanguard" = { user = "xenia"; diff --git a/home/ssh/work.nix b/home/ssh/work.nix index 3016d877..8c2d6cd6 100644 --- a/home/ssh/work.nix +++ b/home/ssh/work.nix @@ -3,7 +3,7 @@ lib, ... }: { - imports = [./common.nix]; + imports = [./default.nix]; home.packages = with pkgs; [sshfs]; programs.ssh.matchBlocks = { "git.ccfe.ac.uk" = {user = "git";};