xyno/nix-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
Philipp Hochkamp 2023-03-06 20:46:03 +01:00
parent c27f88ec40
commit 44c2cd9bbc
4 changed files with 109 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

117
flake.lock generated
View file

@ -100,21 +100,34 @@
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1678097883,
"narHash": "sha256-IG/v/syRMm0OLjT7F/naRjqN6bvAQEhlIlnS4U5y5EQ=",
"lastModified": 1678127991,
"narHash": "sha256-wsm36K1cCAKXiuETDXnSBi3A4si/fPRnGAO+OIXRazU=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "3f8a6436e158849050e711574a97126a6d3fec02",
"rev": "c1355f8ece3ec5f73b42776401e459a05b48a715",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"id": "emacs-overlay",
"type": "indirect"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
@ -133,6 +146,21 @@
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -206,6 +234,52 @@
"type": "github"
}
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"dir": "contrib",
"lastModified": 1678060331,
"narHash": "sha256-JnKiZsG4MlNDNaSy9WvRJF2a6gaeiqtw0BmYNQ4DquQ=",
"owner": "neovim",
"repo": "neovim",
"rev": "e389b189021cb6b72cfd7583ce6fb5d8d3346d45",
"type": "github"
},
"original": {
"dir": "contrib",
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat",
"neovim-flake": "neovim-flake",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1678090567,
"narHash": "sha256-ZSKhaesPn2WHnqfshj6TDHO5ob1o+wgUjiP4oZ11eLc=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "13bcb7770ffa76e5e35a9dc1c12b146c22f10bdf",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1678095239,
@ -224,16 +298,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1678072060,
"narHash": "sha256-6a9Tbjhir5HxDx4uw0u6Z+LHUfYf7tsT9QxF9FN/32w=",
"lastModified": 1677932085,
"narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "47c003416297e4d59a5e3e7a8b15cdbdf5110560",
"rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -270,6 +344,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1678072060,
"narHash": "sha256-6a9Tbjhir5HxDx4uw0u6Z+LHUfYf7tsT9QxF9FN/32w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "47c003416297e4d59a5e3e7a8b15cdbdf5110560",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nnn-vim": {
"flake": false,
"locked": {
@ -382,8 +472,9 @@
"home-manager": "home-manager",
"impermanence": "impermanence",
"miro": "miro",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixpkgs-darwin": "nixpkgs-darwin",
"nixpkgs-master": "nixpkgs-master",
"nnn-vim": "nnn-vim",

9
flake.nix
View file

@ -16,6 +16,8 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs";
# programs
xynoblog.url = "github:thexyno/blog";
@ -27,10 +29,6 @@
rnix-lsp.url = "github:nix-community/rnix-lsp";
rnix-lsp.inputs.nixpkgs.follows = "nixpkgs";
## emacs
emacs-overlay.url = "github:nix-community/emacs-overlay";
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
## vim
nnn-vim.url = "github:mcchrish/nnn.vim";
nnn-vim.flake = false;
@ -75,6 +73,7 @@
inputs @ { self
, nixpkgs
, nixpkgs-darwin
, neovim-nightly-overlay
, nixpkgs-master
, agenix
, home-manager
@ -98,7 +97,7 @@
};
overlays = [
self.overlays.default
emacs-overlay.overlay
neovim-nightly-overlay.overlay
(final: prev: {
python3 = prev.python3.override {
packageOverrides = pyself: pysuper: {

2
hm-imports/nvim/default.nix
View file

@ -24,7 +24,7 @@
in
{
enable = true;
#package = pkgs.neovim-nightly;
package = pkgs.neovim-nightly;
extraConfig = ''
set runtimepath^=~/.config/nvim
lua dofile('${./config/nvim.lua}')

3
hosts/daedalus/default.nix
View file

@ -1,9 +1,6 @@
{ pkgs, inputs, lib, ... }:
with lib;
with lib.my;
let
myEmacs = pkgs.emacsNativeComp;
in
{
users.users.ragon = {