From f617e06134cf094f06c75f3d51f7cafd60a5aa4e Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Thu, 11 Apr 2024 14:52:29 -0500
Subject: [PATCH] changed lockscreen to betterlockscreen.

---
 hosts/archlaptop-vm/default.nix               |  2 +-
 hosts/workstation-vm/default.nix              |  3 +-
 .../workstation-vm/hardware-configuration.nix | 48 ++++++++++---------
 modules/both/i3/default.nix                   | 18 ++++++-
 modules/both/i3/lockscreen.nix                | 13 ++---
 modules/commonopts.nix                        | 12 ++---
 modules/home-manager/kitty.nix                |  4 +-
 modules/home-manager/terminal/default.nix     |  3 +-
 8 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/hosts/archlaptop-vm/default.nix b/hosts/archlaptop-vm/default.nix
index c5bf8a4..28ac1dc 100644
--- a/hosts/archlaptop-vm/default.nix
+++ b/hosts/archlaptop-vm/default.nix
@@ -27,7 +27,7 @@ inputs.nixpkgs.lib.nixosSystem {
       host = {
         user = "gabe";
         gui.enable = true;
-        isVm=true;
+        isVm = true;
       };
       networking.hostName = "archlaptop-vm"; # Define your hostname.
       # Set your time zone.
diff --git a/hosts/workstation-vm/default.nix b/hosts/workstation-vm/default.nix
index 05d1243..9524cd2 100644
--- a/hosts/workstation-vm/default.nix
+++ b/hosts/workstation-vm/default.nix
@@ -27,7 +27,7 @@ inputs.nixpkgs.lib.nixosSystem {
       host = {
         user = "gabe";
         gui.enable = true;
-        isVm=true;
+        isVm = true;
       };
       networking.hostName = "workstation-vm"; # Define your hostname.
       # Set your time zone.
@@ -54,6 +54,7 @@ inputs.nixpkgs.lib.nixosSystem {
         xkb.variant = "";
       };
 
+      environment.shells = with pkgs; [nushell zsh];
       # Define a user account. Don't forget to set a password with ‘passwd’.
       users.users.${config.host.user} = {
         isNormalUser = true;
diff --git a/hosts/workstation-vm/hardware-configuration.nix b/hosts/workstation-vm/hardware-configuration.nix
index 643cd9b..c8eeb35 100644
--- a/hosts/workstation-vm/hardware-configuration.nix
+++ b/hosts/workstation-vm/hardware-configuration.nix
@@ -1,34 +1,38 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/1127e866-28dc-4c07-92ec-07be4908880c";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/1127e866-28dc-4c07-92ec-07be4908880c";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/CBA2-8A1E";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/CBA2-8A1E";
+    fsType = "vfat";
+  };
 
-  fileSystems."/home/gabe/nix-config-host" =
-    { device = "nix-config-host";
-      fsType = "virtiofs";
-    };
+  fileSystems."/home/gabe/nix-config-host" = {
+    device = "nix-config-host";
+    fsType = "virtiofs";
+  };
 
-  swapDevices = [ ];
+  swapDevices = [];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/modules/both/i3/default.nix b/modules/both/i3/default.nix
index 88c8644..52fc283 100644
--- a/modules/both/i3/default.nix
+++ b/modules/both/i3/default.nix
@@ -9,8 +9,14 @@
     enable = true;
     displayManager = {
       defaultSession = "none+i3";
+      autoLogin = {
+        user = config.host.user;
+        enable = true;
+      };
       lightdm = {
         enable = true;
+        greeters.gtk.enable = false;
+        greeter.enable = false;
       };
     };
     windowManager.i3.enable = true;
@@ -201,10 +207,20 @@
         };
         startup = [
           {
-            command = "feh --no-fehbg --bg-fill ~/.background-image";
+            command = "betterlockscreen --lock blur";
             notification = false;
             always = true;
           }
+          {
+            command = "betterlockscreen --wall";
+            notification = false;
+            always = true;
+          }
+          # {
+          #   command = "~/.fehbg";
+          #   notification = false;
+          #   always = true;
+          # }
         ];
       };
     };
diff --git a/modules/both/i3/lockscreen.nix b/modules/both/i3/lockscreen.nix
index 390b466..5af25ac 100644
--- a/modules/both/i3/lockscreen.nix
+++ b/modules/both/i3/lockscreen.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   environment.systemPackages = with pkgs; [
-    lightlocker
+    betterlockscreen
   ];
   home-manager.users.${config.host.user} = {
     config,
@@ -18,15 +18,12 @@
         mod = config.xsession.windowManager.i3.config.modifier;
       in {
         "${mod}+x" = ''
-          exec --no-startup-id light-locker-command -l
+          exec --no-startup-id betterlockscreen --lock blur
         '';
       };
-      startup = [
-        {
-          command = "light-locker";
-          notification = false;
-        }
-      ];
     };
+    imports = [
+      ../../home-manager/feh.nix
+    ];
   };
 }
diff --git a/modules/commonopts.nix b/modules/commonopts.nix
index 5600193..e090d10 100644
--- a/modules/commonopts.nix
+++ b/modules/commonopts.nix
@@ -18,13 +18,13 @@
         description = "enable GUI";
         default = false;
       };
-      isLaptop=lib.mkEnableOption {
-        description="machine is a laptop";
-        default=false;
+      isLaptop = lib.mkEnableOption {
+        description = "machine is a laptop";
+        default = false;
       };
-      isVm=lib.mkEnableOption {
-        description="machine is a virtual machine";
-        default=false;
+      isVm = lib.mkEnableOption {
+        description = "machine is a virtual machine";
+        default = false;
       };
     };
   };
diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix
index e23b673..24ae599 100644
--- a/modules/home-manager/kitty.nix
+++ b/modules/home-manager/kitty.nix
@@ -11,8 +11,8 @@
       name = "FiraCode Nerd Font";
     };
     theme = "Gruvbox Dark";
-    settings={
-      background_opacity="0.8";
+    settings = {
+      background_opacity = "0.8";
     };
   };
 }
diff --git a/modules/home-manager/terminal/default.nix b/modules/home-manager/terminal/default.nix
index e8a19dc..5dcbc71 100644
--- a/modules/home-manager/terminal/default.nix
+++ b/modules/home-manager/terminal/default.nix
@@ -46,8 +46,7 @@
     ./voice.nix
     ./zellij
     ./tiny-irc.nix
-    ./pass.nix
-    ./gpg.nix
+    ./ssh-agent.nix
   ];
 
   programs = {