Zynh0722
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Zynh0722:bcbf30fd2e8b79b68bf389023fae51f411c2cbfc
Branches Tags
Zynh0722:main
Zynh0722:sh-initrd-on-root
Zynh0722:aarch64
Zynh0722:archive/x86
..
compare: Zynh0722:cf890bde0c8cd04d1cba9b2ca3ea5f2c9ac997d9
Branches Tags
Zynh0722:main
Zynh0722:sh-initrd-on-root
Zynh0722:aarch64
Zynh0722:archive/x86

No commits in common. "bcbf30fd2e8b79b68bf389023fae51f411c2cbfc" and "cf890bde0c8cd04d1cba9b2ca3ea5f2c9ac997d9" have entirely different histories.
bcbf30fd2e ... cf890bde0c

4 changed files with 31 additions and 214 deletions
Show Stats Expand all files Collapse all files

6
configuration.nix
View File

@ -119,9 +119,9 @@
dotnet-sdk_8 dotnet-sdk_8
nixpkgs-fmt nixpkgs-fmt
stylua stylua
# steam steam
# spotify spotify
# discord discord
]; ];
}; };

203
flake.lock
View File

@ -16,151 +16,6 @@
"url": "https://git.zynh.me/Zynh0722/omf-theme" "url": "https://git.zynh.me/Zynh0722/omf-theme"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"neovim-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715865404,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"neovim-overlay",
"hercules-ci-effects",
"nixpkgs"
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore",
"nixpkgs": [
"neovim-overlay",
"nixpkgs"
],
"nixpkgs-stable": [
"neovim-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1716213921,
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"neovim-overlay",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"neovim-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1713898448,
"narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "c0302ec12d569532a6b6bd218f698bc402e93adc",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -181,62 +36,7 @@
"type": "github" "type": "github"
} }
}, },
"neovim-overlay": {
"inputs": {
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1716827514,
"narHash": "sha256-5qS9Jn3FaEFMGGhS/1mLOUifMFDLPcLczjcdaN7xgyE=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "7849e018a09688cd71bde887113954b3ce08739c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"type": "github"
}
},
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1716642936,
"narHash": "sha256-l53vGzYIy6tI1rYBlbxW502sDgpmZ4i/uTdWWtPKPtM=",
"owner": "neovim",
"repo": "neovim",
"rev": "52389e724366ebb2fb58f08c657f580900dd09ee",
"type": "github"
},
"original": {
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1716588411,
"narHash": "sha256-CdAZ3o459+1mAgILcdJfMBQAwUXupVe2cVTknvxs5kQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1a9df4f74273f90d04e621e8516777efcec2802a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1708807242, "lastModified": 1708807242,
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
@ -256,8 +56,7 @@
"inputs": { "inputs": {
"fish_theme": "fish_theme", "fish_theme": "fish_theme",
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim-overlay": "neovim-overlay", "nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs_2"
} }
} }
}, },

2
flake.nix
View File

@ -4,8 +4,6 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
neovim-overlay.url = "github:nix-community/neovim-nightly-overlay";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

34
home.nix
View File

@ -61,10 +61,30 @@
programs.neovim = programs.neovim =
let let
package = inputs.neovim-overlay.packages.${pkgs.system}.default; treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
p.bash
nvim-treesitter = pkgs.vimPlugins.nvim-treesitter; p.comment
treesitterWithGrammars = (nvim-treesitter.withPlugins (_: nvim-treesitter.allGrammars)); p.css
p.dockerfile
p.fish
p.gitattributes
p.gitignore
p.go
p.gomod
p.gowork
p.javascript
p.json5
p.json
p.lua
p.make
p.markdown
p.nix
p.python
p.rust
p.toml
p.typescript
p.yaml
]));
treesitter-parsers = pkgs.symlinkJoin { treesitter-parsers = pkgs.symlinkJoin {
name = "treesitter-parsers"; name = "treesitter-parsers";
@ -72,9 +92,9 @@
}; };
in in
{ {
inherit package;
enable = true; enable = true;
withNodeJs = true;
# extraConfig = ''vim.opt.runtimepath:append ("${treesitter-parsers}")'';
extraLuaConfig = '' extraLuaConfig = ''
-- bootstrap lazy.nvim, LazyVim and your plugins -- bootstrap lazy.nvim, LazyVim and your plugins
require("config.lazy") require("config.lazy")
@ -83,10 +103,10 @@
vim.opt.runtimepath:append ("${treesitter-parsers}") vim.opt.runtimepath:append ("${treesitter-parsers}")
''; '';
plugins = [ plugins = [
treesitterWithGrammars treesitterWithGrammars
]; ];
withNodeJs = true;
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.