From 7b7b7fad75f94f08264003d24dc7e6c4363784e8 Mon Sep 17 00:00:00 2001 From: rocketcamel Date: Sun, 26 Jan 2025 05:56:45 +0000 Subject: [PATCH] feat: rokit, EDITOR=nvim -> programs.neovim --- .config/nvim/init.lua | 0 .config/nvim/lazy-lock.json | 6 +-- .config/nvim/lua/rocketcamel/config/lazy.lua | 0 .config/nvim/lua/rocketcamel/init.lua | 0 .../nvim/lua/rocketcamel/plugins/conform.lua | 0 .config/nvim/lua/rocketcamel/plugins/lsp.lua | 0 .config/nvim/lua/rocketcamel/plugins/mini.lua | 0 .../lua/rocketcamel/plugins/rose-pine.lua | 0 .../lua/rocketcamel/plugins/telescope.lua | 0 .../lua/rocketcamel/plugins/treesitter.lua | 0 .config/nvim/lua/rocketcamel/remap.lua | 0 .config/nvim/lua/rocketcamel/set.lua | 0 .config/ohmyposh/zen.toml | 0 .config/ohmyposh/zen.toml.bak | 0 .stow-local-ignore | 0 nix/flake.lock | 23 ++++++++++- nix/flake.nix | 3 ++ nix/home-old.nix | 0 nix/hosts/tux/configuration.nix | 0 nix/hosts/tux/hardware-configuration.nix | 0 nix/hosts/wsl-kumatani/configuration.nix | 0 nix/hosts/wsl-usahara/configuration.nix | 0 nix/modules/commonPackages.nix | 40 +++++++++++-------- nix/modules/default.nix | 0 nix/modules/hm.nix | 0 nix/modules/i3.nix | 0 nix/modules/kanata.nix | 0 nix/users/luca/zsh.nix | 1 - 28 files changed, 52 insertions(+), 21 deletions(-) mode change 100644 => 100755 .config/nvim/init.lua mode change 100644 => 100755 .config/nvim/lazy-lock.json mode change 100644 => 100755 .config/nvim/lua/rocketcamel/config/lazy.lua mode change 100644 => 100755 .config/nvim/lua/rocketcamel/init.lua mode change 100644 => 100755 .config/nvim/lua/rocketcamel/plugins/conform.lua mode change 100644 => 100755 .config/nvim/lua/rocketcamel/plugins/lsp.lua mode change 100644 => 100755 .config/nvim/lua/rocketcamel/plugins/mini.lua mode change 100644 => 100755 .config/nvim/lua/rocketcamel/plugins/rose-pine.lua mode change 100644 => 100755 .config/nvim/lua/rocketcamel/plugins/telescope.lua mode change 100644 => 100755 .config/nvim/lua/rocketcamel/plugins/treesitter.lua mode change 100644 => 100755 .config/nvim/lua/rocketcamel/remap.lua mode change 100644 => 100755 .config/nvim/lua/rocketcamel/set.lua mode change 100644 => 100755 .config/ohmyposh/zen.toml mode change 100644 => 100755 .config/ohmyposh/zen.toml.bak mode change 100644 => 100755 .stow-local-ignore mode change 100644 => 100755 nix/flake.lock mode change 100644 => 100755 nix/flake.nix mode change 100644 => 100755 nix/home-old.nix mode change 100644 => 100755 nix/hosts/tux/configuration.nix mode change 100644 => 100755 nix/hosts/tux/hardware-configuration.nix mode change 100644 => 100755 nix/hosts/wsl-kumatani/configuration.nix mode change 100644 => 100755 nix/hosts/wsl-usahara/configuration.nix mode change 100644 => 100755 nix/modules/commonPackages.nix mode change 100644 => 100755 nix/modules/default.nix mode change 100644 => 100755 nix/modules/hm.nix mode change 100644 => 100755 nix/modules/i3.nix mode change 100644 => 100755 nix/modules/kanata.nix mode change 100644 => 100755 nix/users/luca/zsh.nix diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json old mode 100644 new mode 100755 index 35ca387..6a5ca69 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { - "conform.nvim": { "branch": "master", "commit": "b829ab38d0a52ba5869723dc7b8377fce4ec96dc" }, + "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, "fidget.nvim": { "branch": "main", "commit": "a0abbf18084b77d28bc70e24752e4f4fd54aea17" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "f90b6b820062fc06d6d51ed61a0f9b7f9a13b01b" }, + "mini.nvim": { "branch": "main", "commit": "7a75a970d0bae09ef579e41dbb20551bdf596f31" }, "nvim-lspconfig": { "branch": "master", "commit": "b4d65bce97795438ab6e1974b3672c17a4865e3c" }, - "nvim-treesitter": { "branch": "master", "commit": "51562d44fc6280f92bb9a3d87e7b3cb327377ca5" }, + "nvim-treesitter": { "branch": "master", "commit": "f3d7c0dafcbc86c4d63f765649c884a03bc1360a" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "rose-pine": { "branch": "main", "commit": "42f0724e0bca9f57f0bcfa688787c37b8d4befe8" }, "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" } diff --git a/.config/nvim/lua/rocketcamel/config/lazy.lua b/.config/nvim/lua/rocketcamel/config/lazy.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lua/rocketcamel/init.lua b/.config/nvim/lua/rocketcamel/init.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lua/rocketcamel/plugins/conform.lua b/.config/nvim/lua/rocketcamel/plugins/conform.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lua/rocketcamel/plugins/lsp.lua b/.config/nvim/lua/rocketcamel/plugins/lsp.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lua/rocketcamel/plugins/mini.lua b/.config/nvim/lua/rocketcamel/plugins/mini.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lua/rocketcamel/plugins/rose-pine.lua b/.config/nvim/lua/rocketcamel/plugins/rose-pine.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lua/rocketcamel/plugins/telescope.lua b/.config/nvim/lua/rocketcamel/plugins/telescope.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lua/rocketcamel/plugins/treesitter.lua b/.config/nvim/lua/rocketcamel/plugins/treesitter.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lua/rocketcamel/remap.lua b/.config/nvim/lua/rocketcamel/remap.lua old mode 100644 new mode 100755 diff --git a/.config/nvim/lua/rocketcamel/set.lua b/.config/nvim/lua/rocketcamel/set.lua old mode 100644 new mode 100755 diff --git a/.config/ohmyposh/zen.toml b/.config/ohmyposh/zen.toml old mode 100644 new mode 100755 diff --git a/.config/ohmyposh/zen.toml.bak b/.config/ohmyposh/zen.toml.bak old mode 100644 new mode 100755 diff --git a/.stow-local-ignore b/.stow-local-ignore old mode 100644 new mode 100755 diff --git a/nix/flake.lock b/nix/flake.lock old mode 100644 new mode 100755 index ebca231..10a6103 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -88,11 +88,32 @@ "type": "github" } }, + "rokit": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737867604, + "narHash": "sha256-Zqez88FVTfXX0MXwIBKhV9RRQrqFYj5sxtschbloaL0=", + "owner": "rocketcamel", + "repo": "rokit-nix", + "rev": "e70887b617a7c38e767497aeb51a07d0ae23817d", + "type": "github" + }, + "original": { + "owner": "rocketcamel", + "repo": "rokit-nix", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "rokit": "rokit" } } }, diff --git a/nix/flake.nix b/nix/flake.nix old mode 100644 new mode 100755 index 49e00c3..afa391b --- a/nix/flake.nix +++ b/nix/flake.nix @@ -6,6 +6,8 @@ nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + rokit.url = "github:rocketcamel/rokit-nix"; + rokit.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = @@ -52,6 +54,7 @@ "nix-command" "flakes" ]; + environment.systemPackages = [ inputs.rokit.packages.x86_64-linux.rokit ]; } ] ++ ( diff --git a/nix/home-old.nix b/nix/home-old.nix old mode 100644 new mode 100755 diff --git a/nix/hosts/tux/configuration.nix b/nix/hosts/tux/configuration.nix old mode 100644 new mode 100755 diff --git a/nix/hosts/tux/hardware-configuration.nix b/nix/hosts/tux/hardware-configuration.nix old mode 100644 new mode 100755 diff --git a/nix/hosts/wsl-kumatani/configuration.nix b/nix/hosts/wsl-kumatani/configuration.nix old mode 100644 new mode 100755 diff --git a/nix/hosts/wsl-usahara/configuration.nix b/nix/hosts/wsl-usahara/configuration.nix old mode 100644 new mode 100755 diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix old mode 100644 new mode 100755 index 7cb90db..e87cbcf --- a/nix/modules/commonPackages.nix +++ b/nix/modules/commonPackages.nix @@ -7,20 +7,28 @@ description = "Common packages"; }; }; - config.commonPackages = with pkgs; [ - wget - busybox - curl - stow - gh - oh-my-posh - neovim - ripgrep - git - gcc - rustup - nixfmt-rfc-style - asciiquarium - ]; - config.programs.nix-ld.enable = true; + config = { + commonPackages = with pkgs; [ + wget + busybox + curl + stow + gh + oh-my-posh + neovim + ripgrep + git + gcc + rustup + nixfmt-rfc-style + asciiquarium + ]; + programs.nix-ld.enable = true; + + programs.neovim = { + enable = true; + defaultEditor = true; + vimAlias = true; + }; + }; } diff --git a/nix/modules/default.nix b/nix/modules/default.nix old mode 100644 new mode 100755 diff --git a/nix/modules/hm.nix b/nix/modules/hm.nix old mode 100644 new mode 100755 diff --git a/nix/modules/i3.nix b/nix/modules/i3.nix old mode 100644 new mode 100755 diff --git a/nix/modules/kanata.nix b/nix/modules/kanata.nix old mode 100644 new mode 100755 diff --git a/nix/users/luca/zsh.nix b/nix/users/luca/zsh.nix old mode 100644 new mode 100755 index a93da4a..07cc35c --- a/nix/users/luca/zsh.nix +++ b/nix/users/luca/zsh.nix @@ -3,7 +3,6 @@ enableCompletion = true; autosuggestion.enable = true; envExtra = '' - EDITOR=nvim . "$HOME/.rokit/env" eval "$(oh-my-posh init zsh -c ~/.config/ohmyposh/zen.toml)" '';