daniel/dotfiles
1
0
Fork 0
Code Actions Activity

WIP: Add webserver

Browse source
This commit is contained in:
Daniel Kempkens 2022-07-30 18:18:04 +02:00
parent a3b4ab95f3
commit fdc3f19159
3 changed files with 40 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
flake.lock
View file

@ -3,7 +3,7 @@
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -69,7 +69,7 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
], ],
"utils": "utils" "utils": "utils"
}, },
@ -97,11 +97,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1659077058, "lastModified": 1659102441,
"narHash": "sha256-C0HKHyeRp/ifJ9yacgTdbwu9RZRtKLjGUiKnE8kUElg=", "narHash": "sha256-lo2FFXnvbHnMkaTwveAiILiVpmdHsCkgsTNEcRa5Ihc=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "02efdb4d587242122df99b347a25fd4c96b0ca97", "rev": "e59bc078de624a5f3220bfd2713be3f8978c5672",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,15 +116,15 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1659082600, "lastModified": 1659168958,
"narHash": "sha256-9oYbGTpY0AG4otRlXeFif/e4BzfAzW7sZW3Z9Hfy0IU=", "narHash": "sha256-UIhemfmjXfV+EOpM7wWMgIPkss+fZk/kdewUj/VxzXc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "a95f350ae46ee90213078dffc351013bae797b94", "rev": "ea3b5e4598985d44aafb79ef05252759fe5ceeb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -136,7 +136,7 @@
"nifoc-overlay": { "nifoc-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -153,13 +153,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1659072678, "lastModified": 1659102345,
"narHash": "sha256-tOAZdTFilNCASEkwS2wCtSQkfWle7JKb4fXgKgTbpRc=", "narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a1bd86756ca15f8bafdce4499d6a88089bec3b6", "rev": "11b60e4f80d87794a2a4a8a256391b37c59a1ea7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,7 +175,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nifoc-overlay": "nifoc-overlay", "nifoc-overlay": "nifoc-overlay",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs": "nixpkgs",
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
} }
}, },
@ -198,15 +198,15 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1659056111, "lastModified": 1659141726,
"narHash": "sha256-Mbyp0uHZYXTHMaB2Ik4+kE/5fs+c0NXJ7OmJuBk6Dk8=", "narHash": "sha256-ScMJKdwxR81TQElEkhQJGjhVJDzWgfZGbyMPAISkqxY=",
"owner": "arqv", "owner": "arqv",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "965e5272ef9e12189349a95c12c3a40866aaa19a", "rev": "769d2845d9369eadfa9a06f8fffc2f8d727ef5bb",
"type": "github" "type": "github"
}, },
"original": { "original": {

20
flake.nix
View file

@ -1,41 +1,45 @@
{ {
inputs = { inputs = {
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
darwin = { darwin = {
url = "github:lnl7/nix-darwin"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
neovim-nightly-overlay = { neovim-nightly-overlay = {
url = "github:nix-community/neovim-nightly-overlay"; url = "github:nix-community/neovim-nightly-overlay";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zig-overlay = { zig-overlay = {
url = "github:arqv/zig-overlay"; url = "github:arqv/zig-overlay";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nifoc-overlay = { nifoc-overlay = {
url = "github:nifoc/nix-overlay"; url = "github:nifoc/nix-overlay";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = inputs@{ self, ... }: outputs = inputs@{ self, ... }:
let let
config-Styx = import ./system/flakes/Styx.nix { config-Styx = import ./system/flakes/Styx.nix {
nixpkgs = inputs.nixpkgs-unstable; inherit (inputs) nixpkgs;
inherit (inputs) home-manager; inherit (inputs) home-manager;
inherit (inputs) darwin; inherit (inputs) darwin;
inherit inputs; inherit inputs;
}; };
config-sail = import ./system/flakes/sail.nix {
inherit (inputs) nixpkgs;
};
in in
config-Styx; config-Styx // config-sail;
} }

18
home/programs/nvim/plugins.nix
View file

@ -252,23 +252,23 @@
}; };
LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix { LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "LuaSnip"; pname = "LuaSnip";
version = "2022-07-27"; version = "2022-07-29";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "L3MON4D3"; owner = "L3MON4D3";
repo = "LuaSnip"; repo = "LuaSnip";
rev = "53e812a6f51c9d567c98215733100f0169bcc20a"; rev = "d8cacf83a214b7dd80986a8a24e4adf3fdd4f069";
sha256 = "0qr84j39d4202ag1gvi26xilcsqwfw32d9lv96zc96a51l6r40y0"; sha256 = "144qx4ypw1f36pmnk0q787a5mppbmlind4p1pivjqlg7gfzwdsnq";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix { friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2022-07-27"; version = "2022-07-30";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "8c95fecb3960eb0d3d3b9bd582d49a613bd7a7fb"; rev = "1db69684a27eec0b9f520a5d7d95d414fc30ba91";
sha256 = "1y34pb7v7pk4zvjbab5bs5shcbxh0msiy6aijrkp119a1r0zpndj"; sha256 = "1qsb92sl6nyihy63h0dyif8fnb39gpggf8s7xv4yf1wrlzxx30al";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -428,12 +428,12 @@
}; };
nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects"; pname = "nvim-treesitter-textobjects";
version = "2022-07-11"; version = "2022-07-30";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects"; repo = "nvim-treesitter-textobjects";
rev = "40f20e6788e6ce850802cbd2ca029fbb66b5d043"; rev = "559f05505184fcf7970c0c58c7940cbed7b2566c";
sha256 = "0a7p0lvkb8x5cngr7h5vbljckx44lvmbmflwi045p1fcb2b9r250"; sha256 = "06dv5zrg4iykdhvb3h3slzr1pj595ixn2dv3j9cx3g4pj4wdi7wc";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };