diff --git a/.config/nix/files/git/ignore_global b/.config/nix/files/git/ignore_global deleted file mode 100644 index 13ea445..0000000 --- a/.config/nix/files/git/ignore_global +++ /dev/null @@ -1,21 +0,0 @@ -# Vim -.*.sw[a-z] -*.un~ -Session.vim - -# macOS -.DS_Store - -# Thumbnails -._* - -# Files that might appear on external disk -.Spotlight-V100 -.Trashes - -# Python VirtualEnnv -venv/ - -# direnv -.envrc -.env diff --git a/.config/nix/modules/darwin.nix b/.config/nix/modules/darwin.nix index 1e78885..1f12647 100644 --- a/.config/nix/modules/darwin.nix +++ b/.config/nix/modules/darwin.nix @@ -43,6 +43,7 @@ experimental-features = nix-command flakes ''; programs.fish.enable = true; + security.pam.enableSudoTouchIdAuth = true; services.nix-daemon.enable = true; system.defaults = { dock.autohide = true; diff --git a/.config/nix/modules/home-manager.nix b/.config/nix/modules/home-manager.nix index 438a042..d8117c7 100644 --- a/.config/nix/modules/home-manager.nix +++ b/.config/nix/modules/home-manager.nix @@ -2,6 +2,7 @@ home.packages = with pkgs; [ babelfish bat + cachix diff-so-fancy direnv dockutil @@ -39,10 +40,6 @@ source = ../files/fish; recursive = true; }; - "git" = { - source = ../files/git; - recursive = true; - }; }; }; } diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 225f776..3abc6a0 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -330,6 +330,17 @@ require("lazy").setup({ end, }, + { + "edgedb/edgedb-vim", + ft = "edgeql", + config = function() + vim.api.nvim_create_autocmd( + { "BufRead", "BufNewFile" }, + { pattern = { "*.esdl", "*.edgeql" }, command = "setf edgeql" } + ) + end, + }, + -- gitsigns.nvim (https://github.com/lewis6991/gitsigns.nvim) { "lewis6991/gitsigns.nvim", diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index f88dc49..6fc364a 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -7,6 +7,7 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" }, + "edgedb-vim": { "branch": "master", "commit": "7f2516bec3a5ad137347fb703d0b2c88f1478f5b" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, @@ -35,11 +36,11 @@ "rasmus.nvim": { "branch": "main", "commit": "f824de95d446686e479781c0c2b778c177da528f" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, - "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "twoslash-queries.nvim": { "branch": "main", "commit": "ea2dd86618d3aa4e176bfafc31cab2b1d1feb157" }, "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, + "vim-tmux-navigator": { "branch": "master", "commit": "7db70e08ea03b3e4d91f63713d76134512e28d7e" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file