push up existing set of fixes and wm change

This commit is contained in:
notgne2 2025-11-12 12:11:26 -07:00
parent 9a77331d21
commit 943fceee2d
No known key found for this signature in database
7 changed files with 180 additions and 155 deletions

View file

@ -1,4 +1,4 @@
{
inputs: {
config,
lib,
pkgs,
@ -7,21 +7,30 @@
with lib; let
cfg = config.ezpc;
in {
imports = [inputs.niri.nixosModules.niri];
options.ezpc.enable = mkEnableOption "Enable ezpc system stuff";
config = mkIf cfg.enable {
programs.hyprland.enable = true;
xdg.portal = {
programs.niri = {
enable = true;
xdgOpenUsePortal = true;
extraPortals = [ pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-gtk ];
config = {
common.default = ["gtk"];
hyprland.default = ["gtk" "hyprland"];
};
package = pkgs.niri-unstable;
};
niri-flake.cache.enable = false;
services.gnome.gnome-keyring.enable = lib.mkForce false;
# xdg.portal = {
# config.niri = {
# default = [ "gnome" "gtk" ];
# # "org.freedesktop.impl.portal.Access" = "gtk";
# # "org.freedesktop.impl.portal.Notification" = "gtk";
# # "org.freedesktop.impl.portal.Secret" = "gnome-keyring";
# # "org.freedesktop.impl.portal.FileChooser" = "gtk";
# };
# extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
# };
environment.sessionVariables = {
QT_QPA_PLATFORM = "wayland;xcb";
MOZ_ENABLE_WAYLAND = "1";
@ -39,7 +48,7 @@ in {
enable = lib.mkDefault true;
settings = {
default_session = {
command = lib.mkDefault "${pkgs.tuigreet}/bin/tuigreet --time --user-menu --user-menu-max-uid 30000 --cmd hyprland";
command = lib.mkDefault "${pkgs.tuigreet}/bin/tuigreet --time --user-menu --user-menu-max-uid 30000 --cmd niri-session";
};
};
};

View file

@ -55,7 +55,7 @@ in {
cups-dymo
# cups-kyocera # mirror is down
cups-kyocera-ecosys-m552x-p502x
# cups-kyocera-ecosys-m552x-p502x # mirror is down
# cups-kyodialog3 # Mirror is down
cups-toshiba-estudio
@ -95,7 +95,7 @@ in {
dsseries.enable = true;
drivers.scanSnap.enable = true;
extraBackends = with pkgs; [
epkowa
# epkowa # borked
hplipWithPlugin
];
};

View file

@ -159,7 +159,6 @@ in {
"libvirtd" # run VMs through libvirt
"kvm" # run KVM VMs
"lxd" # use LXD containers
"sway" # run sway.. I guess?
"wheel" # sudo
"networkmanager" # use networkmanager?
"docker" # docker permission (basically the same as `wheel`)