Improve collections by grouping more than just gui together

Convert Vanguard config to match new style
This commit is contained in:
Evie Litherland-Smith 2023-04-25 14:43:08 +01:00
parent 6193f366de
commit 57ec2fc1b1
13 changed files with 74 additions and 96 deletions

View file

@ -6,7 +6,6 @@ in
imports = [
(import "${home-manager}/nixos")
./common.nix
./home/common.nix
./locales/en_GB.nix
./desktop/plasma.nix
];
@ -21,13 +20,7 @@ in
shell = pkgs.fish;
};
home-manager.users.elitherl = { ... }: {
imports = [
./home/desktop
./home/env
./home/git/work
./home/gui/collections/work
./home/tui
];
imports = [ ./home/collections/work ];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "elitherl";

View file

@ -1,7 +1,10 @@
{ pkgs, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
in
{
imports = [
(import "${home-manager}/nixos")
./common.nix
./locales/en_GB.nix
./desktop/plasma.nix
@ -16,4 +19,12 @@
extraGroups = [ "networkmanager" "wheel" ];
shell = pkgs.fish;
};
home-manager.users.elitherl = { ... }: {
imports = [ ./home/collections/work ];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "elitherl";
home.homeDirectory = "/home/elitherl";
home.stateVersion = "22.11";
};
}

View file

@ -1,7 +1,10 @@
{ pkgs, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
in
{
imports = [
(import "${home-manager}/nixos")
./common.nix
./locales/en_GB.nix
./desktop/plasma.nix
@ -16,6 +19,14 @@
extraGroups = [ "networkmanager" "wheel" ];
shell = pkgs.fish;
};
home-manager.users.xenia = { ... }: {
imports = [ ./home/collections/personal ];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "xenia";
home.homeDirectory = "/home/xenia";
home.stateVersion = "22.11";
};
# Extra hardware configuration
# For Steam support

View file

@ -1,5 +0,0 @@
{ ... }:
{
nix.settings.substituters = [ "https://hyprland.cachix.org" ];
nix.settings.trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
}

View file

@ -3,6 +3,10 @@
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# Home manager integration with NixOS
home-manager.useUserPackages = true;
home-manager.useGlobalPkgs = true;
# Enable networking
networking.networkmanager.enable = true;

View file

@ -1,4 +0,0 @@
{ ... }: {
imports = [ ./ukaea-elitherl.nix ];
home.stateVersion = "22.11";
}

View file

@ -1,20 +0,0 @@
{ ... }: {
imports = [
./desktop/gtk.nix
./desktop/wayland.nix
./env
./env/git/personal.nix
./tui
./gui/firefox.nix
./gui/cloud.nix
./gui/gaming.nix
./gui/kitty.nix
./gui/messaging.nix
./gui/nomachine.nix
];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "xenia";
home.homeDirectory = "/home/xenia";
home.stateVersion = "22.11";
}

View file

@ -0,0 +1,23 @@
{ ... }:
{
imports = [
../../desktop
../../env
../../git/personal
../../gui/browser/chromium-wayland.nix
../../gui/dev/neovide.nix
../../gui/documents/zotero.nix
../../gui/gaming/steam.nix
../../gui/messaging/discord.nix
../../gui/messaging/element.nix
../../gui/messaging/signal.nix
../../gui/security
../../gui/terminal/foot.nix
../../gui/terminal/wezterm.nix
../../tui
];
}

View file

@ -0,0 +1,22 @@
{ ... }:
{
imports = [
../../desktop
../../env
../../git/work
../../gui/browser/chromium-wayland.nix
../../gui/dev/neovide.nix
../../gui/documents/libreoffice.nix
../../gui/documents/zotero.nix
../../gui/messaging/signal.nix
../../gui/messaging/zoom.nix
../../gui/remote/nomachine.nix
../../gui/security
../../gui/terminal/wezterm.nix
../../tui
];
}

View file

@ -1,5 +0,0 @@
{ ... }:
{
home-manager.useUserPackages = true;
home-manager.useGlobalPkgs = true;
}

View file

@ -1,15 +0,0 @@
{ ... }:
{
imports = [
../../browser/chromium-wayland.nix
../../dev/neovide.nix
../../documents/zotero.nix
../../gaming/steam.nix
../../messaging/discord.nix
../../messaging/element.nix
../../messaging/signal.nix
../../security
../../terminal/foot.nix
../../terminal/wezterm.nix
];
}

View file

@ -1,14 +0,0 @@
{ ... }:
{
imports = [
../../browser/chromium-wayland.nix
../../dev/neovide.nix
../../documents/libreoffice.nix
../../documents/zotero.nix
../../messaging/signal.nix
../../messaging/zoom.nix
../../remote/nomachine.nix
../../security
../../terminal/wezterm.nix
];
}

View file

@ -1,23 +0,0 @@
{ ... }: {
imports = [
./desktop/gtk.nix
./desktop/wayland.nix
./env
./env/git/work.nix
./tui
./gui/chromium-wayland.nix
./gui/neovide.nix
./gui/libreoffice.nix
./gui/cloud.nix
./gui/wezterm.nix
./gui/messaging.nix
./gui/nomachine.nix
./gui/pass.nix
./gui/zoom.nix
];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "elitherl";
home.homeDirectory = "/home/elitherl";
}