thinkpad configuration finalization

6 files changed, 37 insertions, 22 deletions

diff --git a/os/core/bootloader.nix b/os/core/bootloader.nix
index 7f3a85e..dfd9101 100644
--- a/os/core/bootloader.nix
+++ b/os/core/bootloader.nix
@@ -12,7 +12,6 @@ in
       type = lib.types.enum [
         "systemd-boot"
         "grub"
-        "none"
       ];
       default = "systemd-boot";
       description = "Which bootloader to use";
diff --git a/os/core/greet.nix b/os/core/greet.nix
index 953b017..cf814af 100644
--- a/os/core/greet.nix
+++ b/os/core/greet.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.os.core.greet;
 in
@@ -24,6 +29,6 @@ in
     };
     security.pam.services.greetd.enableGnomeKeyring = true;
 
-    environment.systemPackages = with pkgs; [ tuigreet ];
+    # environment.systemPackages = with pkgs; [ tuigreet ];
   };
 }
diff --git a/os/core/security.nix b/os/core/security.nix
index e8c541c..bc2c41c 100644
--- a/os/core/security.nix
+++ b/os/core/security.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.os.core.security;
 in
@@ -8,22 +13,25 @@ in
     services.gnome.gnome-keyring.enable = true;
 
     security = {
-      pam.services.swaylock = {};
+      pam.services = {
+        swaylock = { };
+        login.enableGnomeKeyring = true;
+      };
       polkit.enable = true;
       rtkit.enable = true;
     };
 
-    systemd.user.services.polkit-gnome-authentication-agent-1 = {
-      description = "gnome-polkit-authentication-agent-1";
-      wantedBy = [ "graphical-session.target" ];
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-        Restart = "on-failure";
-        RestartSec = 1;
-        TimeoutStopSec = 10;
-      };
-    };
+    # systemd.user.services.polkit-gnome-authentication-agent-1 = {
+    #   description = "gnome-polkit-authentication-agent-1";
+    #   wantedBy = [ "graphical-session.target" ];
+    #   serviceConfig = {
+    #     Type = "simple";
+    #     ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+    #     Restart = "on-failure";
+    #     RestartSec = 1;
+    #     TimeoutStopSec = 10;
+    #   };
+    # };
 
     environment.systemPackages = with pkgs; [
       veracrypt
diff --git a/os/core/ssh.nix b/os/core/ssh.nix
index 2fb35f8..4069d31 100644
--- a/os/core/ssh.nix
+++ b/os/core/ssh.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, username, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  username,
+  ...
+}:
 let
   cfg = config.os.core.ssh;
 in
@@ -10,9 +16,7 @@ in
       openFirewall = true;
     };
 
-    services.openssh = {
-      enable = true;
-    };
+    services.openssh.enable = true;
 
     programs.gnupg.agent = {
       enable = true;
diff --git a/os/core/storage.nix b/os/core/storage.nix
index 59f0093..8527bac 100644
--- a/os/core/storage.nix
+++ b/os/core/storage.nix
@@ -8,7 +8,6 @@ in
   };
   config = lib.mkIf cfg.enable {
     nix.settings.auto-optimise-store = true;
-    programs.nh.enable = true;
     services.fstrim.enable = true;
     services.btrfs.autoScrub = {
       enable = true;
diff --git a/os/core/users.nix b/os/core/users.nix
index 03eff8a..86c015c 100644
--- a/os/core/users.nix
+++ b/os/core/users.nix
@@ -23,7 +23,7 @@ in
           extraGroups = lib.mkMerge [
             [ "wheel" ]
 
-            (lib.mkIf (config.os.core.drivers.amd.enable or false) [
+            (lib.mkIf (config.os.core.drivers.graphics.enable or false) [
               "video"
               "render"
             ])