This commit is contained in:
biscuit
2025-05-13 09:38:18 -05:00
parent 6f6145f1c0
commit 904529022f
8 changed files with 63 additions and 119 deletions
Generated
+10 -83
View File
@@ -1,23 +1,5 @@
{ {
"nodes": { "nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -25,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746413188, "lastModified": 1747106332,
"narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "narHash": "sha256-mOdRWJzJAMp0hF8aSResyp8BeOO5VoSng1uqtEq+8xI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "rev": "535a541b429c1e89f0955c160df1d6d2bfeaf802",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -38,35 +20,13 @@
"type": "github" "type": "github"
} }
}, },
"nix4nvchad": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
],
"nvchad-starter": "nvchad-starter"
},
"locked": {
"lastModified": 1746419967,
"narHash": "sha256-0Rst+it8hsUS08UyS0YtUUsFfDX0zkpflOhHzcMz5Zw=",
"owner": "nix-community",
"repo": "nix4nvchad",
"rev": "468b8f9a00e7fddb3cf031bb4e968c3d08562e4e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix4nvchad",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1746328495, "lastModified": 1746904237,
"narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -78,59 +38,26 @@
}, },
"nixpkgsveryold": { "nixpkgsveryold": {
"locked": { "locked": {
"lastModified": 1659446231, "lastModified": 1704290814,
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-21.11", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nvchad-starter": {
"flake": false,
"locked": {
"lastModified": 1746346803,
"narHash": "sha256-+z0LG/N+dCQY0vFCKEeBSifvzOB7+KFKtAZGJMKQpT0=",
"owner": "NvChad",
"repo": "starter",
"rev": "2b4293a4c10a29cb52eefc430d3d77582c1a24fd",
"type": "github"
},
"original": {
"owner": "NvChad",
"ref": "main",
"repo": "starter",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix4nvchad": "nix4nvchad",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgsveryold": "nixpkgsveryold" "nixpkgsveryold": "nixpkgsveryold"
} }
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
+17 -21
View File
@@ -3,14 +3,10 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgsveryold.url = "github:nixos/nixpkgs?ref=nixos-21.11"; nixpkgsveryold.url = "github:nixos/nixpkgs?ref=nixos-23.05";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # ensures version follows nixpkgs
nix4nvchad = {
url = "github:nix-community/nix4nvchad";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
#outputs = { self, nixpkgs, nixpkgsveryold }: #outputs = { self, nixpkgs, nixpkgsveryold }:
@@ -26,23 +22,23 @@
# }; # };
#}; #};
outputs = { nixpkgs, home-manager, ... } @ inputs: outputs = { self, nixpkgs, home-manager, ... }:
let let
system = "x86_64-linux"; lib = nixpkgs.lib;
pkgs = import nixpkgs { system = "x86_64-linux";
inherit system; pkgs = nixpkgs.legacyPackages.${system};
config = { in {
allowUnfree = false; nixosConfigurations = {
biscuit = lib.nixosSystem {
inherit system;
modules = [ ./nixos/configuration.nix ];
}; };
}; };
in { homeConfigurations = {
nixosConfigurations = { biscuit = home-manager.lib.homeManagerConfiguration {
biscuit = nixpkgs.lib.nixosSystem { inherit pkgs;
specialArgs = { inherit inputs system; }; modules = [ ./home-manager/home.nix ];
modules = [
./nixos/configuration.nix
];
};
}; };
}; };
};
} }
Binary file not shown.
+18 -7
View File
@@ -7,7 +7,7 @@
... ...
}: { }: {
imports = [ imports = [
inputs.nvchad4nix.homeManagerModule # ../packages/nvim/default.nix
]; ];
home = { home = {
@@ -15,18 +15,29 @@
homeDirectory = "/home/biscuit"; homeDirectory = "/home/biscuit";
}; };
home.packages = []; home.packages = [
# pkgs.neovim
];
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; # EDITOR = "nvim";
}; };
programs.home-manager.enable = true; home.file.".config/nvim" = {
programs.git.enable = true; source = ./nvchad;
programs.nvchad.enable - true; recursive = true;
force = true;
};
programs.git.enable = true;
programs.neovim.enable = true;
programs.bash.shellAliases = {
enable = true;
ll = "ls -l";
};
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
home.stateVersion = "23.11"; programs.home-manager.enable = true;
home.stateVersion = "23.05";
} }
Submodule home-manager/nvchad added at 2b4293a4c1
+8 -8
View File
@@ -52,8 +52,8 @@
vim # Default editor vim # Default editor
wget wget
git git
neovim
home-manager home-manager
# neovim
]; ];
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
@@ -61,13 +61,13 @@
# Enable experimental features # Enable experimental features
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nixpkgs = { #nixpkgs = {
overlays = [ # overlays = [
(final: prev: { # (final: prev: {
nvchad = inputs.nvchad4nix.packages.${pkgs.system}.nvchad; # nvchad = inputs.nvchad4nix.packages.${pkgs.system}.nvchad;
}) #})
]; #];
}; #};
# System state version # System state version
system.stateVersion = "24.11"; # Ensure this matches your NixOS version system.stateVersion = "24.11"; # Ensure this matches your NixOS version
} }
+9
View File
@@ -0,0 +1,9 @@
{ pkgs, ... }: {
home.file.".config/nvim" = {
source = ./nvchad;
recursive = true;
force = true;
};
}