From f3886e8beb6e15ac46b332afbcf30ee5883d304a Mon Sep 17 00:00:00 2001 From: Poby Date: Sun, 21 Dec 2025 00:28:41 +0900 Subject: [PATCH] feat: update --- flake.lock | 18 +++++++++--------- modules/apps.nix | 45 ++++++++++++++++++++++----------------------- modules/system.nix | 4 ++-- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index e1d4646..70619e6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1748149228, - "narHash": "sha256-mmonYFesFo42UUS49Hd0bcbVJRWX/aHBCDYUkkvylf4=", + "lastModified": 1758102940, + "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a9939228f661df370c4094fe85f683e45d761dbe", + "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748186667, - "narHash": "sha256-UQubDNIQ/Z42R8tPCIpY+BOhlxO8t8ZojwC9o2FW3c8=", + "lastModified": 1758262103, + "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdac72d387dca7f836f6ef1fe547755fb0e9df61", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1748186667, - "narHash": "sha256-UQubDNIQ/Z42R8tPCIpY+BOhlxO8t8ZojwC9o2FW3c8=", + "lastModified": 1758262103, + "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bdac72d387dca7f836f6ef1fe547755fb0e9df61", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" }, "original": { diff --git a/modules/apps.nix b/modules/apps.nix index b5391ca..569fd58 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -14,7 +14,6 @@ # Related Discussion: https://discourse.nixos.org/t/darwin-again/29331 environment.systemPackages = with pkgs; [ # CLI - neovim git just # use Justfile to simplify nix-darwin's commands ffmpeg @@ -32,25 +31,6 @@ zsh-powerlevel10k zsh-fzf-tab commitizen - - # GUI - alt-tab-macos - bitwarden-desktop - bruno - discord - pretendard - google-chrome - iina - jetbrains.idea-ultimate - ice-bar - keka - raycast - rectangle - slack - stats - telegram-desktop - vscode - zoom-us ]; environment.variables.EDITOR = "nvim"; @@ -79,6 +59,7 @@ Numbers = 409203825; Pages = 409201541; Keynote = 409183694; + Bitwarden = 1352778147; }; taps = [ ]; @@ -92,13 +73,31 @@ "openjdk" "openjdk@21" "openjdk@17" + "neovim" + "ripgrep" ]; # `brew install --cask` casks = [ + "alt-tab" + "bruno" + "discord" + "google-chrome" + "iina" + "intellij-idea" + "jordanbaird-ice" + "keka" + "raycast" + "rectangle" + "slack" + "stats" + "telegram" + "visual-studio-code" + "zoom" "claude" "batfi" - "docker" + "docker-desktop" + "cursor" "daisydisk" "ghostty" "hammerspoon" @@ -106,9 +105,9 @@ "logi-options+" "notion" "onyx" - "readdle-spark" "shottr" - "brave-browser" + "arc" + "obsidian" # Fonts "font-fontawesome" diff --git a/modules/system.nix b/modules/system.nix index ab144d1..f8e2051 100644 --- a/modules/system.nix +++ b/modules/system.nix @@ -229,8 +229,8 @@ man = "tldr"; nixrebuild = "sudo darwin-rebuild switch --flake ~/.config/nix-darwin"; nixupgrade = "cd ~/.config/nix-darwin && nix flake update"; - nixconfig = "code ~/.config/nix-darwin"; - sshconfig = "code ~/.ssh/config"; + nixconfig = "nvim ~/.config/nix-darwin"; + sshconfig = "nvim ~/.ssh/config"; # git g = "git";