From 312a955fd63c983d93ec3e544a078326a9c9c19f Mon Sep 17 00:00:00 2001 From: Leni Aniva Date: Wed, 4 Dec 2024 16:58:32 -0800 Subject: [PATCH] chore: General update --- doom/config.org | 1 + flake.lock | 8 ++++---- flake.nix | 2 +- nix-darwin/configuration.nix | 22 ++++------------------ nix-darwin/tex.nix | 33 +++++++++++++++++++++++++++++++-- 5 files changed, 41 insertions(+), 25 deletions(-) diff --git a/doom/config.org b/doom/config.org index 0dba9c3..fe3bf26 100644 --- a/doom/config.org +++ b/doom/config.org @@ -163,6 +163,7 @@ Modifications to the default key bindings to mimic spacemacs ; Remap JIS yen key to backslash (global-set-key (kbd "M-¥") (kbd "\\")) +(global-set-key (kbd "M-|") (kbd "|")) (global-set-key (kbd "C-M-¥") (kbd "C-\\")) #+end_src diff --git a/flake.lock b/flake.lock index e4fbdc6..c09a323 100644 --- a/flake.lock +++ b/flake.lock @@ -22,16 +22,16 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1730891215, - "narHash": "sha256-i85DPrhDuvzgvIWCpJlbfM2UFtNYbapo20MtQXsvay4=", + "lastModified": 1733326450, + "narHash": "sha256-hBG6Ix5ZzXCJoanrPOLtQRalYv6nnDu9AZeamRfjKJ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c128e44a249d6180740d0a979b6480d5b795c013", + "rev": "f9ef77eb704d063bfbff7f04531a0b325cc1a18f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-24.05-darwin", + "ref": "nixpkgs-24.11-darwin", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0bcbeff..75431dc 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Leni Aniva's Systems"; inputs = { - nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; + nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin"; nix-darwin = { url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs-darwin"; diff --git a/nix-darwin/configuration.nix b/nix-darwin/configuration.nix index 378bca2..58cfd47 100644 --- a/nix-darwin/configuration.nix +++ b/nix-darwin/configuration.nix @@ -1,21 +1,4 @@ -{ config, pkgs, ... }: let - tex = pkgs.texlive.combine { - inherit (pkgs.texlive) scheme-medium - latexmk - amsmath - cancel - hyphenat - datetime2 - makecell - tikzmark - tcolorbox - environ - tikzfill - pdfcol - ; - }; -in -{ +{ config, pkgs, ... }: { imports = [ ./homebrew.nix ./yabai-skhd.nix ]; # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget @@ -43,6 +26,9 @@ in # Media imagemagick fontconfig + + pass + python312Packages.pygments ]; }; diff --git a/nix-darwin/tex.nix b/nix-darwin/tex.nix index 0ece121..1c9927e 100644 --- a/nix-darwin/tex.nix +++ b/nix-darwin/tex.nix @@ -2,16 +2,45 @@ pkgs.texlive.combine { inherit (pkgs.texlive) scheme-medium latexmk + + # Symbols amsmath cancel hyphenat + xstring + mnsymbol + scalerel + + # Typesetting + pdfcol + changepage + upquote + anyfontsize + + # Misc + svg datetime2 makecell - tikzmark tcolorbox + type1cm environ + minted + transparent + + # Graphics + tikzmark tikzfill - pdfcol + pgfplots + + # Classes llncs + beamerposter + + # Fonts + gnu-freefont + raleway + lato + + biblatex ; }