Fixed plasma6; added kodi; added wluma; commented out printing; moved fingerprint shit
This commit is contained in:
parent
7ff74bc31c
commit
b524030089
6 changed files with 83 additions and 41 deletions
|
|
@ -5,6 +5,7 @@
|
||||||
./mpv.nix
|
./mpv.nix
|
||||||
./neovim.nix
|
./neovim.nix
|
||||||
./nixcord.nix
|
./nixcord.nix
|
||||||
|
./kodi.nix
|
||||||
./other.nix
|
./other.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
5
home/programs/kodi.nix
Normal file
5
home/programs/kodi.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
{pkgs, ...}: {
|
||||||
|
home.packages = [
|
||||||
|
(pkgs.kodi-wayland.withPackages (exts: [exts.inputstream-adaptive exts.inputstreamhelper]))
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
@ -1,17 +1,26 @@
|
||||||
{
|
{
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
uwsm = lib.getExe pkgs.uwsm;
|
|
||||||
foot = lib.getExe pkgs.foot;
|
|
||||||
in {
|
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./virt.nix
|
./virt.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# services.printing = {
|
||||||
|
# enable = true;
|
||||||
|
# startWhenNeeded = true;
|
||||||
|
# };
|
||||||
|
# hardware.printers = {
|
||||||
|
# ensureDefaultPrinter = "Broeder";
|
||||||
|
# ensurePrinters = [
|
||||||
|
# {
|
||||||
|
# deviceUri = "ipp://192.168.1.33/ipp";
|
||||||
|
# location = "home";
|
||||||
|
# name = "Broeder";
|
||||||
|
# model = "everywhere";
|
||||||
|
# }
|
||||||
|
# ];
|
||||||
|
# };
|
||||||
|
|
||||||
|
programs.evolution.enable = true; # FIXME: move to appropiate place.
|
||||||
niksos = {
|
niksos = {
|
||||||
fingerprint = true;
|
fingerprint = true;
|
||||||
bluetooth = true;
|
bluetooth = true;
|
||||||
|
|
@ -22,24 +31,51 @@ in {
|
||||||
desktop = {
|
desktop = {
|
||||||
enable = true;
|
enable = true;
|
||||||
hyprland = true;
|
hyprland = true;
|
||||||
kde = false;
|
kde = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
home-manager.users.jsw.wayland.windowManager.hyprland.settings.monitor = ["eDP-1,2880x1920@120,0x0,1.5,vrr,1"];
|
home-manager.users.jsw = {
|
||||||
|
wayland.windowManager.hyprland.settings.monitor = ["eDP-1,2880x1920@120,0x0,1.5,vrr,1"];
|
||||||
|
services.wluma = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
als.iio = {
|
||||||
|
path = "/sys/bus/iio/devices";
|
||||||
|
thresholds = {
|
||||||
|
"0" = "night";
|
||||||
|
"10" = "dark";
|
||||||
|
"100" = "normal";
|
||||||
|
"20" = "dim";
|
||||||
|
"200" = "bright";
|
||||||
|
"500" = "outdoors";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
output.backlight = [
|
||||||
|
{
|
||||||
|
capturer = "none";
|
||||||
|
name = "eDP-1";
|
||||||
|
path = "/sys/class/backlight/amdgpu_bl1";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
capturer = "none";
|
||||||
|
name = "keyboard";
|
||||||
|
path = "/sys/bus/platform/devices/cros-keyboard-leds.5.auto/leds/chromeos::kbd_backlight";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
hardware.sensor.iio.enable = true; # brightness sensor
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
usbmuxd.enable = true;
|
usbmuxd.enable = true;
|
||||||
joycond.enable = true;
|
joycond.enable = true;
|
||||||
|
|
||||||
udev.extraRules = ''
|
udev.extraRules = ''
|
||||||
# Ethernet expansion card support
|
# Ethernet expansion card support
|
||||||
ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
|
ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
|
||||||
'';
|
'';
|
||||||
logind.extraConfig = ''
|
|
||||||
# don’t shutdown when power button is short-pressed
|
|
||||||
HandlePowerKey=ignore
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
hardware.sensor.iio.enable = true; # brightness sensor
|
|
||||||
|
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
# There seems to be an issue with panel self-refresh (PSR) that
|
# There seems to be an issue with panel self-refresh (PSR) that
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,12 @@
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: {
|
||||||
cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland;
|
config = lib.mkIf config.niksos.desktop.enable {
|
||||||
in {
|
|
||||||
config = lib.mkIf cfg {
|
|
||||||
# greetd display manager
|
# greetd display manager
|
||||||
services.greetd = let
|
services.greetd = let
|
||||||
session = {
|
session = {
|
||||||
command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
|
command = lib.mkDefault "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
|
||||||
user = "jsw";
|
user = "jsw";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
|
@ -22,6 +20,6 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.uwsm.enable = true;
|
programs.uwsm.enable = lib.mkDefault true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,28 +6,24 @@
|
||||||
}: let
|
}: let
|
||||||
cfg = config.niksos.desktop.enable && config.niksos.desktop.kde;
|
cfg = config.niksos.desktop.enable && config.niksos.desktop.kde;
|
||||||
in {
|
in {
|
||||||
config = lib.mkIf cfg {
|
specialisation.de.configuration = lib.mkIf cfg {
|
||||||
niksos.desktop.hyprland = lib.mkForce false;
|
niksos.desktop.hyprland = lib.mkForce false;
|
||||||
specialisation.de.configuration = {
|
services = {
|
||||||
services = {
|
greetd = let
|
||||||
greetd = let
|
session.command = "${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland";
|
||||||
session = {
|
in {
|
||||||
command = "${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland";
|
enable = true;
|
||||||
user = "jsw";
|
settings = {
|
||||||
};
|
terminal.vt = 1;
|
||||||
in {
|
default_session = session;
|
||||||
enable = true;
|
initial_session = session;
|
||||||
settings = {
|
|
||||||
terminal.vt = 1;
|
|
||||||
default_session = session;
|
|
||||||
initial_session = session;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
desktopManager.plasma6.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.jsw.stylix.autoEnable = false;
|
desktopManager.plasma6.enable = true;
|
||||||
};
|
};
|
||||||
|
programs.uwsm.enable = false;
|
||||||
|
|
||||||
|
home-manager.users.jsw.stylix.autoEnable = false;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,16 @@
|
||||||
in {
|
in {
|
||||||
options.niksos.fingerprint = mkEnableOption "fingerprint support.";
|
options.niksos.fingerprint = mkEnableOption "fingerprint support.";
|
||||||
config = mkIf fingerprint {
|
config = mkIf fingerprint {
|
||||||
services.fprintd.enable = true;
|
services = {
|
||||||
|
fprintd.enable = true;
|
||||||
|
logind.extraConfig = mkIf desktop.hyprland ''
|
||||||
|
# don’t shutdown when power button is short-pressed
|
||||||
|
HandlePowerKey=ignore
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
home-manager.users.jsw.wayland.windowManager.hyprland.settings = mkIf desktop.hyprland {
|
home-manager.users.jsw.wayland.windowManager.hyprland.settings = mkIf desktop.hyprland {
|
||||||
bind = mkIf fingerprint [
|
bind = [
|
||||||
", XF86PowerOff, exec, ${uwsm} app -- pgrep fprintd-verify && exit 0 || ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'"
|
", XF86PowerOff, exec, ${uwsm} app -- pgrep fprintd-verify && exit 0 || ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'"
|
||||||
];
|
];
|
||||||
windowrule = [
|
windowrule = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue