diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index a0d088b..3634490 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -3,5 +3,6 @@ imports = [ ./hardware ./core.nix + ./user.nix ]; } diff --git a/modules/nixos/common/user.nix b/modules/nixos/common/user.nix new file mode 100644 index 0000000..673bec2 --- /dev/null +++ b/modules/nixos/common/user.nix @@ -0,0 +1,15 @@ +{ config, pkgs, ... }: +{ + users.users.root = { + shell = pkgs.zsh; + }; + users.users.${config.skyg.user.name} = { + shell = pkgs.zsh; + isNormalUser = true; + description = config.skyg.user.name; + extraGroups = [ + "networkmanager" + "wheel" + ]; + }; +} diff --git a/modules/nixos/desktop/common.nix b/modules/nixos/desktop/common.nix deleted file mode 100644 index 6cda5cd..0000000 --- a/modules/nixos/desktop/common.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, pkgs, ... }: - -with lib; - -{ - options = { - skyg.desktop = { - fonts = mkOption { - description = "Preferred Font"; - type = types.package; - default = pkgs.fira-code; - }; - }; - }; - - config = { }; -} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 438bc67..41805b8 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./common.nix ./kde.nix ./hyprland.nix ./wayland.nix diff --git a/modules/os/user.nix b/modules/os/user.nix deleted file mode 100644 index 79a41d0..0000000 --- a/modules/os/user.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ user }: -{ pkgs, ... }: -{ - users.users.${user.name} = { - shell = pkgs.zsh; - isNormalUser = true; - description = user.name; - extraGroups = [ - "networkmanager" - "wheel" - ]; - }; -}