diff --git a/flake.lock b/flake.lock index a21c4d7..05c491f 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1737246960, - "narHash": "sha256-AsHD6Vfxx4R3FavTj0fZffhWKvg7xbUM1lNM1rryhiU=", + "lastModified": 1738013154, + "narHash": "sha256-yA8AwQM3bws/snp0sDscjrz7xiqZuq9LIHu12lxcb+g=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "2ae6ed65904fc67517e265b59ed1df9e7ee9e2e4", + "rev": "dcd8417121581ad263ca789345666a390d140eb5", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1737221749, - "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", + "lastModified": 1737968762, + "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", + "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1737250748, - "narHash": "sha256-dfmZxGmmwyYPVQCNI0IOOi5R7uFLAK0eHpjKhtntXcE=", + "lastModified": 1737855374, + "narHash": "sha256-RRGX2C+c+GaR3YMiYm6l/Tp5N/KZtYpiTplUrBwH/og=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "bcc7d7ccdc82e63ab261ddea67e1db1d6091c35a", + "rev": "4845fe94cda365c7550d9fd1ef899d45df0bc18a", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737165118, - "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", + "lastModified": 1737885640, + "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", + "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1737107480, - "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", + "lastModified": 1737411508, + "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", + "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1737161836, - "narHash": "sha256-v20q0DeglyrsIAbqwqOSxdzZ4JhEWtU9muWPlPz3Few=", + "lastModified": 1737834175, + "narHash": "sha256-fhyc89qqYM3ql0k4hJVibAhXvEXOch96hnsEGB7Av3I=", "ref": "refs/heads/main", - "rev": "3fd4ef90e8427cfc74d94914654a288912edb2cf", - "revCount": 901, + "rev": "4d1860eefd79d6c04e964774155dbe13be65121a", + "revCount": 911, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/user/config/bash/custom b/user/config/bash/custom index dfbc8b4..5c39aec 100644 --- a/user/config/bash/custom +++ b/user/config/bash/custom @@ -4,6 +4,7 @@ # get parent process name local parent="$(ps -o command= -p "$PPID" | cut -f1 -d' ')" if [[ "$parent" == *alacritty ]]; then + export SHLVL=1 if [[ -z "$TMUX" && -z "$NOTMUX" ]]; then if [[ "$PWD" == "$HOME" ]]; then exec auto-tmux @@ -11,7 +12,6 @@ if [[ "$parent" == *alacritty ]]; then exec auto-tmux -n fi fi -# set shell level elif [[ "$parent" == "tmux" ]]; then export SHLVL=1 fi diff --git a/user/packages.nix b/user/packages.nix index 9c1f7b8..fbf1258 100644 --- a/user/packages.nix +++ b/user/packages.nix @@ -29,7 +29,7 @@ tmuxPlugins.sessionist ] ++ lib.optionals config.u.has.graphical [ - (config.u.lib.localHome pkgs.firefox-bin "firefox" "bin/firefox") + (config.u.lib.localHome pkgs.firefox "firefox" "bin/firefox") alacritty nsxiv rofi diff --git a/user/prog.nix b/user/prog.nix index b89d357..45ee8ba 100644 --- a/user/prog.nix +++ b/user/prog.nix @@ -22,6 +22,7 @@ lib.mkIf config.u.has.prog { pwninit patchelf lazygit + pyp ] ++ lib.optionals config.u.has.graphical [ (cutter.withPlugins (ps: with ps; [jsdec rz-ghidra sigdb]))