diff --git a/flake.lock b/flake.lock index aade22e..97c264d 100644 --- a/flake.lock +++ b/flake.lock @@ -60,16 +60,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771813003, - "narHash": "sha256-rb+oAW0pPJHeyau97ZQ04Afzbxv8Qdexzvxoc0PosBI=", + "lastModified": 1773122722, + "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "09fd5099fab71fc4f891f50ecb370b0ed5a8a4aa", + "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50", "type": "github" }, "original": { "owner": "nixos", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index bd48208..c7070b5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/master"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home.org b/home.org index c5d52f4..f06e65b 100644 --- a/home.org +++ b/home.org @@ -12,7 +12,10 @@ in a ~nix~ devshell I think I'd also like to use it for scripting / exploratory so I'm installing it globally with a useful set of libraries. I should curate this somewhat carefully so it doesn't get carried away... -#+BEGIN_SRC nix :tangle target/common-lisp.nix +I'm skipping tangling this for now. It increases the update time a lot, and I'm not sure it's really +necessary. + +#+BEGIN_SRC nix {pkgs, ...}: { home.packages = with pkgs; [ @@ -767,7 +770,7 @@ fairly long (~5 sec) delay before changes are saved, which is kind of annoying. that at some point? #+BEGIN_SRC elisp - (auto-save-visited-mode) + ; (auto-save-visited-mode) #+END_SRC Repeat-mode takes care of eliminating some annoying duplicate keypresses. I mostly use repeat-mode @@ -778,8 +781,8 @@ repeats set up that only apply in that mode. (repeat-mode) #+END_SRC -Save the minibuffer history to disk, so recently-used options show up at the top of the picker -across restarts. + Save the minibuffer history to disk, so recently-used options show up at the top of the picker + across restarts. #+BEGIN_SRC elisp (savehist-mode) @@ -915,15 +918,15 @@ content to be. (window-parameters (no-delete-other-windows . t) (no-other-window . t))) ((or "magit: *" - "magit-revision: *" + "magit-revision: .*" "magit-log*" "\\*eldoc\\*" "\\*Help\\*" "\\*rustfmt\\*" - "\\*slack: *" - "\\*forge: *" + "\\*slack: .*" + "\\*forge: .*" "new-pullreq" - "\\*claude:*") + "\\*claude:.*") (display-buffer-reuse-window display-buffer-in-side-window) (side . right) (slot . 0) @@ -1163,6 +1166,10 @@ available? It seems to work for now anyway... (interactive) (nix-flake (project-root (project-current t)))) (bind-keys ("C-x p n" . project-nix-flake)) + + (require 'flymake) + (bind-keys :map flymake-project-diagnostics-mode-map + ("q" . quit-window)) #+END_SRC *** Rust @@ -1641,7 +1648,7 @@ available? It seems to work for now anyway... ** Ledger -#+BEGIN_SRC nix :tangle target/emacs-ledger.el +#+BEGIN_SRC nix :tangle target/emacs-ledger.nix { programs.emacs = { enable = true; @@ -1784,8 +1791,7 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can. (pkgs.fetchFromGitHub { owner = "catppuccin"; - repo = "starship - "; + repo = "starship"; rev = "3e3e54410c3189053f4da7a7043261361a1ed1bc"; # Replace with the latest commit hash sha256 = "soEBVlq3ULeiZFAdQYMRFuswIIhI9bclIU8WXjxd7oY="; } + /palettes/frappe.toml));