diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 65ea5c9..4570271 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -21,6 +21,7 @@
 
   # Set your time zone, also used by redshift
   services.localtime.enable = true;
+  services.avahi.enable = true;
   services.geoclue2.enable = true;
   location = { provider = "geoclue2"; };
 
@@ -35,14 +36,14 @@
   services.xserver = {
     enable = true;
 
-    windowManager = { spectrwm = { enable = true; }; };
+    windowManager = { i3 = { enable = true; }; };
 
     # Enable touchpad support
     libinput.enable = true;
 
     # Disable mouse acceleration
     libinput.mouse.accelProfile = "flat";
-    libinput.mouse.accelSpeed = "1.5";
+    libinput.mouse.accelSpeed = "1.25";
 
     # Keyboard responsiveness
     autoRepeatDelay = 250;
@@ -82,8 +83,10 @@
 
   };
 
+  hardware.acpilight.enable = true;
+
   # Required for setting GTK theme (for preferred-color-scheme in browser)
-  services.dbus.packages = with pkgs; [ gnome3.dconf ];
+  services.dbus.packages = with pkgs; [ pkgs.dconf ];
 
   # Mouse config
   services.ratbagd.enable = true;
@@ -105,7 +108,12 @@
   };
 
   # Install fonts
-  fonts.fonts = with pkgs; [ victor-mono nerdfonts ];
+  fonts.fonts = with pkgs; [
+    victor-mono # Used for Vim and Terminal
+    nerdfonts
+    font-awesome # Icons (for i3)
+    siji # More icons for Polybar
+  ];
   fonts.fontconfig.defaultFonts.monospace = [ "Victor Mono" ];
 
   # Gaming
@@ -168,6 +176,12 @@
     dmenu
     xlockmore
     feh
+    xorg.xbacklight
+    playerctl
+    # i3blocks
+    polybar
+    st # alt terminal
+    kitty # alt terminal
 
     # Mouse config
     libratbag
@@ -189,12 +203,16 @@
     enable = true;
     brightness = {
       day = "1.0";
-      night = "0.75";
+      night = "0.5";
     };
   };
 
   # Login to Keybase in the background
   services.keybase.enable = true;
+  services.kbfs = {
+    enable = true;
+    mountPoint = "/keybase";
+  };
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
diff --git a/nixos/home.nix b/nixos/home.nix
index 8e857bf..99d9480 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -23,6 +23,7 @@ in {
     mpv # Video viewer
     sxiv # Image viewer
     zathura # PDF viewer
+    qbittorrent
 
     # Utilities
     unzip
diff --git a/nixos/todo.txt b/nixos/todo.txt
deleted file mode 100644
index dabcc49..0000000
--- a/nixos/todo.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-libratbag (ratbagd) for input devices
-
-inspiration: https://github.com/JonathanReeve/dotfiles/blob/minimal/dotfiles/home.nix
-
-https://github.com/nuxshed/dotfiles
-
-more: https://github.com/mitchellh/nixos-config/blob/main/users/mitchellh/home-manager.nix
-
-https://github.com/kyechou/leagueoflegends
-
-Encryption:
-https://www.passwordstore.org/
-https://github.com/roddhjav/pass-tomb#readme
-https://github.com/AGWA/git-crypt
-https://github.com/FiloSottile/age
-https://sr.ht/~gpanders/passage/
diff --git a/nvim.configlink/init.lua b/nvim.configlink/init.lua
index 50bb04a..c1461eb 100644
--- a/nvim.configlink/init.lua
+++ b/nvim.configlink/init.lua
@@ -90,6 +90,7 @@ require("packer").startup(function(use)
                     literal = {
                         Caskfile = "brewfile",
                         [".gitignore"] = "gitignore",
+                        config = "config",
                     },
                     complex = {
                         [".*git/config"] = "gitconfig",
@@ -120,6 +121,14 @@ require("packer").startup(function(use)
     -- Markdown pretty view
     use("ellisonleao/glow.nvim")
 
+    -- Hex color previews
+    use({
+        "norcalli/nvim-colorizer.lua",
+        config = function()
+            require("colorizer").setup()
+        end,
+    })
+
     -- Snippet engine
     use("L3MON4D3/LuaSnip")