diff --git a/modules/core/default.nix b/modules/core/default.nix index b79a2dc..773b775 100755 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -4,7 +4,7 @@ imports = [ ./services.nix ./display.nix - # ./home.nix + ./user.nix ./packages ]; diff --git a/modules/core/display.nix b/modules/core/display.nix deleted file mode 100644 index 6683344..0000000 --- a/modules/core/display.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ inputs, pkgs, username, ... }: - -{ - - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; - - xdg.portal = { - enable = true; - wlr.enable = true; - xdgOpenUsePortal = true; - extraPortals = [ - pkgs.xdg-desktop-portal-hyprland - pkgs.xdg-desktop-portal-gtk - ]; - }; - - services.xserver = { - enable = true; - layout = "us"; # what is the difference # - xkbVariant = ""; # between - xkb.layout = "us"; # these 2 lolwut # - displayManager.autoLogin = { - enable = true; - user = "serenity"; - }; - libinput = { - enable = true; - mouse = { - accelProfile = "flat"; - }; - }; - }; - - # apparently prevents getting stuck at shutdown - systemd.extraConfig = "DefaultTimeoutStopSec=10s"; - - # set up hardware video acceleration - # https://nixos.wiki/wiki/Accelerated_Video_Playback - - system.stateVersion = "23.11"; - -} diff --git a/modules/core/home.nix b/modules/core/home.nix deleted file mode 100755 index 24b3143..0000000 --- a/modules/core/home.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ pkgs, inputs, outputs, config, osConfig, ... }: - -{ - - imports = [ - ]; - - - users = { - - defaultUserShell = pkgs.fish; - - users.serenity = { - description = "Serenity"; - isNormalUser = true; - shell = pkgs.fish; - extraGroups = [ - "networkmanager" - "wheel" - ]; - }; - - }; - - home-manager = { - users.serenity = { - home = { - username = "serenity"; - homeDirectory = "/home/serenity/"; - stateVersion = "23.11"; - }; - - programs = { - home-manager.enable = true; - direnv = { - enable = false; - nix-direnv.enable = false; - config.load_dotenv = false; - }; - }; - - }; - - }; - - - system.stateVersion = "23.11"; - -} - - # Copy some files to where they go - # home.file.scripts = { - # source = ./scripts; - # target = ".local/bin/scripts"; - # }; - # Installing muir packages uvu - # home.packages = with pkgs; [ - # - Multimedia - # spotify - # nicotine-plus - # jellyfin-media-player - # gimp - # krita - # inkscape - # obs - # ardour - # - Web & Chat - # fractal - # schildichat-desktop - # - Coding - # vscodium - # gitui - # ]; diff --git a/modules/core/services.nix b/modules/core/services.nix index dc9fad5..abdfec8 100644 --- a/modules/core/services.nix +++ b/modules/core/services.nix @@ -10,9 +10,6 @@ gvfs.enable = true; dbus.enable = true; - # gnome-keyring.enable = true; - - openssh.enable = false; avahi = { enable = false; diff --git a/modules/core/user.nix b/modules/core/user.nix new file mode 100644 index 0000000..c3b5562 --- /dev/null +++ b/modules/core/user.nix @@ -0,0 +1,25 @@ +{ pkgs, config, ... }: + +{ + + imports = [ + ]; + + users = { + defaultUserShell = pkgs.fish; + + users.serenity = { + description = "Serenity Amalgam"; + isNormalUser = true; + shell = pkgs.fish; + extraGroups = [ + "wheel" + "networkmanager" + ]; + }; + + }; + + system.stateVersion = "23.11"; + +}