diff --git a/flake.lock b/flake.lock index b203a0c..e3bffa0 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754696903, - "narHash": "sha256-H+qoDZddFhYq8lT2E3NahF7wiDJLMYE6Pe0E6izz+cg=", + "lastModified": 1754939243, + "narHash": "sha256-5fHK2rNNiz1VHxv6ogUyOIlxGWQ0p8YaGYngjTJTFEs=", "ref": "refs/heads/main", - "rev": "3ac2d7261d747ee5cf6721a570993fdcd2300726", - "revCount": 1335, + "rev": "d54aabb31ae9697656862f7abeefccc0ef00b8ba", + "revCount": 1339, "type": "git", "url": "https://codeberg.org/FabricSoul/dwl" }, @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1754613544, - "narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", + "lastModified": 1754924470, + "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", "owner": "nix-community", "repo": "home-manager", - "rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", + "rev": "67393957c27b4e4c6c48a60108a201413ced7800", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754651824, - "narHash": "sha256-aB7ft6njy9EJfuW+rdToNChfRrHNRw/yTg5cSEnG+HI=", + "lastModified": 1754800730, + "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b069b7c1e2fe1a3a24221428558bf44128d3d5c8", + "rev": "641d909c4a7538f1539da9240dedb1755c907e40", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1754682350, - "narHash": "sha256-4Dgf0cA/ZJtj9eTzG0yNMRBcd5fll3hhWx2WdwltAP8=", + "lastModified": 1754921951, + "narHash": "sha256-KY+/livAp6l3fI8SdNa+CLN/AA4Z038yL/pQL2PaW7g=", "owner": "nix-community", "repo": "nixvim", - "rev": "832de87d40f9a40430372552ab0b583680187cf3", + "rev": "7b53322d75a1c66f84fb145e4b5f0f411d9edc6b", "type": "github" }, "original": { diff --git a/home/fabric/default.nix b/home/fabric/default.nix index 236a4bf..ca57b6c 100644 --- a/home/fabric/default.nix +++ b/home/fabric/default.nix @@ -16,9 +16,11 @@ ./programs/zsh.nix ./programs/ssh.nix ./programs/yazi.nix + ./programs/neomutt.nix + ./programs/gpg.nix # Import desktop configurations - # ./desktop/hyprland.nix + ./desktop/hyprland.nix # ./desktop/hyprpanel.nix # ./desktop/river.nix # ./desktop/hyprpaper.nix @@ -68,6 +70,7 @@ fd lsd brightnessctl + neomutt nerd-fonts.fira-mono @@ -114,6 +117,11 @@ openssl psmisc air + w3m + gopass + pinentry + gnupg + dig ]; # Enable home-manager diff --git a/home/fabric/programs/zsh.nix b/home/fabric/programs/zsh.nix index 8955168..e33c0d2 100644 --- a/home/fabric/programs/zsh.nix +++ b/home/fabric/programs/zsh.nix @@ -23,6 +23,9 @@ export PATH=$PATH:(go env GOPATH)/bin export PATH="/home/fabric/.cargo/bin:$PATH" export PATH="/home/fabric/.config/emacs/bin:$PATH" + export GPG_TTY=$(tty) + export GPG_AGENT_INFO= + export GPGPINENTRYMODE=loopback GOPATH=$HOME/go PATH=$PATH:/usr/local/go/bin:$GOPATH/bin PATH="$HOME/.govm/shim:$PATH" @@ -44,6 +47,7 @@ fi rm -f -- "$tmp" } + gpg --quiet --decrypt /home/fabric/.local/share/gopass/stores/root/websites/codeberg.org/FabricSoul.gpg >/dev/null ''; prezto = { tmux = { diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index 0920637..298c0d6 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -22,8 +22,8 @@ environment.systemPackages = with pkgs; [ vim git - greetd.greetd - greetd.tuigreet + greetd + tuigreet zsh home-manager findutils @@ -38,7 +38,7 @@ enable = true; settings = { default_session = { - command = "''${pkgs.greetd.tuigreet}/bin/tuigreet --time"; + command = "''${pkgs.tuigreet}/bin/tuigreet --time"; user = "fabric"; }; };