Separate mae into two users
This commit is contained in:
parent
332881e306
commit
06f22fd874
8 changed files with 49 additions and 28 deletions
|
@ -2,9 +2,9 @@
|
|||
{
|
||||
system = with profiles; rec {
|
||||
base = [ users.mae users.root ];
|
||||
workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents ];
|
||||
desktop = workstation ++ [ amd school three_dee ];
|
||||
lap = workstation ++ [ laptop bluetooth print networkmanager ];
|
||||
workstation = [ users.root sway develop game profiles.workstation ssh flatpak torrents ];
|
||||
desktop = workstation ++ [ users.mae-desk amd school three_dee ];
|
||||
lap = workstation ++ [ users.mae-lap laptop bluetooth print networkmanager ];
|
||||
};
|
||||
user = with userProfiles; rec {
|
||||
base = [ direnv git ];
|
||||
|
|
7
users/mae-desk/default.nix
Normal file
7
users/mae-desk/default.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home-manager.users.mae = {
|
||||
imports = [ ../mae/home-manager-base.nix ../profiles/sway/desktop.nix ];
|
||||
};
|
||||
users = (import ../mae/user.nix { inherit pkgs; });
|
||||
}
|
7
users/mae-lap/default.nix
Normal file
7
users/mae-lap/default.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home-manager.users.mae = {
|
||||
imports = [ ../mae/home-manager-base.nix ../profiles/sway/laptop.nix ];
|
||||
};
|
||||
users = (import ../mae/user.nix { inherit pkgs; });
|
||||
}
|
|
@ -1,23 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home-manager.users.mae = {
|
||||
imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/sway ];
|
||||
home.packages = with pkgs; [
|
||||
arc-theme
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
|
||||
NIX_BUILD_SHELL = "zsh";
|
||||
};
|
||||
gtk.theme.name = "arc-dark";
|
||||
};
|
||||
users.users.mae = {
|
||||
uid = 1000;
|
||||
|
||||
isNormalUser = true;
|
||||
hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" ];
|
||||
};
|
||||
}
|
13
users/mae/home-manager-base.nix
Normal file
13
users/mae/home-manager-base.nix
Normal file
|
@ -0,0 +1,13 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ];
|
||||
home.packages = with pkgs; [
|
||||
arc-theme
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
|
||||
NIX_BUILD_SHELL = "zsh";
|
||||
};
|
||||
gtk.theme.name = "arc-dark";
|
||||
}
|
11
users/mae/user.nix
Normal file
11
users/mae/user.nix
Normal file
|
@ -0,0 +1,11 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
users.mae = {
|
||||
uid = 1000;
|
||||
|
||||
isNormalUser = true;
|
||||
hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" ];
|
||||
};
|
||||
}
|
|
@ -27,7 +27,6 @@
|
|||
enable = true;
|
||||
bars.bar_0 = {
|
||||
blocks = [
|
||||
#{ block = "backlight"; }
|
||||
{ block = "hueshift"; }
|
||||
{
|
||||
block = "disk_space";
|
||||
|
@ -50,7 +49,6 @@
|
|||
interval = 1;
|
||||
}
|
||||
{ block = "sound"; }
|
||||
#{ block = "battery"; }
|
||||
{
|
||||
block = "time";
|
||||
interval = 60;
|
8
users/profiles/sway/laptop.nix
Normal file
8
users/profiles/sway/laptop.nix
Normal file
|
@ -0,0 +1,8 @@
|
|||
{ pkgs, lib, ... }:
|
||||
let
|
||||
desk = (import ./desktop.nix { inherit pkgs; });
|
||||
desk_blocks = desk.programs.i3status-rust.bars.bar_0.blocks;
|
||||
lap_blocks = [{ block = "backlight"; } { block = "battery"; }] ++ desk_blocks;
|
||||
lap = lib.recursiveUpdate desk { programs.i3status-rust.bars.bar_0.blocks = lap_blocks; };
|
||||
in
|
||||
lap
|
Loading…
Reference in a new issue