diff --git a/flake.lock b/flake.lock index 7988cf3..f9a6730 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1756059815, - "narHash": "sha256-UALOxoXoFIHbwKzcqbqCAqw5cC0MJEehLaWSet5vxfE=", + "lastModified": 1758543057, + "narHash": "sha256-lw3V2jOGYphUFHYQ5oARcb6urlbNpUCLJy1qhsGdUmc=", "owner": "Homebrew", "repo": "brew", - "rev": "02947ea4edbdef5fcce9ee57fa289547f4d096c9", + "rev": "5b236456eb93133c2bd0d60ef35ed63f1c0712f6", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.6.7", + "ref": "4.6.12", "repo": "brew", "type": "github" } @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1758447883, - "narHash": "sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg=", + "lastModified": 1758805352, + "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "25381509d5c91bbf3c30e23abc6d8476d2143cd1", + "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", "type": "github" }, "original": { @@ -58,11 +58,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1758464306, - "narHash": "sha256-i56XRXqjwJRdVYmpzVUQ0ktqBBHqNzQHQMQvFRF/acQ=", + "lastModified": 1759761710, + "narHash": "sha256-6ZG7VZZsbg39gtziGSvCJKurhIahIuiCn+W6TGB5kOU=", "owner": "nix-community", "repo": "home-manager", - "rev": "939e91e1cff1f99736c5b02529658218ed819a2a", + "rev": "929535c3082afdf0b18afec5ea1ef14d7689ff1c", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1758527843, - "narHash": "sha256-wMSROPpEDvvXrKQgYrs4g5DIDhMbvPylHK29UJJNfW0=", + "lastModified": 1759820126, + "narHash": "sha256-cI3AAv8E7nqYubCsyiK9yUbu4/VGCQxPK7OhuqxHgl0=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "b2e54c47433806a328297a8cec59f5e25a7c8a3d", + "rev": "22a7df4cddadc0dcbd8979b0de71969499a84e76", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1758527680, - "narHash": "sha256-i+qOd7ihfFf1j09HveUfcaIF8jeNsod8uDE5et3iGVc=", + "lastModified": 1759820815, + "narHash": "sha256-+Vvp3P80aJdgRqIxgiib18jLufL8EU3v+mzn49no/Ow=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "894e3660c1145b8ecf242d6a2b6177af287c5e49", + "rev": "77597d194798c9e61b0395d65d3119d6da4dba9a", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1756398546, - "narHash": "sha256-n4GVDLhKu65XFraJuCzap2AaZji4xhPaZMTJ8aQdD3s=", + "lastModified": 1758598228, + "narHash": "sha256-qr60maXGbZ4FX5tejPRI3nr0bnRTnZ3AbbbfO6/6jq4=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "3aa475996cb3bc1ecefa88c99c466e6f0bc17431", + "rev": "f36e5db56e117f7df701ab152d0d2036ea85218c", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758531458, - "narHash": "sha256-ms7H9jBSOjMySr8yuJmLwDn0elpMbckRF8gOUanXJJo=", + "lastModified": 1759820878, + "narHash": "sha256-1BZSdHl5r3KiH+NvI4dz7OQH/2rDSBsblBtO9pwN62U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e347d154312188158f25a4711b9763fe0ec955c9", + "rev": "9bfda15c4dd398b0a5a174af8fce80383161a401", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758294315, - "narHash": "sha256-H+C4c+jKCZpSJHODHFaY6b2ciB3Hv00V5QKA7yUVtis=", + "lastModified": 1759632233, + "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90ade7da38aa49c2e2693a04a44662a0e61530e9", + "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1758459270, - "narHash": "sha256-r2VA33WYfxDJyWmJeo0TmPPrk9yGS9WWb/kld0e7X+I=", + "lastModified": 1759792642, + "narHash": "sha256-BPZK3jHFFXWuQFDbR6wG8uIksmStODfwWp2TQEC1NEA=", "owner": "nix-community", "repo": "nixvim", - "rev": "92ba37a3e8c25d470f9affe8d5f36f2cfb21e5dd", + "rev": "9bdedc05109b44f97cdf757b3910fda8f86bc28d", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1758272005, - "narHash": "sha256-1u3xTH+3kaHhztPmWtLAD8LF5pTYLR2CpsPFWTFnVtQ=", + "lastModified": 1758662783, + "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", "owner": "NuschtOS", "repo": "search", - "rev": "aa975a3757f28ce862812466c5848787b868e116", + "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", "type": "github" }, "original": { @@ -375,11 +375,11 @@ ] }, "locked": { - "lastModified": 1758425756, - "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", + "lastModified": 1759635238, + "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", + "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", "type": "github" }, "original": { diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index d975569..d441203 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -2,10 +2,9 @@ homebrew = { enable = true; casks = [ + "hey-desktop" "zen" + "pareto-security" ]; - masApps = { - "wipr2" = 1662217862; - }; }; } diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix index 310a2a6..256d668 100644 --- a/modules/darwin/packages.nix +++ b/modules/darwin/packages.nix @@ -4,7 +4,7 @@ with pkgs; [ dockutil mas raycast - tailscale + # tailscale + whatsapp-for-mac xcodes - # whatsapp-for-mac ] diff --git a/modules/home/default.nix b/modules/home/default.nix index bcbb981..a5304f7 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -6,13 +6,14 @@ imports = [ ./atuin.nix ./bash.nix - ./jujutsu.nix ./bat.nix ./direnv.nix ./eza.nix ./fish.nix ./fzf.nix ./git.nix + ./jjui.nix + ./jujutsu.nix ./mise.nix ./neovim ./opencode.nix diff --git a/modules/home/jjui.nix b/modules/home/jjui.nix new file mode 100644 index 0000000..056e1fc --- /dev/null +++ b/modules/home/jjui.nix @@ -0,0 +1,5 @@ +{ + programs.jjui = { + enable = true; + }; +} diff --git a/modules/home/neovim/plugins/lsp.nix b/modules/home/neovim/plugins/lsp.nix index 2acfb7d..1db8daf 100644 --- a/modules/home/neovim/plugins/lsp.nix +++ b/modules/home/neovim/plugins/lsp.nix @@ -9,6 +9,10 @@ inlayHints = true; servers = { nil_ls.enable = true; + cssls.enable = true; + dockerls.enable = true; + elixirls.enable = true; + yamlls.enable = true; vtsls = { enable = true; package = pkgs.vtsls; @@ -19,7 +23,6 @@ globalPlugins = [ { name = "@vue/typescript-plugin"; - # Keep your working path to the language server package location = "${pkgs.vue-language-server}/lib/language-tools/packages/language-server"; languages = ["vue"]; configNamespace = "typescript"; @@ -30,10 +33,6 @@ }; }; }; - cssls.enable = true; - dockerls.enable = true; - elixirls.enable = false; - yamlls.enable = true; }; }; }; diff --git a/modules/home/neovim/plugins/toggleterm.nix b/modules/home/neovim/plugins/toggleterm.nix index 4c840c5..7ccd20a 100644 --- a/modules/home/neovim/plugins/toggleterm.nix +++ b/modules/home/neovim/plugins/toggleterm.nix @@ -17,4 +17,4 @@ shell = "fish"; }; }; -} \ No newline at end of file +} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 332ccdf..55abe07 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -8,12 +8,12 @@ }: { imports = [ ../core.nix - ./firewall.nix - ./ssh.nix + ../syncthing.nix + ../tailscale.nix ./adguard.nix ./docker.nix - ../tailscale.nix - ../syncthing.nix + ./firewall.nix + ./ssh.nix sops-nix.nixosModules.sops ]; diff --git a/modules/packages.nix b/modules/packages.nix index 2b102f8..57b8756 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -19,7 +19,6 @@ with pkgs; [ gnupg htop hyperfine - jjui jq killall lsof diff --git a/modules/tailscale.nix b/modules/tailscale.nix index 06f06f1..762182a 100644 --- a/modules/tailscale.nix +++ b/modules/tailscale.nix @@ -1,14 +1,8 @@ -{ - pkgs, - lib, - ... -}: { - services.tailscale = - { - enable = true; - } - // lib.optionalAttrs pkgs.stdenv.isLinux { - openFirewall = true; - useRoutingFeatures = "server"; - }; +{lib, pkgs, ...}: { + services.tailscale = { + enable = true; + } // lib.optionalAttrs pkgs.stdenv.isLinux { + openFirewall = true; + useRoutingFeatures = "server"; + }; } diff --git a/overlays/default.nix b/overlays/default.nix index d704d68..3bc05b9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,16 +1,17 @@ -{ inputs }: -let +{inputs}: let dir = builtins.readDir ./.; overlayNames = builtins.sort builtins.lessThan (builtins.filter ( name: - name != "default.nix" + name + != "default.nix" && dir.${name} == "regular" && builtins.match ".*\\.nix" name != null ) (builtins.attrNames dir)); overlayPath = name: builtins.toPath "${builtins.toString ./.}/${name}"; - loadOverlay = name: - let - overlayModule = import (overlayPath name); - in overlayModule { inherit inputs; }; -in map loadOverlay overlayNames + loadOverlay = name: let + overlayModule = import (overlayPath name); + in + overlayModule {inherit inputs;}; +in + map loadOverlay overlayNames diff --git a/overlays/zjstatus.nix b/overlays/zjstatus.nix index c1d49a7..d306436 100644 --- a/overlays/zjstatus.nix +++ b/overlays/zjstatus.nix @@ -1,4 +1,3 @@ -{ inputs }: -final: prev: { +{inputs}: final: prev: { zjstatus = inputs.zjstatus.packages.${prev.system}.default; }