diff --git a/flake.lock b/flake.lock index ec1419d..44d7b87 100644 --- a/flake.lock +++ b/flake.lock @@ -7,43 +7,43 @@ ] }, "locked": { - "lastModified": 1747020534, - "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", + "lastModified": 1752780124, + "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", + "rev": "c718918222bdb104397762dea67e6b397a7927fe", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8f83100..38b9072 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ # Specify your home configuration modules here, for example, # the path to your home.nix. - modules = [ ./noah-home.nix ]; + modules = [ ./home.nix ]; # Optionally use extraSpecialArgs # to pass through arguments to home.nix diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 06d8734..1946a2d 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -239,77 +239,14 @@ require("lazy").setup({ }, -- )))))) -- This one gives me vim-sexp like structural editing { - "julienvincent/nvim-paredit", - config = function() - local paredit = require('nvim-paredit') - paredit.setup({ - indent = { - enabled = true, - }, - --filetypes = {"clojure", "fennel", "janet"}, - keys = { - ["w"] = { - function() - -- place cursor and set mode to `insert` - paredit.cursor.place_cursor( - -- wrap element under cursor with `( ` and `)` - paredit.wrap.wrap_element_under_cursor("( ", ")"), - -- cursor placement opts - { placement = "inner_start", mode = "insert" } - ) - end, - "Wrap element insert head", - }, - - ["W"] = { - function() - paredit.cursor.place_cursor( - paredit.wrap.wrap_element_under_cursor("(", ")"), - { placement = "inner_end", mode = "insert" } - ) - end, - "Wrap element insert tail", - }, - -- same as above but for enclosing form - ["i"] = { - function() - paredit.cursor.place_cursor( - paredit.wrap.wrap_enclosing_form_under_cursor("( ", ")"), - { placement = "inner_start", mode = "insert" } - ) - end, - "Wrap form insert head", - }, - ["I"] = { - function() - paredit.cursor.place_cursor( - paredit.wrap.wrap_enclosing_form_under_cursor("(", ")"), - { placement = "inner_end", mode = "insert" } - ) - end, - "Wrap form insert tail", - }, - ["["] = { - function() - paredit.cursor.place_cursor( - paredit.wrap.wrap_enclosing_form_under_cursor("[", "]"), - { placement = "inner_start", mode = "insert" } - ) - end, - }, - ["{"] = { - function() - paredit.cursor.place_cursor( - paredit.wrap.wrap_enclosing_form_under_cursor("{", "}"), - { placement = "inner_end", mode = "insert" } - ) - end, - }, - }, - }) - end, + "chiefnoah/nvim-paredit", + opts = { + indent = { + enabled = true, + }, + }, lazy = true, - ft = { "hy", "scheme", "scm", "clojure", "fennel", "janet", "lisp", "python", "lua" } + ft = { "scheme", "scm", "clojure", "fennel", "janet", "lisp" } }, { "chiefnoah/nvim-paredit-janet",