diff --git a/.sops.yaml b/.sops.yaml old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/flake.lock b/flake.lock old mode 100755 new mode 100644 index 2704ed0..bc8b11f --- a/flake.lock +++ b/flake.lock @@ -82,6 +82,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1652776076, @@ -268,6 +289,28 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1767906546, + "narHash": "sha256-AoSWS8+P+7hQ/jIdv0wBjgH1MvnerdWBFXO4GV3JoQs=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "7eb8f36f085b85a2aeff929aff52d0f6aa14e000", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, "nypkgs": { "inputs": { "nixpkgs": [ @@ -347,6 +390,7 @@ "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", + "nixvim": "nixvim", "nypkgs": "nypkgs", "plasma-manager": "plasma-manager", "sops-nix": "sops-nix", @@ -391,9 +435,24 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix old mode 100755 new mode 100644 index d100861..0ed27ff --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,10 @@ nixpkgs.follows = "nixpkgs"; }; }; - + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; deploy-rs = { url = "github:serokell/deploy-rs"; inputs = { diff --git a/home/wsl.nix b/home/wsl.nix index 35168c8..5b21b32 100644 --- a/home/wsl.nix +++ b/home/wsl.nix @@ -12,6 +12,7 @@ let "${xlib.dirs.wsl-storage}/beets" = ".config/beets"; "${xlib.dirs.wsl-storage}/ssh/config" = ".ssh/config"; "${xlib.dirs.wsl-storage}/ssh/known_hosts" = ".ssh/known_hosts"; + "${xlib.dirs.wsl-storage}/flow" = ".config/flow"; }; mkLinks = lib.mapAttrs' (sourcePath: targetPath: { name = targetPath; diff --git a/modules/default.nix b/modules/default.nix index 9fe38c0..276c4f6 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -21,6 +21,7 @@ let sops-nix.nixosModules.sops # sops module self.homeConfigurations.default.nixosModule # default homeConfigurations disko.nixosModules.disko # disko module + nixvim.nixosModules.nixvim # nixvim module ]; _module.args = { inputs = inputs; diff --git a/modules/essentials/packages.nix b/modules/essentials/packages.nix index 770bc8b..34e8c21 100644 --- a/modules/essentials/packages.nix +++ b/modules/essentials/packages.nix @@ -47,8 +47,10 @@ rsync wget tree - ncdu + #ncdu dust + flow-control + csv-tui # Net Diagnostic mtr @@ -78,6 +80,10 @@ ]; }; programs = { + nixvim = { + enable = false; + colorschemes.github-theme.enable = true; + }; nano = { enable = true; nanorc = '' diff --git a/modules/essentials/shell.nix b/modules/essentials/shell.nix index c382cad..7d93821 100644 --- a/modules/essentials/shell.nix +++ b/modules/essentials/shell.nix @@ -39,6 +39,7 @@ ns = "nh os switch"; gp-ns = "gp && ns"; y = "yazi"; + nix-shellp = "nix-shell --run $SHELL -p"; # beets beet-ima = "beet im ./ -A"; diff --git a/pkgs/default.nix b/pkgs/default.nix old mode 100755 new mode 100644