diff --git a/modules/features/desktop/default.nix b/modules/features/desktop/default.nix index f6f9870..6a409ba 100644 --- a/modules/features/desktop/default.nix +++ b/modules/features/desktop/default.nix @@ -41,18 +41,18 @@ }; kernelParams = [ # grub kernel parameters, set to prevent excessive output on boot - #"vga=current" # use current video adapater - #"splash" # unsure ? + "vga=current" # use current video adapater + "splash" # unsure ? "quiet" # quiet log level "loglevel=3" # minimal output on boot - #"udev.log_priority=3" # more minimising of output on boot - #"rd.systemd.show_status=false" # unsure ? - #"rd.udev.log_level=0" # more minimising of output on boot - #"boot.shell_on_fail" # reboots to basic uefi shell on boot failure - #"i915.fastboot=1" # unsure ? - #"plymouth.debug" # I NEED ANSWERS - #"plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother - #"plymouth.ignore-serial-consoles" # unsure ? + "udev.log_priority=3" # more minimising of output on boot + "rd.systemd.show_status=false" # unsure ? + "rd.udev.log_level=0" # more minimising of output on boot + "boot.shell_on_fail" # reboots to basic uefi shell on boot failure + "i915.fastboot=1" # unsure ? + "plymouth.debug" # I NEED ANSWERS + "plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother + "plymouth.ignore-serial-consoles" # unsure ? ]; loader = { timeout = 5; # 5 second timeout to default selection @@ -74,6 +74,49 @@ enable = true; }; + # polkit + security.polkit = { + enable = true; + }; + + # password prompts + services.gnome-keyring.enable = true; + + # disk management + programs.gnome-disks.enable = true; + + environment.systemPackages = with pkgs; [ + + # disk management pkgs + gparted + udiskie + + ]; + + home-manager.users.serenity = { + + # disk automount + services.udiskie = { + enable = true; + tray = "always"; + notify = true; + automount = true; + }; + + home.packages = with pkgs; [ + + # more desktop applications + gnome-calculator # simple calculator + gnome-secrets # password manager + file-roller # archive manager + obisidian # note taking + nautilus # file manager + swayimg # image viewer + zathura # pdf viewer + + ]; + + }; }; } diff --git a/modules/features/desktop/niri.nix b/modules/features/desktop/niri.nix index 4ad922c..875a404 100644 --- a/modules/features/desktop/niri.nix +++ b/modules/features/desktop/niri.nix @@ -18,26 +18,12 @@ # packages for desktop environment environment.systemPackages = with pkgs; [ - # other desktop app - gparted - udiskie - # niri xwayland-satellite # xwayland support jq # for parsing json ]; - # polkit is for gui apps run with permissions i think - security.polkit = { - enable = true; - }; - - # disk utility - programs.gnome-disks = { - enable = true; - }; - # enables niri globally programs.niri = { enable = true; @@ -55,28 +41,7 @@ # for niri home manager module imports = [ inputs.niri.homeModules.niri ]; - # disk automount service - services.udiskie = { - enable = true; - tray = "always"; - notify = true; - automount = true; - }; - - home.packages = with pkgs; [ - - # personal - gnome-secrets # gtk password manager - obsidian # note taking - - # desktop apps - gnome-calculator # simple calculator - file-roller # simple archive manager - nautilus # simple file manager - swayimg # terminal based image viewer - zathura # simple pdf viewer - - ]; + home.packages = with pkgs; [ ]; programs.niri = { # enables niri within home manager