From 647dd895efd48f8faf3d6ab1d8bca61b7ebce1f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Wed, 6 Mar 2024 15:31:53 +0100
Subject: [PATCH] Bring more configuration into home manager.

---
 flake.lock            |  12 ++---
 home-manager/home.nix | 109 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 101 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 586528d..13d57b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709485962,
-        "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=",
+        "lastModified": 1709731606,
+        "narHash": "sha256-VS17VGD5s4ijFh5mEzpWWgTPujaCvHxuG5L5FyMG3L0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d579633ff9915a8f4058d5c439281097e92380a8",
+        "rev": "8d9fde0fba21425729905f795fe72c2840a20442",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1709479366,
+        "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 766049b..3ebcff4 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -5,42 +5,123 @@
   home.username = "valberg";
   home.homeDirectory = "/home/valberg";
   home.stateVersion = "23.11";
+  home.sessionVariables = {
+    FLAKE = "/home/valberg/configuration/";
+  };
 
   nixpkgs.config.allowUnfree = true;
 
   home.packages = with pkgs; [
-    ansible
+
+# Python stuff
     python311Packages.tox
     python311Packages.virtualenv
     pipx
-    zoxide
+    hatch
     ruff
-    gnomeExtensions.forge
-    firefox
-    thunderbird
-    keepassxc
     jetbrains.pycharm-professional
-    slack
-    gnome.gnome-tweaks
-    deja-dup
+    pyenv
+
+# Chats
     signal-desktop
-    tmux
-    obsidian
     element-desktop
     discord
-    pyenv
-    nerdfonts
+    slack
+
+# Terminals
     blackbox-terminal
+    foot
+
+# Commandline
+    tmux
     ripgrep
+    nerdfonts
+    bat
+
+# Development
     pre-commit
 
+# Ansible
+    ansible
+
+# Gnome
+    gnomeExtensions.forge
+    gnome.gnome-tweaks
+
+# Browsers
+    firefox
+
+# Mail
+    thunderbird
+
+# Passwords
+    keepassxc
+
+# Backup
+    deja-dup
+
+# Note taking
+    obsidian
+
+# Music
     tidal-hifi
 
-    hatch
+# Nix
+    nh
   ];
 
   imports = [
     ./apps/hyprland.nix
   ];
 
+  programs.fish = {
+    enable = true;
+    shellAbbrs = {
+      update-home = "nh home switch --nom";
+      update-os = "nh os switch --nom";
+    };
+  };
+
+  programs.atuin = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
+  programs.starship = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
+  programs.zoxide = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
+  programs.tmux = {
+    enable = true;
+    clock24 = true;
+    keyMode = "vi";
+    prefix = "C-a";
+  };
+
+  programs.fzf = {
+    enable = true;
+    enableFishIntegration = true;
+    tmux.enableShellIntegration = true;
+  };
+
+  programs.broot = {
+    enable = true;
+    enableFishIntegration = true;
+    modal = true;
+  };
+
+  programs.btop = {
+    enable = true;
+  };
+
+  programs.bat = {
+    enable = true;
+  };
+
 }