From 6cd87ee9200e57b36bc2beb9d9835add106b3b22 Mon Sep 17 00:00:00 2001
From: Tom Barrett <tom@tombarrett.xyz>
Date: Tue, 21 May 2024 20:48:52 +0200
Subject: more packages, cursor fix, git options, set term properly

---
 configuration.nix |  5 ++++-
 flake.nix         |  2 +-
 home.nix          | 11 ++++++++++-
 xmonad.hs         |  9 ++++++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 28c5d7d..e5bd3b5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -4,7 +4,10 @@
   ...
 }: {
   imports = [./hardware-configuration.nix];
-  nix.settings.experimental-features = ["nix-command" "flakes"];
+  nix.settings = {
+    experimental-features = ["nix-command" "flakes"];
+    auto-optimise-store = true;
+  };
 
   boot.loader.grub.device = "/dev/sda";
   time.timeZone = "Europe/Berlin";
diff --git a/flake.nix b/flake.nix
index 361a52c..d8ece83 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
     nixvim,
     self,
   }: {
-    nixosConfigurations."hostname" = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.default = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
         ./configuration.nix
diff --git a/home.nix b/home.nix
index 36a08b2..f62bd4c 100644
--- a/home.nix
+++ b/home.nix
@@ -21,6 +21,7 @@ in {
       acpi
       bemenu
       binutils
+      brave
       feh
       file
       firefox
@@ -28,10 +29,17 @@ in {
       gimp
       haskellPackages.fourmolu
       htop
+      jq
+      ncdu
       ncmpcpp
       nixvim.packages.x86_64-linux.default
+      nmap
+      pavucontrol
+      python3Packages.ipython
+      scrot
       tmux
       tree
+      unzip
       vim
       xautolock
       xmobar
@@ -41,7 +49,6 @@ in {
       // {
         LESS = "-R -F";
         EDITOR = "vim";
-        TERM = "xterm-256color";
       };
 
     file.".xinitrc".text = ''
@@ -61,6 +68,7 @@ in {
     alacritty = {
       enable = true;
       settings = {
+        env.TERM = "xterm-256color";
         font = {
           bold.family = "Hermit";
           bold_italic.family = "Hermit";
@@ -89,6 +97,7 @@ in {
       extraConfig = {
         init.defaultBranch = "master";
         pull.rebase = true;
+        push.autoSetupRemote = true;
       };
     };
     gpg.enable = true;
diff --git a/xmonad.hs b/xmonad.hs
index e566f37..143f4a2 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -11,6 +11,7 @@ import XMonad.Prompt
 import XMonad.Prompt.FuzzyMatch
 import XMonad.Prompt.Pass
 import qualified XMonad.StackSet as W
+import XMonad.Util.Cursor
 import XMonad.Util.EZConfig
 import XMonad.Util.SpawnOnce
 
@@ -106,7 +107,9 @@ main = do
                                     ]
                                 )
                                 (map show [1 .. 9])
-                , startupHook = do
-                    spawnOnce "feh --bg-fill --no-fehbg --randomize /home/tom/src/nixos/wallpapers"
-                    spawnOnce "xautolock -locker slock -time 1"
+                , startupHook =
+                    do
+                        spawnOnce "feh --bg-fill --no-fehbg --randomize /home/tom/src/nixos/wallpapers"
+                        spawnOnce "xautolock -locker slock -time 1"
+                        setDefaultCursor xC_left_ptr
                 }
-- 
cgit v1.2.3