diff --git a/flake.lock b/flake.lock index d8c35d3..642bddf 100644 --- a/flake.lock +++ b/flake.lock @@ -80,11 +80,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1742134710, - "narHash": "sha256-rFIJssnDEdaINRgg6ZApfs+2d6B0pjXMScSeRMcQJZE=", + "lastModified": 1742589311, + "narHash": "sha256-YCAEmOPDSHVKygFov2zOg3Fkb060SRgjiGi4P7y9+kc=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "c344c320eb93d800da36c035790530be0a2d618f", + "rev": "747c43ffa0047aa2ef550aa361ba63f4060a85ba", "type": "github" }, "original": { @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1742058297, - "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1741955947, - "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", + "lastModified": 1742670145, + "narHash": "sha256-xQ2F9f+ICAGBp/nNv3ddD2U4ZvzuLOci0u/5lyMXPvk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", + "rev": "63e77d09a133ac641a0c204e7cfb0c97e133706d", "type": "github" }, "original": { @@ -178,11 +178,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742180333, - "narHash": "sha256-SrvP0G0fxz35lvQxBhAeJOl6+BueIsxJ4azMX+l/kAU=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "113cd3916682def185290145924fa30b30bda972", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1741861888, - "narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=", + "lastModified": 1742595978, + "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f", + "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d", "type": "github" }, "original": { @@ -296,11 +296,11 @@ ] }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1742180312, - "narHash": "sha256-67nyifSJu0TnXReokhA+pQhqswg0ZOp033k+QboSL8s=", + "lastModified": 1742614294, + "narHash": "sha256-bZbYlP/xqGyW2aVle742dFbc0npFnwJBzcEnXNywJgY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4dd2f79d89dc0ebbb1b3ebf96776383cc6d6989a", + "rev": "7fa9ec4e14d89e568ebaac302049980df7cf0cc9", "type": "github" }, "original": { diff --git a/home/emacs/config/post-init.el b/home/emacs/config/post-init.el index 358fda7..73cb9ab 100644 --- a/home/emacs/config/post-init.el +++ b/home/emacs/config/post-init.el @@ -24,6 +24,8 @@ ;; the precise point where you previously left off. (add-hook 'elpaca-after-init-hook #'save-place-mode) +(setq auth-sources '("~/.authinfo")) + (use-package emacs :elpaca nil :ensure nil @@ -59,9 +61,33 @@ (load-theme 'naysayer t) :load-path rs/lib-dir) -(global-font-lock-mode 1) -(set-cursor-color "lightgreen") -(set-background-color "#072626") +;; (custom-set-faces +;; ;; custom-set-faces was added by Custom. +;; ;; If you edit it by hand, you could mess it up, so be careful. +;; ;; Your init file should contain only one such instance. +;; ;; If there is more than one, they won't work right. +;; '(default ((t (:foreground "#d3b58d" :background "#041818")))) +;; '(custom-group-tag-face ((t (:underline t :foreground "lightblue"))) t) +;; '(custom-variable-tag-face ((t (:underline t :foreground "lightblue"))) t) +;; '(font-lock-builtin-face ((t nil))) +;; ; '(font-lock-comment-face ((t (:foreground "yellow")))) +;; '(font-lock-comment-face ((t (:foreground "#3fdflf")))) +;; '(font-lock-function-name-face ((((class color) (background dark)) (:foreground "white")))) +;; '(font-lock-keyword-face ((t (:foreground "white" )))) +;; ; '(font-lock-string-face ((t (:foreground "gray160" :background "gray16")))) +;; '(font-lock-string-face ((t (:foreground "#0fdfaf")))) +;; '(font-lock-variable-name-face ((((class color) (background dark)) (:foreground "#c8d4ec")))) +;; ; '(font-lock-warning-face ((t (:foreground "#695a46")))) +;; '(font-lock-warning-face ((t (:foreground "#504038")))) +;; '(highlight ((t (:foreground "navyblue" :background "darkseagreen2")))) +;; '(mode-line ((t (:inverse-video t)))) +;; '(region ((t (:background "blue")))) +;; '(widget-field-face ((t (:foreground "white"))) t) +;; '(widget-single-line-field-face ((t (:background "darkgray"))) t)) + +;; (global-font-lock-mode 1) +;; (set-cursor-color "lightgreen") +;; (set-background-color "#072626") ;; (global-set-key [C-return] 'save-buffer) ;(set-face-attribute 'default nil :font "Anonymous Pro-14") @@ -340,6 +366,9 @@ :commands magit-status :bind ("C-x g" . magit)) +(use-package forge + :after magit) + ;; ========================= ;; Programming Languages ;; ========================= diff --git a/home/git.nix b/home/git.nix index 109423e..e20ae1f 100644 --- a/home/git.nix +++ b/home/git.nix @@ -2,6 +2,7 @@ lib, pkgs, config, + user, ... }: let @@ -34,6 +35,7 @@ in core.editor = "emacs"; credential.helper = "store --file ${home}/.git-credentials"; pull.rebase = true; + github.user = user; }; }; diff --git a/home/gui.nix b/home/gui.nix index 01a47d2..4ccee40 100644 --- a/home/gui.nix +++ b/home/gui.nix @@ -30,18 +30,20 @@ programs.vscode = { enable = true; - extensions = with pkgs.vscode-extensions; [ - bbenoist.nix - ms-python.python - ms-vscode-remote.remote-ssh - ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "remote-ssh-edit"; - publisher = "ms-vscode-remote"; - version = "0.87.0"; - sha256 = "sha256-yeX6RAJl07d+SuYyGQFLZNcUzVKAsmPFyTKEn+y3GuM="; - } - ]; + profiles.default = { + extensions = with pkgs.vscode-extensions; [ + bbenoist.nix + ms-python.python + ms-vscode-remote.remote-ssh + ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "remote-ssh-edit"; + publisher = "ms-vscode-remote"; + version = "0.87.0"; + sha256 = "sha256-yeX6RAJl07d+SuYyGQFLZNcUzVKAsmPFyTKEn+y3GuM="; + } + ]; + }; }; home.packages = with pkgs; [