From bbf484a0965330aa729c9861d0385d0fccbb4da5 Mon Sep 17 00:00:00 2001
From: Akshay Nair <phenax5@gmail.com>
Date: Tue, 20 May 2025 19:53:11 +0530
Subject: Remove unnecassary bits (alsa-utils udev rules, lsd, unclutter,
 overlays, keybase, firefox)

---
 hardware/thinkpad-e14/default.nix | 16 +++++++++++++---
 home.nix                          | 18 ++----------------
 modules/git.home.nix              |  5 ++---
 modules/keybase.home.nix          |  6 ------
 modules/keyboard/default.nix      |  2 --
 overlays-home.nix                 | 16 ++++++++--------
 scripts/sessions/project.sh       | 16 ++++++++--------
 7 files changed, 33 insertions(+), 46 deletions(-)
 delete mode 100644 modules/keybase.home.nix

diff --git a/hardware/thinkpad-e14/default.nix b/hardware/thinkpad-e14/default.nix
index 4dd4846..4bb5d42 100644
--- a/hardware/thinkpad-e14/default.nix
+++ b/hardware/thinkpad-e14/default.nix
@@ -1,7 +1,10 @@
 { config, lib, pkgs, modulesPath, ... }:
-{
+let
+  nixos-hardware = builtins.fetchGit { url = "https://github.com/NixOS/nixos-hardware.git"; };
+in {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
+    "${nixos-hardware}/lenovo/thinkpad/e14/intel"
   ];
 
   # services.fwupd.enable = true;
@@ -65,7 +68,14 @@
 
   services.udev = {
     packages = with pkgs; [
-      alsa-utils
+      # alsa-utils
+      # (alsa-utils.overrideAttrs (self: {
+      #   postFixup = ''
+      #     ${self.postFixup}
+      #
+      #     cat $out/lib/udev/rules.d/*
+      #   '';
+      # }))
       android-udev-rules
       platformio-core.udev
       openocd
@@ -139,5 +149,5 @@
     cpuFreqGovernor = "powersave";
   };
 
-  services.tlp.enable = lib.mkDefault false;
+  # services.tlp.enable = lib.mkDefault false;
 }
diff --git a/home.nix b/home.nix
index 76f56b9..f191bf9 100644
--- a/home.nix
+++ b/home.nix
@@ -6,11 +6,10 @@ in
   imports = [
     ./overlays-home.nix
     ./modules/git.home.nix
-    ./modules/keybase.home.nix
     ./modules/mpv.home.nix
     ./modules/music.home/default.nix
     ./modules/xresources.home.nix
-    ./modules/firefox.home/default.nix
+    # ./modules/firefox.home/default.nix
     ./modules/newsboat.home/default.nix
   ];
 
@@ -67,21 +66,11 @@ in
     # preset = "default";
   };
 
-  programs.lsd = {
-    enable = true;
-    enableAliases = true;
-  };
-
   services.syncthing = {
     enable = true;
     tray = false;
   };
 
-  services.unclutter = {
-    enable = true;
-    timeout = 5;
-  };
-
   services.udiskie = {
     enable = true;
     automount = true;
@@ -106,7 +95,7 @@ in
     defaultCacheTtl = 864000;
     enableSshSupport = false;
     # pinentryPackage = pkgs.pinentry-qt;
-    pinentryPackage = localPkgs.anypinentry;
+    pinentry.package = localPkgs.anypinentry;
     # extraConfig = ''
     #   pinentry-program ${localPkgs.anypinentry}/bin/anypinentry
     # '';
@@ -126,8 +115,5 @@ in
     ".wyrdrc".source = ./config/remind/.wyrdrc;
     "scripts".source = ./scripts;
     ".config/bottom/bottom.toml".source = ./config/bottom.toml;
-    # ".config/newsboat/config".source = ./config/newsboat/config;
-    # ".config/newsboat/urls".source = ./config/newsboat/urls;
-    # ".config/newsboat/opener.sh".source = ./config/newsboat/opener.sh;
   };
 }
diff --git a/modules/git.home.nix b/modules/git.home.nix
index 0622128..963abb4 100644
--- a/modules/git.home.nix
+++ b/modules/git.home.nix
@@ -94,9 +94,8 @@
         new = "green bold";
         whitespace = "red reverse";
       };
-      pull = {
-        rebase = true;
-      };
+      pull.rebase = true;
+      rebase.autosquash = true;
       # pager = {
       #   diff = "${pkgs.delta}/bin/delta --color-only";
       # };
diff --git a/modules/keybase.home.nix b/modules/keybase.home.nix
deleted file mode 100644
index 771025c..0000000
--- a/modules/keybase.home.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.kbfs.enable = false;
-  services.keybase.enable = false;
-}
-
diff --git a/modules/keyboard/default.nix b/modules/keyboard/default.nix
index 81e3c91..47486ce 100644
--- a/modules/keyboard/default.nix
+++ b/modules/keyboard/default.nix
@@ -1,7 +1,5 @@
 { ... }:
 {
-  # imports = [ ./kmonad.nix ];
-
   services.kmonad = {
     enable = true;
     keyboards = {
diff --git a/overlays-home.nix b/overlays-home.nix
index fc85510..2edbccc 100644
--- a/overlays-home.nix
+++ b/overlays-home.nix
@@ -3,12 +3,12 @@ let
   overlays = import ./overlays/default.nix { };
 in
 {
-  nixpkgs.overlays = with overlays; [
-    # pass-with-dmenu
-
-    # Home manager issue {https://discourse.nixos.org/t/error-when-upgrading-nixos-related-to-fcitx-engines/26940}
-    (self: super: {
-      fcitx-engines = super.fcitx5;
-    })
-  ];
+  # nixpkgs.overlays = with overlays; [
+  #   # pass-with-dmenu
+  #
+  #   # Home manager issue {https://discourse.nixos.org/t/error-when-upgrading-nixos-related-to-fcitx-engines/26940}
+  #   (self: super: {
+  #     fcitx-engines = super.fcitx5;
+  #   })
+  # ];
 }
diff --git a/scripts/sessions/project.sh b/scripts/sessions/project.sh
index 4250f67..217554f 100755
--- a/scripts/sessions/project.sh
+++ b/scripts/sessions/project.sh
@@ -2,17 +2,17 @@
 
 dir="$1";
 
-editor="sensible-editor";
-
-if [[ -f "$dir/default.nix" ]]; then
-  editor="nix-shell --run '$editor'";
-fi;
+# editor="sensible-editor";
+#
+# if [[ -f "$dir/default.nix" ]]; then
+#   editor="nix-shell --run '$editor'";
+# fi;
 
 term() { sensible-terminal -d "$dir" "$@"; }
-editor() { term -e sh -c "echo 'Loading...'; $editor; zsh"; }
+# editor() { term -e sh -c "echo 'Loading...'; $editor; zsh"; }
 
-editor &
-sleep 0.1;
+# editor &
+# sleep 0.1;
 term &
 term &
 
-- 
cgit v1.3.1