From fdc3f191593dec28edff715101bd3a8170d9a776 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sat, 30 Jul 2022 18:18:04 +0200 Subject: [PATCH] WIP: Add webserver --- flake.lock | 38 +++++++++++++++++----------------- flake.nix | 20 +++++++++++------- home/programs/nvim/plugins.nix | 18 ++++++++-------- 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 0420559..5fb885a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,7 @@ "darwin": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { @@ -69,7 +69,7 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ], "utils": "utils" }, @@ -97,11 +97,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1659077058, - "narHash": "sha256-C0HKHyeRp/ifJ9yacgTdbwu9RZRtKLjGUiKnE8kUElg=", + "lastModified": 1659102441, + "narHash": "sha256-lo2FFXnvbHnMkaTwveAiILiVpmdHsCkgsTNEcRa5Ihc=", "owner": "neovim", "repo": "neovim", - "rev": "02efdb4d587242122df99b347a25fd4c96b0ca97", + "rev": "e59bc078de624a5f3220bfd2713be3f8978c5672", "type": "github" }, "original": { @@ -116,15 +116,15 @@ "flake-compat": "flake-compat", "neovim-flake": "neovim-flake", "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { - "lastModified": 1659082600, - "narHash": "sha256-9oYbGTpY0AG4otRlXeFif/e4BzfAzW7sZW3Z9Hfy0IU=", + "lastModified": 1659168958, + "narHash": "sha256-UIhemfmjXfV+EOpM7wWMgIPkss+fZk/kdewUj/VxzXc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "a95f350ae46ee90213078dffc351013bae797b94", + "rev": "ea3b5e4598985d44aafb79ef05252759fe5ceeb4", "type": "github" }, "original": { @@ -136,7 +136,7 @@ "nifoc-overlay": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { @@ -153,13 +153,13 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs": { "locked": { - "lastModified": 1659072678, - "narHash": "sha256-tOAZdTFilNCASEkwS2wCtSQkfWle7JKb4fXgKgTbpRc=", + "lastModified": 1659102345, + "narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1a1bd86756ca15f8bafdce4499d6a88089bec3b6", + "rev": "11b60e4f80d87794a2a4a8a256391b37c59a1ea7", "type": "github" }, "original": { @@ -175,7 +175,7 @@ "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", "nifoc-overlay": "nifoc-overlay", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs": "nixpkgs", "zig-overlay": "zig-overlay" } }, @@ -198,15 +198,15 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { - "lastModified": 1659056111, - "narHash": "sha256-Mbyp0uHZYXTHMaB2Ik4+kE/5fs+c0NXJ7OmJuBk6Dk8=", + "lastModified": 1659141726, + "narHash": "sha256-ScMJKdwxR81TQElEkhQJGjhVJDzWgfZGbyMPAISkqxY=", "owner": "arqv", "repo": "zig-overlay", - "rev": "965e5272ef9e12189349a95c12c3a40866aaa19a", + "rev": "769d2845d9369eadfa9a06f8fffc2f8d727ef5bb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1384f3a..f463d44 100644 --- a/flake.nix +++ b/flake.nix @@ -1,41 +1,45 @@ { inputs = { - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; darwin = { url = "github:lnl7/nix-darwin"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; neovim-nightly-overlay = { url = "github:nix-community/neovim-nightly-overlay"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; zig-overlay = { url = "github:arqv/zig-overlay"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; nifoc-overlay = { url = "github:nifoc/nix-overlay"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = inputs@{ self, ... }: let config-Styx = import ./system/flakes/Styx.nix { - nixpkgs = inputs.nixpkgs-unstable; + inherit (inputs) nixpkgs; inherit (inputs) home-manager; inherit (inputs) darwin; inherit inputs; }; + + config-sail = import ./system/flakes/sail.nix { + inherit (inputs) nixpkgs; + }; in - config-Styx; + config-Styx // config-sail; } diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 191fb15..911c4aa 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -252,23 +252,23 @@ }; LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "LuaSnip"; - version = "2022-07-27"; + version = "2022-07-29"; src = pkgs.fetchFromGitHub { owner = "L3MON4D3"; repo = "LuaSnip"; - rev = "53e812a6f51c9d567c98215733100f0169bcc20a"; - sha256 = "0qr84j39d4202ag1gvi26xilcsqwfw32d9lv96zc96a51l6r40y0"; + rev = "d8cacf83a214b7dd80986a8a24e4adf3fdd4f069"; + sha256 = "144qx4ypw1f36pmnk0q787a5mppbmlind4p1pivjqlg7gfzwdsnq"; fetchSubmodules = false; }; }; friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-07-27"; + version = "2022-07-30"; src = pkgs.fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "8c95fecb3960eb0d3d3b9bd582d49a613bd7a7fb"; - sha256 = "1y34pb7v7pk4zvjbab5bs5shcbxh0msiy6aijrkp119a1r0zpndj"; + rev = "1db69684a27eec0b9f520a5d7d95d414fc30ba91"; + sha256 = "1qsb92sl6nyihy63h0dyif8fnb39gpggf8s7xv4yf1wrlzxx30al"; fetchSubmodules = false; }; }; @@ -428,12 +428,12 @@ }; nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-07-11"; + version = "2022-07-30"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "40f20e6788e6ce850802cbd2ca029fbb66b5d043"; - sha256 = "0a7p0lvkb8x5cngr7h5vbljckx44lvmbmflwi045p1fcb2b9r250"; + rev = "559f05505184fcf7970c0c58c7940cbed7b2566c"; + sha256 = "06dv5zrg4iykdhvb3h3slzr1pj595ixn2dv3j9cx3g4pj4wdi7wc"; fetchSubmodules = false; }; };