9 files changed, 26 insertions, 63 deletions

diff --git a/flake.lock b/flake.lock
index 95b0fe7..9104578 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,28 +20,6 @@
         "url": "https://git.peppe.rs/vim/better-text-objs"
       }
     },
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "prompt",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1642141613,
-        "narHash": "sha256-WFS7T5oOLD8anu/77iz7EPz7zQsJZtP5qVa5485k3dI=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "d75ffc9f1d3b60bb597e48ae01f486a6de27d30e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -49,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1681852391,
-        "narHash": "sha256-0wGjrFTmYyjS9jE6MdgjcOEKvWjFkKcRpOtSXso99JI=",
+        "lastModified": 1694643239,
+        "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "aa03c8a429902dbaf15b3395f8cefc5a4b83f7f7",
+        "rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
         "type": "github"
       },
       "original": {
@@ -79,33 +57,32 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688868408,
-        "narHash": "sha256-RR9N5XTAxSBhK8MCvLq9uxfdkd7etC//seVXldy0k48=",
+        "lastModified": 1694062546,
+        "narHash": "sha256-PiGI4f2BGnZcedP6slLjCLGLRLXPa9+ogGGgVPfGxys=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "510d721ce097150ae3b80f84b04b13b039186571",
+        "rev": "b200e0df08f80c32974a6108ce431d8a8a5e6547",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "prompt": {
       "inputs": {
-        "fenix": "fenix",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1662898783,
-        "narHash": "sha256-wh/sty5Gs7vwDcuNpxekI/7lzg7LEyQIQVAX0dMJTE8=",
+        "lastModified": 1694244899,
+        "narHash": "sha256-+Nv7HVG/s2Jers3+XiBqYzg+X+MpDY+j5Rucyfgoib0=",
         "ref": "refs/heads/master",
-        "rev": "306640f502ef24e31590eef910b78ccd85ce8f6e",
-        "revCount": 5,
+        "rev": "39c3e7baf034bdbecc29f5f441d8dde634833b52",
+        "revCount": 6,
         "type": "git",
         "url": "https://git.peppe.rs/cli/prompt"
       },
@@ -124,23 +101,6 @@
         "vim-colors-plain": "vim-colors-plain"
       }
     },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1642101527,
-        "narHash": "sha256-C4zcaWULWlrirpEt/pA85CCMBt+7SWZweMaMJ7EvrXw=",
-        "owner": "rust-analyzer",
-        "repo": "rust-analyzer",
-        "rev": "b4c31481a554d0132003228ba319bd9476fe85ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-analyzer",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
     "vim-colors-plain": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index d1f39f6..3782459 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "nerdypepper's nixos config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
 
@@ -10,6 +10,10 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    # home-manager = {
+    #   url = "path:/home/np/code/home-manager";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
     # statix = {
     #   url = "git+https://git.peppe.rs/languages/statix";
diff --git a/home.nix b/home.nix
index 7a51f63..838a4c3 100644
--- a/home.nix
+++ b/home.nix
@@ -39,7 +39,6 @@
     nodePackages.bash-language-server
     w3m
     noto-fonts-emoji
-    ripgrep-all
     urlview
     fd
     du-dust
@@ -51,6 +50,7 @@
     signal-desktop
     killall
     httpie
+    thunderbird
 
     # sync
     rtorrent
diff --git a/programs/bash.nix b/programs/bash.nix
index 2a3cb97..bff2eb9 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -14,6 +14,7 @@
 
     shellAliases = {
       "..." = "cd -- ../..";
+      "...." = "cd -- ../../..";
       grep = "grep --color=auto";
       l = "ls -CF";
       la = "ls -A";
@@ -24,7 +25,6 @@
       tmux = "tmux -u";
       tree = "tree -C";
       tb = "nc termbin.com 9999";
-      n = "j";
 
       # git aliases
       gb = "git branch -v";
@@ -71,8 +71,6 @@
     };
 
     initExtra = ''
-      [ -f $HOME/.github ] && . $HOME/.github
-      eval "$(direnv hook bash)"
       export PATH=$PATH:"$HOME/scripts"
       export PROMPT_COMMAND="tmux refresh-client -S";
       export PS1="\n\001\e[0;36m\002λ\001\e[0m\002 ";
@@ -116,7 +114,6 @@
       function __rm() {
         git worktree remove "$1"
       }
-
     '';
 
   };
diff --git a/programs/default.nix b/programs/default.nix
index e28838b..70ded22 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -18,6 +18,7 @@
     ./readline.nix
     ./tmux.nix
     ./zathura.nix
+    ./rofi.nix
   ];
 
   programs = {
diff --git a/programs/feh.nix b/programs/feh.nix
index 2e15fe4..29374ca 100644
--- a/programs/feh.nix
+++ b/programs/feh.nix
@@ -5,7 +5,7 @@
 
 {
   programs.feh = {
-    enable = true;
+    enable = false;
     buttons = {
       zoom_in = "C-5";
       zoom_out = "C-4";
diff --git a/programs/rofi.nix b/programs/rofi.nix
index 12c0d7b..bdf5898 100644
--- a/programs/rofi.nix
+++ b/programs/rofi.nix
@@ -29,8 +29,7 @@ let
       selected-normal-foreground = mkLiteral theme.base0C;
       urgent-foreground = mkLiteral theme.base05;
 
-      border = mkLiteral "4px solid";
-      border-color = mkLiteral theme.base01;
+      border-color = mkLiteral theme.base00;
     };
 
     inputbar.children = [ "entry" ];
@@ -46,6 +45,8 @@ let
       padding = 40;
       width = 800;
       height = 600;
+      border = mkLiteral "3px solid";
+      border-color = mkLiteral theme.base01;
     };
   };
 in
diff --git a/programs/tmux.nix b/programs/tmux.nix
index 292d751..f061997 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -76,7 +76,7 @@ in
       setw -g pane-base-index 1
 
       # session jumper
-      bind-key -n C-n run-shell "tmux-fzf"
+      bind-key -n C-h run-shell "tmux-fzf"
 
       # pane binds
       unbind-key E
diff --git a/services/dunst.nix b/services/dunst.nix
index 485cb1a..0d05889 100644
--- a/services/dunst.nix
+++ b/services/dunst.nix
@@ -22,7 +22,7 @@ with theme;
         ignore_newline = "no";
         geometry = "300x8-20+20";
         shrink = "yes";
-        frame_width = 4;
+        frame_width = 1;
         transparency = "0";
         idle_threshold = "120";
         monitor = "0";
@@ -53,7 +53,7 @@ with theme;
       urgency_low = {
         background = base00;
         foreground = base05;
-        frame_color = base00;
+        frame_color = base01;
         timeout = 2;
       };