deepak/nixconf
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

better now?

Browse Source
This commit is contained in:
Deepak Mallubhotla
2025-03-05 19:33:17 +00:00
parent 8a2a368b53
commit 2b289f4fa0
6 changed files with 97 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
flake.lock generated
View File

@@ -149,27 +149,6 @@
"type": "github"
}
},
"homeManager-23-11": {
"inputs": {
"nixpkgs": [
"nixpkgs-23-11"
]
},
"locked": {
"lastModified": 1719827415,
"narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
},
"homeManager-24-05": {
"inputs": {
"nixpkgs": [
@@ -207,22 +186,6 @@
"type": "github"
}
},
"nixpkgs-23-11": {
"locked": {
"lastModified": 1720535198,
"narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-24-05": {
"locked": {
"lastModified": 1735286948,
@@ -239,6 +202,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1731763621,
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nomodoro": {
"flake": false,
"locked": {
@@ -256,21 +235,56 @@
"type": "github"
}
},
"parrot-nvim": {
"flake": false,
"locked": {
"lastModified": 1740995822,
"narHash": "sha256-eKGoks9KP+cHKHZP8UXw59Yo0ovjfNn9/sdLFcj0GlM=",
"owner": "frankroeder",
"repo": "parrot.nvim",
"rev": "2ce83dfe94975da6b5f02fffeebcd6588753ab44",
"type": "github"
},
"original": {
"owner": "frankroeder",
"ref": "main",
"repo": "parrot.nvim",
"type": "github"
}
},
"root": {
"inputs": {
"NixOS-WSL": "NixOS-WSL",
"NixOS-WSL-2405": "NixOS-WSL-2405",
"cmp-vimtex": "cmp-vimtex",
"homeManager": "homeManager",
"homeManager-23-11": "homeManager-23-11",
"homeManager-24-05": "homeManager-24-05",
"nixpkgs": "nixpkgs",
"nixpkgs-23-11": "nixpkgs-23-11",
"nixpkgs-24-05": "nixpkgs-24-05",
"nomodoro": "nomodoro",
"parrot-nvim": "parrot-nvim",
"sops-nix": "sops-nix",
"spaceport-nvim": "spaceport-nvim"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1741043164,
"narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "sops-nix",
"type": "github"
}
},
"spaceport-nvim": {
"flake": false,
"locked": {

22
flake.nix
View File

@@ -5,20 +5,18 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-23-11.url = "github:NixOS/nixpkgs/nixos-23.11";
sops-nix.url = "github:Mic92/sops-nix";
# nixpkgs-23-11.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs-24-05.url = "github:NixOS/nixpkgs/nixos-24.05";
# only use this for Maxos, prefer specifying version explicitly
homeManager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
homeManager-23-11 = {
url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs-23-11";
};
homeManager-24-05 = {
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs-24-05";
@@ -43,15 +41,21 @@
url = "github:CWood-sdf/spaceport.nvim/main";
flake = false;
};
parrot-nvim = {
url = "github:frankroeder/parrot.nvim/main";
flake = false;
};
nomodoro = {
url = "github:dbinagi/nomodoro/main";
flake = false;
};
};
outputs = { self, nixpkgs, homeManager, NixOS-WSL, NixOS-WSL-2405, nixpkgs-23-11, nixpkgs-24-05, homeManager-23-11, homeManager-24-05, cmp-vimtex, spaceport-nvim, nomodoro, ...}@inputs:
outputs = { self, nixpkgs, homeManager, NixOS-WSL, NixOS-WSL-2405, nixpkgs-24-05, homeManager-24-05, cmp-vimtex, spaceport-nvim, nomodoro, ...}@inputs:
let
customPackageOverlay = (import ./overlays/default.nix { inherit cmp-vimtex; inherit spaceport-nvim; inherit nomodoro; }).overlay;
customPackageOverlay = (import ./overlays/default.nix { inherit cmp-vimtex; inherit spaceport-nvim; inherit nomodoro; parrot-nvim = inputs.parrot-nvim; }).overlay;
in
{
nixosConfigurations = (
@@ -62,9 +66,7 @@
inherit (nixpkgs) lib;
inherit NixOS-WSL;
inherit NixOS-WSL-2405;
inherit nixpkgs-23-11;
inherit nixpkgs-24-05;
inherit homeManager-23-11;
inherit homeManager-24-05;
inherit cmp-vimtex;
inherit customPackageOverlay;

7
home/deepak/home.nix
View File

@@ -1,5 +1,6 @@
{ pkgs, config, specialArgs, lib, ...}:
let pkgs-unstable = specialArgs.nixpkgs-unstable;
in
{
programs.home-manager.enable = true;
@@ -66,6 +67,7 @@
programs.neovim = {
enable = true;
package = pkgs-unstable.neovim-unwrapped;
defaultEditor = true;
vimAlias = true;
@@ -77,6 +79,8 @@
vim-nix
# plenary and stuff for telescope
plenary-nvim telescope-nvim telescope-file-browser-nvim
# need fzf for parrot
fzf-lua
ctrlp-vim
# lsp stuff
lsp-zero-nvim
@@ -116,6 +120,7 @@
pkgs.customVimPlugins.cmp-vimtex
pkgs.customVimPlugins.spaceport-nvim
pkgs.customVimPlugins.nomodoro
pkgs.customVimPlugins.parrot-nvim
# syntax highlighting
vim-just

9
home/deepak/neovim/init-vim.nix
View File

@@ -58,6 +58,15 @@ require("overseer").setup()
vim.api.nvim_set_keymap('n', '<leader>oo', '<cmd>OverseerToggle<CR>', { noremap = true})
vim.api.nvim_set_keymap('n', '<leader>or', '<cmd>OverseerRun<CR>', { noremap = true})
require("parrot").setup({
providers {
anthropic = {
api_key = os.getenv "ANTHROPIC_API_KEY",
},
ollama = {},
},
})
require("nomodoro").setup({
work_time = 10,
short_break_time = 2,

12
hosts/hosts.nix
View File

@@ -1,9 +1,14 @@
{ lib, inputs, nixpkgs-23-11, nixpkgs-24-05, homeManager, homeManager-23-11, homeManager-24-05, NixOS-WSL, NixOS-WSL-2405, customPackageOverlay, ... }:
{ lib, inputs, nixpkgs-24-05, homeManager, homeManager-24-05, NixOS-WSL-2405, customPackageOverlay, ... }:
let
linuxSystem = "x86_64-linux";
nixpkgs-unstable = inputs.nixpkgs.legacyPackages.${linuxSystem};
in
{
"maxos" = lib.nixosSystem {
system = "x86_64-linux";
system = linuxSystem;
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
};
modules = [
./maxos/configuration.nix
@@ -24,6 +29,7 @@
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
};
modules = [
./nixosWSL/configuration.nix
@@ -44,6 +50,7 @@
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
};
modules = [
./nixosEggYoke/configuration.nix
@@ -51,6 +58,7 @@
home-manager.extraSpecialArgs = {
withGUI = false;
gitSigningKey = "47831B15427F5A55";
inherit nixpkgs-unstable;
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {

8
overlays/default.nix
View File

@@ -1,4 +1,4 @@
{ cmp-vimtex, spaceport-nvim, nomodoro }:
{ cmp-vimtex, spaceport-nvim, nomodoro, parrot-nvim }:
{
overlay = final: prev:
let
@@ -14,12 +14,18 @@
src = nomodoro;
name = "nomodoro";
};
parrotNvimPlugin = prev.vimUtils.buildVimPlugin {
src = parrot-nvim;
name = "parrot-nvim";
};
in
{
customVimPlugins = {
cmp-vimtex = cmpVimtexPlugin;
spaceport-nvim = spaceportNvimPlugin;
nomodoro = nomodoroNvimPlugin;
parrot-nvim = parrotNvimPlugin;
};
};
}