Added hack to fetch local flake

This commit is contained in:
Aleksandr Lebedev 2025-01-06 23:53:32 +01:00
parent b66cb9f49d
commit cbbe4aea64
4 changed files with 43 additions and 29 deletions

17
flake.lock generated
View file

@ -638,14 +638,19 @@
"nvf": "nvf" "nvf": "nvf"
}, },
"locked": { "locked": {
"lastModified": 1, "dir": "nixos/modules/neovim",
"narHash": "sha256-m1itEjykrVXFp6BlxlVKtLRMIBHISlNhdRjyFC8P22g=", "lastModified": 1736202585,
"path": "nixos/modules/neovim", "narHash": "sha256-1GCCwcb7Zf/dUCRBw8OLKGcvN5qypAHqkJdcBf5ANpA=",
"type": "path" "owner": "kylekrein",
"repo": "nixos-config",
"rev": "b66cb9f49d20914e0ca1aea0e0ee109790c47e17",
"type": "github"
}, },
"original": { "original": {
"path": "nixos/modules/neovim", "dir": "nixos/modules/neovim",
"type": "path" "owner": "kylekrein",
"repo": "nixos-config",
"type": "github"
} }
}, },
"nil": { "nil": {

View file

@ -6,7 +6,7 @@
url = "github:nixos/nixpkgs?ref=nixos-unstable"; url = "github:nixos/nixpkgs?ref=nixos-unstable";
}; };
neovim = { neovim = {
url = "path:nixos/modules/neovim"; url = "github:kylekrein/nixos-config?dir=nixos/modules/neovim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
@ -75,7 +75,10 @@
}; };
darwinConfigurations = { darwinConfigurations = {
"kylekrein-air" = inputs.nix-darwin.lib.darwinSystem { "kylekrein-air" = inputs.nix-darwin.lib.darwinSystem {
specialArgs = {inherit self;}; specialArgs = {
inherit self;
inherit inputs;
};
modules = [./nixos/hosts/kylekrein-air]; modules = [./nixos/hosts/kylekrein-air];
}; };
}; };

View file

@ -1,25 +1,31 @@
{ self, pkgs, ... }: { {
# List packages installed in system profile. To search by name, run: self,
# $ nix-env -qaP | grep wget pkgs,
environment.systemPackages = with pkgs;[ inputs,
neovim ...
kitty }: {
yazi # List packages installed in system profile. To search by name, run:
]; # $ nix-env -qaP | grep wget
environment.systemPackages = with pkgs; [
neovim
kitty
yazi
inputs.neovim.packages.${pkgs.system}.default
];
# Necessary for using flakes on this system. # Necessary for using flakes on this system.
nix.settings.experimental-features = "nix-command flakes"; nix.settings.experimental-features = "nix-command flakes";
# Enable alternative shell support in nix-darwin. # Enable alternative shell support in nix-darwin.
# programs.fish.enable = true; # programs.fish.enable = true;
# Set Git commit hash for darwin-version. # Set Git commit hash for darwin-version.
system.configurationRevision = self.rev or self.dirtyRev or null; system.configurationRevision = self.rev or self.dirtyRev or null;
# Used for backwards compatibility, please read the changelog before changing. # Used for backwards compatibility, please read the changelog before changing.
# $ darwin-rebuild changelog # $ darwin-rebuild changelog
system.stateVersion = 5; system.stateVersion = 5;
# The platform the configuration will be used on. # The platform the configuration will be used on.
nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.hostPlatform = "aarch64-darwin";
} }

View file

@ -7,8 +7,8 @@
spellcheck.enable = true; spellcheck.enable = true;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
shiftwidth = 4; shiftwidth = 16;
tabstop = 4; tabstop = 16;
useSystemClipboard = true; useSystemClipboard = true;
lineNumberMode = "number"; lineNumberMode = "number";