diff options
| -rw-r--r-- | bash.nix (renamed from sh.nix) | 10 | ||||
| -rw-r--r-- | darwin-common.nix | 2 | ||||
| -rw-r--r-- | flake.nix | 22 | ||||
| -rw-r--r-- | hosts/bear/configuration.nix | 5 | ||||
| -rw-r--r-- | hosts/kenosis/configuration.nix | 4 | ||||
| -rw-r--r-- | hosts/nepsis/configuration.nix | 1 | ||||
| -rw-r--r-- | linux-common.nix | 2 | ||||
| -rw-r--r-- | nvf/nvf.nix | 28 | ||||
| -rw-r--r-- | vim.nix | 4 | ||||
| -rw-r--r-- | zsh.nix | 16 |
10 files changed, 51 insertions, 43 deletions
@@ -24,16 +24,6 @@ nix-upd-sl = "sudo nix flake update my-slstatus my-dwm my-surf my-st my-dmenu"; }; }; - programs.zsh = { - enable = true; - enableAutosuggestions = true; - enableBashCompletion = true; - enableCompletion = true; - enableFastSyntaxHighlighting = true; - enableFzfCompletion = true; - enableFzfGit = true; - enableFzfHistory = true; - }; environment.etc."inputrc".text = '' set editing-mode vi diff --git a/darwin-common.nix b/darwin-common.nix index 9c52c20..9351cca 100644 --- a/darwin-common.nix +++ b/darwin-common.nix @@ -5,7 +5,7 @@ ... }: { imports = [ - ./sh.nix + ./zsh.nix ]; # List packages installed in system profile. To search by name, run: @@ -60,16 +60,20 @@ } @ inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; - customNeovim = nvf.lib.neovimConfiguration { + nvim = nvf.lib.neovimConfiguration { inherit pkgs; modules = [./nvf/nvf.nix]; }; - system2 = "aarch64-darwin"; - darwin-pkgs = nixpkgs.legacyPackages.${system2}; + system-darwin = "aarch64-darwin"; + pkgs-darwin = nixpkgs.legacyPackages.${system-darwin}; + nvim-darwin = nvf.lib.neovimConfiguration { + pkgs = pkgs-darwin; + modules = [./nvf/nvf.nix]; + }; in { nixosConfigurations.nepsis = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs customNeovim;}; + specialArgs = {inherit inputs nvim;}; modules = [ hjem.nixosModules.default ./linux-common.nix @@ -78,7 +82,7 @@ ]; }; nixosConfigurations.icon = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs customNeovim;}; + specialArgs = {inherit inputs nvim;}; modules = [ hjem.nixosModules.default ./linux-common.nix @@ -87,12 +91,12 @@ ]; }; - packages.${system}.my-neovim = customNeovim.neovim; + packages.${system}.nvim = nvim.neovim; + packages.${system-darwin}.nvim = nvim-darwin.neovim; - packages.${system2}.my-neovim = customNeovim.neovim; darwinConfigurations = { kenosis = nix-darwin.lib.darwinSystem { - specialArgs = {inherit inputs customNeovim;}; + specialArgs = {inherit inputs nvim-darwin;}; modules = [ ./darwin-common.nix ./hosts/kenosis/configuration.nix @@ -116,7 +120,7 @@ ]; }; bear = nix-darwin.lib.darwinSystem { - specialArgs = {inherit inputs customNeovim;}; + specialArgs = {inherit inputs nvim-darwin;}; modules = [ ./darwin-common.nix ./hosts/bear/configuration.nix diff --git a/hosts/bear/configuration.nix b/hosts/bear/configuration.nix index ef46691..ae17167 100644 --- a/hosts/bear/configuration.nix +++ b/hosts/bear/configuration.nix @@ -2,7 +2,7 @@ config, pkgs, inputs, - customNeovim, + nvim-darwin, ... }: { networking = { @@ -15,13 +15,12 @@ # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = with pkgs; [ - customNeovim.neovim + nvim-darwin.neovim senpai mpv pass passExtensions.pass-otp passExtensions.pass-update - passExtensions.pass-import ]; programs.ssh = { diff --git a/hosts/kenosis/configuration.nix b/hosts/kenosis/configuration.nix index 637db89..8c2df15 100644 --- a/hosts/kenosis/configuration.nix +++ b/hosts/kenosis/configuration.nix @@ -2,7 +2,7 @@ config, pkgs, inputs, - customNeovim, + nvim, ... }: { networking = { @@ -35,7 +35,7 @@ librewolf lazygit fastfetch - customNeovim.neovim + nvim.neovim git go-swag blender diff --git a/hosts/nepsis/configuration.nix b/hosts/nepsis/configuration.nix index 980fc31..0cf4c69 100644 --- a/hosts/nepsis/configuration.nix +++ b/hosts/nepsis/configuration.nix @@ -11,7 +11,6 @@ ./../../hjem.nix ./../../audio.nix ./../../vim.nix - ./../../sh.nix ]; networking.hostName = "nepsis"; diff --git a/linux-common.nix b/linux-common.nix index 024646c..8dae24d 100644 --- a/linux-common.nix +++ b/linux-common.nix @@ -5,7 +5,7 @@ ... }: { imports = [ - ./sh.nix + ./bash.nix ]; # Bootloader. diff --git a/nvf/nvf.nix b/nvf/nvf.nix index 0903c5d..34597f7 100644 --- a/nvf/nvf.nix +++ b/nvf/nvf.nix @@ -241,16 +241,16 @@ docker-language-server gopls golangci-lint-langserver - vscode-langservers-extracted - emmet-language-server + # vscode-langservers-extracted + # emmet-language-server lua-language-server marksman nixd - basedpyright - ruff - sqls - deno - vtsls + # basedpyright + # ruff + # sqls + # deno + # vtsls yaml-language-server zls @@ -262,7 +262,7 @@ jq stylua nixpkgs-fmt - sqlfluff + # sqlfluff prettypst # linter @@ -273,14 +273,14 @@ golangci-lint selene markdownlint-cli2 - statix - eslint - yamllint + # statix + # eslint + # yamllint # debugger - lldb - delve - python313Packages.debugpy + # lldb + # delve + # python313Packages.debugpy # tree sitter tree-sitter @@ -1,7 +1,7 @@ { config, pkgs, - customNeovim, + nvim, ... }: { environment.systemPackages = with pkgs; [ @@ -14,7 +14,7 @@ ''; }) - customNeovim.neovim + nvim.neovim ]; environment.etc."vimrc".text = '' @@ -0,0 +1,16 @@ +{ + config, + pkgs, + ... +}: { + programs.zsh = { + enable = true; + enableAutosuggestions = true; + enableBashCompletion = true; + enableCompletion = true; + enableFastSyntaxHighlighting = true; + enableFzfCompletion = true; + enableFzfGit = true; + enableFzfHistory = true; + }; +} |