From d8e2f19ced92edcc2491d16bccca77749021c9f4 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 1 Aug 2024 07:44:41 +0200 Subject: [PATCH 1/5] shell: fix and clean up plugin loading --- modules/shell/nu.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/shell/nu.nix b/modules/shell/nu.nix index 88cf0d6..dbf1df8 100644 --- a/modules/shell/nu.nix +++ b/modules/shell/nu.nix @@ -11,11 +11,6 @@ }; home.packages = [ pkgs.pueue - pkgs.nushellPlugins.net - pkgs.nushellPlugins.query - pkgs.nushellPlugins.gstat - pkgs.nushellPlugins.polars - pkgs.nushellPlugins.formats ]; programs.nushell = { enable = true; @@ -23,9 +18,13 @@ configFile.source = ../../other/config.nu; envFile.source = ../../other/env.nu; extraConfig = '' - plugin use ${pkgs.nushellPlugins.query}/bin/nu_plugin_query; - plugin use ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars; - plugin use ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats; + plugin add ${pkgs.nushellPlugins.query}/bin/nu_plugin_query; + plugin add ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars; + plugin add ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats; + + plugin use query; + plugin use polars; + plugin use formats; ''; }; programs.starship.enableNushellIntegration = true; From 2b13d1c0bb3a6fedbc28325f8339b9a984666114 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 1 Aug 2024 08:07:17 +0200 Subject: [PATCH 2/5] fix displayManager warnings and clean up displayManager configs --- hosts/catbook-j/configuration.nix | 8 +++--- modules/desktop-environment/default.nix | 1 + modules/desktop-environment/dm.nix | 36 +++++++++++++++++++++++++ modules/desktop/x.nix | 11 -------- 4 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 modules/desktop-environment/dm.nix diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index 248d870..5d36a7a 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -20,6 +20,10 @@ ]; jade = { desktop = { + dm.autoLogin = { + enable = true; + delay = 5; + }; syncthing.enable = true; kdeconnect.enable = true; cloud.enable = true; @@ -81,10 +85,6 @@ }; boot.kernelPackages = pkgs.linuxPackages_zen; - services.displayManager.autoLogin = { - enable = true; - user = "jade"; - }; # networking networking.networkmanager.enable = true; diff --git a/modules/desktop-environment/default.nix b/modules/desktop-environment/default.nix index 59206a0..4a5b04f 100644 --- a/modules/desktop-environment/default.nix +++ b/modules/desktop-environment/default.nix @@ -3,6 +3,7 @@ ./audio.nix ./flatpak.nix ./home + ./dm.nix ]; services.upower = { enable = true; diff --git a/modules/desktop-environment/dm.nix b/modules/desktop-environment/dm.nix new file mode 100644 index 0000000..ebdb023 --- /dev/null +++ b/modules/desktop-environment/dm.nix @@ -0,0 +1,36 @@ +{ + pkgs, + config, + lib, + ... +}: let + cfg = config.jade.desktop.dm; +in + with lib; { + options.jade.desktop.dm.autoLogin = { + enable = mkEnableOption "Enable Autologin"; + delay = mkOption { + type = types.int; + default = 0; + }; + }; + config.services = { + displayManager = { + autoLogin = { + enable = cfg.autoLogin.enable; + user = "jade"; + }; + defaultSession = "sway"; + sessionPackages = [ + pkgs.sway + ]; + }; + xserver.displayManager.gdm = { + enable = true; + banner = "Meow :3"; + autoLogin = { + delay = cfg.autoLogin.delay; + }; + }; + }; + } diff --git a/modules/desktop/x.nix b/modules/desktop/x.nix index 00178fb..b8527c6 100644 --- a/modules/desktop/x.nix +++ b/modules/desktop/x.nix @@ -6,14 +6,6 @@ xterm.enable = false; }; - displayManager = { - gdm.enable = true; - sessionPackages = [ - pkgs.sway - ]; - gdm.autoLogin.delay = 5; - }; - windowManager.xmonad = { enable = true; }; @@ -21,7 +13,4 @@ security.polkit.enable = true; programs.sway.enable = true; - - # services.displayManager.defaultSession = "none+xmonad"; - services.displayManager.defaultSession = "sway"; } From b63db1934da08903a2d8b224e18431ddfc6c7c1e Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 1 Aug 2024 08:17:09 +0200 Subject: [PATCH 3/5] rework and fix some hardware key stuff --- hosts/catbook-j/configuration.nix | 1 + modules/hardware/hardware_key.nix | 51 ++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index 5d36a7a..342c186 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -19,6 +19,7 @@ ./modules ]; jade = { + hwKey.pamAuth.enable = true; desktop = { dm.autoLogin = { enable = true; diff --git a/modules/hardware/hardware_key.nix b/modules/hardware/hardware_key.nix index 8510d86..1f75106 100644 --- a/modules/hardware/hardware_key.nix +++ b/modules/hardware/hardware_key.nix @@ -1,20 +1,35 @@ -{pkgs, ...}: { - # nitrokey - services.udev.packages = [pkgs.nitrokey-udev-rules]; - - # smartcard daemon - services.pcscd.enable = true; - - # authenticate using hw key - security.pam = { - services.jade.u2fAuth = true; - u2f = { - enable = true; - cue = true; - control = "sufficient"; - authFile = "/home/jade/.ssh/u2f_keys"; +{ + pkgs, + config, + lib, + ... +}: let + cfg = config.jade.hwKey; +in + with lib; { + options.jade.hwKey = { + pamAuth.enable = mkEnableOption "Enable PAM authentication with hardware keys"; }; - }; + config = { + # nitrokey + services.udev.packages = [pkgs.nitrokey-udev-rules]; - programs.i3lock.u2fSupport = true; -} + # smartcard daemon + services.pcscd.enable = true; + + # authenticate using hw key + security.pam = { + services.jade.u2fAuth = cfg.pamAuth.enable; + u2f = { + enable = true; + control = "sufficient"; + settings = { + cue = true; + authFile = "/home/jade/.ssh/u2f_keys"; + }; + }; + }; + + programs.i3lock.u2fSupport = true; + }; + } From ddd6ecd05582c68e9c8581b4ee5ccd27ece8e1f6 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 1 Aug 2024 08:37:19 +0200 Subject: [PATCH 4/5] move some graphics stuff into individual modules/files --- common.nix | 1 - hosts/catbook-j/configuration.nix | 12 ------------ hosts/catbook-j/modules/default.nix | 1 + hosts/catbook-j/modules/graphics.nix | 12 ++++++++++++ hosts/monosodium-glutamate-g/configuration.nix | 5 ++--- hosts/monosodium-glutamate-g/modules/default.nix | 5 +++++ hosts/monosodium-glutamate-g/modules/graphics.nix | 7 +++++++ modules/default.nix | 1 + modules/graphics.nix | 3 +++ 9 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 hosts/catbook-j/modules/graphics.nix create mode 100644 hosts/monosodium-glutamate-g/modules/default.nix create mode 100644 hosts/monosodium-glutamate-g/modules/graphics.nix create mode 100644 modules/graphics.nix diff --git a/common.nix b/common.nix index c7cd1be..99e25fe 100644 --- a/common.nix +++ b/common.nix @@ -138,7 +138,6 @@ with builtins; { boot.kernel.sysctl."vm.max_map_count" = 2147483642; hardware = { - opengl.enable = true; uinput.enable = true; bluetooth.enable = true; # keyboard.uhk.enable = true; diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index 342c186..d0f1c6b 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -46,18 +46,6 @@ S10E_JRNL_FILE_LOC = "/home/jade/Docs/jrnl.md"; }; - hardware.opengl = { - enable = true; - extraPackages = with pkgs; [ - intel-ocl - intel-media-driver - intel-vaapi-driver - intel-compute-runtime - libvdpau-va-gl - mesa.drivers - ]; - }; - programs.wireshark.enable = true; boot.resumeDevice = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694"; diff --git a/hosts/catbook-j/modules/default.nix b/hosts/catbook-j/modules/default.nix index 935baf9..ffe8790 100644 --- a/hosts/catbook-j/modules/default.nix +++ b/hosts/catbook-j/modules/default.nix @@ -1,5 +1,6 @@ {...}: { imports = [ ./input.nix + ./graphics.nix ]; } diff --git a/hosts/catbook-j/modules/graphics.nix b/hosts/catbook-j/modules/graphics.nix new file mode 100644 index 0000000..e359044 --- /dev/null +++ b/hosts/catbook-j/modules/graphics.nix @@ -0,0 +1,12 @@ +{pkgs, ...}: { + hardware.graphics = { + extraPackages = with pkgs; [ + intel-ocl + intel-media-driver + intel-vaapi-driver + intel-compute-runtime + libvdpau-va-gl + mesa.drivers + ]; + }; +} diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index 43e62b7..471c1a9 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -6,9 +6,11 @@ ./hardware-configuration.nix ../../common.nix ../../modules + ./modules ]; jade = { + hwKey.pamAuth.enable = true; desktop = { syncthing.enable = true; kdeconnect.enable = true; @@ -57,9 +59,6 @@ # TODO: clean up. zenstates zenmonitor - nvtop-amd - radeontop - rgp tea blender-hip ]; diff --git a/hosts/monosodium-glutamate-g/modules/default.nix b/hosts/monosodium-glutamate-g/modules/default.nix new file mode 100644 index 0000000..213189f --- /dev/null +++ b/hosts/monosodium-glutamate-g/modules/default.nix @@ -0,0 +1,5 @@ +{}: { + imports = [ + ./graphics.nix + ]; +} diff --git a/hosts/monosodium-glutamate-g/modules/graphics.nix b/hosts/monosodium-glutamate-g/modules/graphics.nix new file mode 100644 index 0000000..5732629 --- /dev/null +++ b/hosts/monosodium-glutamate-g/modules/graphics.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + environment.systemPackages = [ + pkgs.nvtop-amd + pkgs.radeontop + pkgs.rgp + ]; +} diff --git a/modules/default.nix b/modules/default.nix index adf3726..afe2abc 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -6,5 +6,6 @@ ./firewall.nix ./desktop-environment ./input + ./graphics.nix ]; } diff --git a/modules/graphics.nix b/modules/graphics.nix new file mode 100644 index 0000000..cc13a5a --- /dev/null +++ b/modules/graphics.nix @@ -0,0 +1,3 @@ +{}: { + graphics.enable = true; +} From 1b802a90de117e0f2c5fd7ef4997487d83547d80 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 1 Aug 2024 08:37:19 +0200 Subject: [PATCH 5/5] move some graphics stuff into individual modules/files --- modules/graphics.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/graphics.nix b/modules/graphics.nix index cc13a5a..910a0e2 100644 --- a/modules/graphics.nix +++ b/modules/graphics.nix @@ -1,3 +1,3 @@ -{}: { - graphics.enable = true; +{...}: { + hardware.graphics.enable = true; }