From 6f6145f1c0e5f57206e0eb81faa8b3e01812b068 Mon Sep 17 00:00:00 2001 From: biscuit Date: Tue, 6 May 2025 14:58:15 -0500 Subject: [PATCH] backup --- app/nvim/default.nix | 0 flake.lock | 73 +++++++++++++++++++++++++++++++++++++ flake.nix | 43 +++++++++++----------- home-manager/.home.nix.swp | Bin 0 -> 12288 bytes home-manager/home.nix | 34 ++++++++++++++--- nixos/configuration.nix | 11 +++++- 6 files changed, 131 insertions(+), 30 deletions(-) create mode 100644 app/nvim/default.nix create mode 100644 home-manager/.home.nix.swp diff --git a/app/nvim/default.nix b/app/nvim/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/flake.lock b/flake.lock index 6e49a16..f845a6f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "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": { "inputs": { "nixpkgs": [ @@ -20,6 +38,28 @@ "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": { "locked": { "lastModified": 1746328495, @@ -52,12 +92,45 @@ "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": { "inputs": { "home-manager": "home-manager", + "nix4nvchad": "nix4nvchad", "nixpkgs": "nixpkgs", "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", diff --git a/flake.nix b/flake.nix index a4607e0..36a640b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nix4nvchad = { + url = "github:nix-community/nix4nvchad"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; #outputs = { self, nixpkgs, nixpkgsveryold }: @@ -22,28 +26,23 @@ # }; #}; - outputs = { self, nixpkgs, home-manager, ... } @ inputs: + outputs = { nixpkgs, home-manager, ... } @ inputs: let - system = "x86_64-linux"; - lib = nixpkgs.lib; - extraSpecialArgs = { inherit system inputs; }; - specialArgs = { inherit system inputs; }; - in { - nixosConfigurations = { - biscuit = lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = extraSpecialArgs; - modules = [ - ./nixos/configuration.nix - home-manager.nixosModules.home-manager { - home-manager = { - useGlobalPkgs = true; - users.biscuit = import ./home-manager/home.nix; - }; - } - ]; + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + config = { + allowUnfree = false; }; - - }; - }; + }; + in { + nixosConfigurations = { + biscuit = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs system; }; + modules = [ + ./nixos/configuration.nix + ]; + }; + }; + }; } diff --git a/home-manager/.home.nix.swp b/home-manager/.home.nix.swp new file mode 100644 index 0000000000000000000000000000000000000000..8e0dd67c7f227fdfca8cf345f97bf12925b7df0e GIT binary patch literal 12288 zcmeI&yG{Z@6b9gf9r2DKk7Mae7=01r zSy)42L8K)9oBWv!bLKGnb%g2GE>BKHQ`U)}4Wj13&QQ~UzLtr)f$gP%%T{JSQE(UA znH7`8$Gl6^8bv``*|Nry*|C8q*oOjME=Y{jk8F5;iCTE*d;*9q$;Jf3<5P$## zAOHafKmY;|fB*y_@Sg=9NQh#wXcOHF)J@0uRvZa^=Zrd^e$*ze$}X@=>y*=%+SnkD zxX{~g$a>vti#^flU!~Rw7mHDx8evD)=}_EGN_l%?V&ACH%C53QsUy|B(cHnAR8QMy z-*Frm-E*-SW&OuD<*WHkdawO+jMQoqsW5BcO&9Np?nMwKsk3F#i=#o{mql{z^Gr%9 H9$NGbyQFeW literal 0 HcmV?d00001 diff --git a/home-manager/home.nix b/home-manager/home.nix index a17572e..6c82dc5 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,10 +1,32 @@ -{ inputs, config, pkgs, ... }: - { - home.username = "biscuit"; - home.homeDirectory = "/home/biscuit"; + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + imports = [ + inputs.nvchad4nix.homeManagerModule + ]; - programs.bash.enable = true; - home.stateVersion = "23.11"; # Adjust to your system version + home = { + username = "biscuit"; + homeDirectory = "/home/biscuit"; + }; + + home.packages = []; + home.sessionVariables = { + EDITOR = "nvim"; + }; + + programs.home-manager.enable = true; + programs.git.enable = true; + programs.nvchad.enable - true; + + + systemd.user.startServices = "sd-switch"; + + home.stateVersion = "23.11"; } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index c418558..49e5f03 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -43,7 +43,6 @@ isNormalUser = true; description = "Biscuit"; extraGroups = [ "networkmanager" "wheel" ]; - initialPassword = "biscuitforeveryone"; packages = with pkgs; []; }; @@ -53,6 +52,8 @@ vim # Default editor wget git + neovim + home-manager ]; # Enable the OpenSSH daemon. @@ -60,7 +61,13 @@ # Enable experimental features nix.settings.experimental-features = [ "nix-command" "flakes" ]; - +nixpkgs = { + overlays = [ + (final: prev: { + nvchad = inputs.nvchad4nix.packages.${pkgs.system}.nvchad; + }) + ]; +}; # System state version system.stateVersion = "24.11"; # Ensure this matches your NixOS version }