config sync

9 files changed, 13 insertions, 6 deletions

diff --git a/config/lf/lfrc b/config/lf/lfrc
index 3df493b..7bf2d9d 100644
--- a/config/lf/lfrc
+++ b/config/lf/lfrc
@@ -125,6 +125,7 @@ map gdm   cd ~/Downloads/music
 map gdv   cd ~/dev
 map gdp   cd ~/dump
 map gp    cd ~/Pictures
+map gsc   cd ~/Pictures/screenshots
 map gmnt  cd /run/media/imsohexy
 map gdc   cd ~/Documents
 
diff --git a/config/nvim b/config/nvim
-Subproject 1ca488856ceae2e30c98c1ea79243fcf650561a
+Subproject 6abd26ba0c7e81237ea37da427c0269f52838d2
diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh
index 32586e0..9eb564a 100644
--- a/config/zsh/aliases.zsh
+++ b/config/zsh/aliases.zsh
@@ -11,6 +11,8 @@ alias o='open $(fzf)';
 
 alias j='just';
 alias jl='just -l';
+alias je='just -e';
+alias jc='just --choose';
 
 # Load work aliases
 # source "$HOME/.work-config/zshconf/aliases.zsh";
diff --git a/config/zsh/aliases/dev.zsh b/config/zsh/aliases/dev.zsh
index 77df460..9dd4307 100644
--- a/config/zsh/aliases/dev.zsh
+++ b/config/zsh/aliases/dev.zsh
@@ -56,8 +56,6 @@ p__run_npm_script() {
 zle -N p__run_npm_script;
 bindkey '^B' p__run_npm_script;
 
-# TODO: Run just script
-
 fix-interpreter() {
   nix-shell -p patchelf --run "patchelf --set-interpreter \$(patchelf --print-interpreter \$(which mkdir)) $@"
 }
diff --git a/config/zsh/aliases/git.zsh b/config/zsh/aliases/git.zsh
index 3bbdefa..91d5fae 100644
--- a/config/zsh/aliases/git.zsh
+++ b/config/zsh/aliases/git.zsh
@@ -40,13 +40,14 @@ alias gc!='git commit -v --amend'
 
 alias gst='git status'
 alias gd='git diff'
+alias gds='git diff --staged'
 alias gl='git log'
 
 alias gp='git push'
 
 alias gr='git rebase'
 alias gri='git rebase -i'
-alias grm='git rebase -i origin/master'
+alias grm='git rebase origin/master'
 alias grc='git rebase --continue'
 
 grename() {
diff --git a/hardware/thinkpad-e14/default.nix b/hardware/thinkpad-e14/default.nix
index 6b08352..2b24965 100644
--- a/hardware/thinkpad-e14/default.nix
+++ b/hardware/thinkpad-e14/default.nix
@@ -6,7 +6,6 @@
 
   services.fwupd.enable = true;
 
-  # 2-Sep-2023, Bug: https://nixpk.gs/pr-tracker.html?pr=252605
   boot.kernelPackages = pkgs.linuxPackages_6_6;
   boot.initrd = {
     availableKernelModules = [
diff --git a/packages.nix b/packages.nix
index 6ef601e..61002fa 100644
--- a/packages.nix
+++ b/packages.nix
@@ -37,6 +37,7 @@ let
     # sxhkd
 
     rnix-lsp
+    lua-language-server
     efm-langserver
 
     nodePackages.typescript
@@ -134,6 +135,7 @@ let
     xdo
     xdotool
     arandr
+    xorg.xgamma
 
     v4l-utils
   ];
@@ -153,6 +155,8 @@ in
   hardware.steam-hardware.enable = true;
   programs.gamemode.enable = true;
 
+  programs.darling.enable = true;
+
   # Security wrappers
   # security.wrappers = {
   #   bslock = {
diff --git a/scripts/commands/:day b/scripts/commands/:day
index e090f5b..76b57cb 100755
--- a/scripts/commands/:day
+++ b/scripts/commands/:day
@@ -2,7 +2,7 @@
 
 ~/scripts/brightness.sh set 100;
 
-:gamma 0.91 0.94 0.93;
+# :gamma 0.91 0.94 0.93;
 
 xgamma -gamma 1;
 
diff --git a/scripts/commands/:night b/scripts/commands/:night
index b97c90b..387e04e 100755
--- a/scripts/commands/:night
+++ b/scripts/commands/:night
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
-~/scripts/brightness.sh set 2;
+brightnessctl --min-value || ~/scripts/brightness.sh set 2;
+
+xgamma -gamma 0.9;