commit 5d439ebf6fe601f62eac81601555cf43a858d516
parent 54e2d0cf74cdea702c28375fb53a9f95024f448e
Author: Vincent Demeester <vincent@sbr.pm>
Date: Sun, 25 Jun 2023 23:07:44 +0200
Adding devenv
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
4 files changed, 220 insertions(+), 20 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -24,9 +24,31 @@
"type": "github"
}
},
- "devshell": {
+ "devenv": {
"inputs": {
+ "flake-compat": "flake-compat_2",
+ "nix": "nix",
"nixpkgs": "nixpkgs_2",
+ "pre-commit-hooks": "pre-commit-hooks_2"
+ },
+ "locked": {
+ "lastModified": 1678113758,
+ "narHash": "sha256-mD3SkN43b1s5CJ8Rx3l2oK3Dqgs+6Ze0FfWrdMcrrYk=",
+ "owner": "cachix",
+ "repo": "devenv",
+ "rev": "6455f319fc90e0be2071327093c5458f9afc61bf",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "latest",
+ "repo": "devenv",
+ "type": "github"
+ }
+ },
+ "devshell": {
+ "inputs": {
+ "nixpkgs": "nixpkgs_3",
"systems": "systems_2"
},
"locked": {
@@ -45,9 +67,9 @@
},
"emacs-overlay": {
"inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_3",
- "nixpkgs-stable": "nixpkgs-stable_2"
+ "flake-utils": "flake-utils_3",
+ "nixpkgs": "nixpkgs_4",
+ "nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1686798424,
@@ -133,6 +155,22 @@
}
},
"flake-compat_4": {
+ "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"
+ }
+ },
+ "flake-compat_5": {
"locked": {
"lastModified": 1680531544,
"narHash": "sha256-8qbiDTYb1kGaDADRXTItpcMKQ1TeQVkuof6oEwHUvVA=",
@@ -230,6 +268,21 @@
}
},
"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"
+ }
+ },
+ "flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
@@ -247,7 +300,7 @@
"type": "github"
}
},
- "flake-utils_3": {
+ "flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
@@ -265,7 +318,7 @@
"type": "github"
}
},
- "flake-utils_4": {
+ "flake-utils_5": {
"inputs": {
"systems": "systems_5"
},
@@ -283,7 +336,7 @@
"type": "github"
}
},
- "flake-utils_5": {
+ "flake-utils_6": {
"inputs": {
"systems": "systems_6"
},
@@ -323,6 +376,28 @@
"type": "github"
}
},
+ "gitignore_2": {
+ "inputs": {
+ "nixpkgs": [
+ "devenv",
+ "pre-commit-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1660459072,
+ "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -381,7 +456,7 @@
},
"lib-aggregate": {
"inputs": {
- "flake-utils": "flake-utils_5",
+ "flake-utils": "flake-utils_6",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
@@ -398,10 +473,50 @@
"type": "github"
}
},
+ "lowdown-src": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1633514407,
+ "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
+ "owner": "kristapsdz",
+ "repo": "lowdown",
+ "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
+ "type": "github"
+ },
+ "original": {
+ "owner": "kristapsdz",
+ "repo": "lowdown",
+ "type": "github"
+ }
+ },
+ "nix": {
+ "inputs": {
+ "lowdown-src": "lowdown-src",
+ "nixpkgs": [
+ "devenv",
+ "nixpkgs"
+ ],
+ "nixpkgs-regression": "nixpkgs-regression"
+ },
+ "locked": {
+ "lastModified": 1676545802,
+ "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
+ "owner": "domenkozar",
+ "repo": "nix",
+ "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "domenkozar",
+ "ref": "relaxed-flakes",
+ "repo": "nix",
+ "type": "github"
+ }
+ },
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_2",
- "nixpkgs": "nixpkgs_5"
+ "nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1686545330,
@@ -478,8 +593,8 @@
},
"nixos-wsl": {
"inputs": {
- "flake-compat": "flake-compat_3",
- "flake-utils": "flake-utils_4",
+ "flake-compat": "flake-compat_4",
+ "flake-utils": "flake-utils_5",
"nixpkgs": [
"nixpkgs"
]
@@ -529,6 +644,22 @@
"type": "github"
}
},
+ "nixpkgs-regression": {
+ "locked": {
+ "lastModified": 1643052045,
+ "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+ "type": "github"
+ }
+ },
"nixpkgs-stable": {
"locked": {
"lastModified": 1685801374,
@@ -547,6 +678,22 @@
},
"nixpkgs-stable_2": {
"locked": {
+ "lastModified": 1673800717,
+ "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-22.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-stable_3": {
+ "locked": {
"lastModified": 1686736559,
"narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=",
"owner": "NixOS",
@@ -561,7 +708,7 @@
"type": "github"
}
},
- "nixpkgs-stable_3": {
+ "nixpkgs-stable_4": {
"locked": {
"lastModified": 1686392259,
"narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=",
@@ -595,7 +742,7 @@
},
"nixpkgs-wayland": {
"inputs": {
- "flake-compat": "flake-compat_4",
+ "flake-compat": "flake-compat_5",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": [
@@ -618,6 +765,22 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1677534593,
+ "narHash": "sha256-PuZSAHeq4/9pP/uYH1FcagQ3nLm/DrDrvKi/xC9glvw=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "3ad64d9e2d5bf80c877286102355b1625891ae9a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1677383253,
"narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
"owner": "NixOS",
@@ -632,7 +795,7 @@
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1686592866,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
@@ -648,7 +811,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1686592866,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
@@ -664,7 +827,7 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1686544600,
"narHash": "sha256-QRSZuGex5W+41zqm7NHXcokkgev8WULS8xGyQEpMXtI=",
@@ -717,14 +880,43 @@
"type": "github"
}
},
+ "pre-commit-hooks_2": {
+ "inputs": {
+ "flake-compat": [
+ "devenv",
+ "flake-compat"
+ ],
+ "flake-utils": "flake-utils_2",
+ "gitignore": "gitignore_2",
+ "nixpkgs": [
+ "devenv",
+ "nixpkgs"
+ ],
+ "nixpkgs-stable": "nixpkgs-stable_2"
+ },
+ "locked": {
+ "lastModified": 1677160285,
+ "narHash": "sha256-tBzpCjMP+P3Y3nKLYvdBkXBg3KvTMo3gvi8tLQaqXVY=",
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "rev": "2bd861ab81469428d9c823ef72c4bb08372dd2c4",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
"chapeau-rouge": "chapeau-rouge",
+ "devenv": "devenv",
"devshell": "devshell",
"emacs-overlay": "emacs-overlay",
"envfs": "envfs",
- "flake-compat": "flake-compat_2",
- "flake-utils": "flake-utils_3",
+ "flake-compat": "flake-compat_3",
+ "flake-utils": "flake-utils_4",
"flake-utils-plus": "flake-utils-plus",
"home-manager": "home-manager",
"home-manager-23_05": "home-manager-23_05",
@@ -734,7 +926,7 @@
"nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable",
"nixos-wsl": "nixos-wsl",
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_5",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur",
@@ -746,7 +938,7 @@
"nixpkgs": [
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_3"
+ "nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1686453485,
diff --git a/flake.nix b/flake.nix
@@ -13,6 +13,8 @@
inputs.flake-utils.follows = "flake-utils";
};
devshell = { type = "github"; owner = "numtide"; repo = "devshell"; };
+ devenv.url = "github:cachix/devenv/latest";
+
# Flake Dependencies
home-manager = { type = "github"; owner = "nix-community"; repo = "home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -72,6 +74,7 @@
, nixos-wsl
, nixos-hardware
, devshell
+ , devenv
, ...
} @ inputs:
let
@@ -118,6 +121,9 @@
nur.overlay
devshell.overlays.default
chapeau-rouge.overlays.openshift
+ (_: prev: {
+ inherit (devenv.packages.${prev.system}) devenv;
+ })
];
hostDefaults = {
diff --git a/tools/emacs/config/programming-eglot.el b/tools/emacs/config/programming-eglot.el
@@ -28,6 +28,7 @@
(c-mode . eglot-ensure)
(cc-mode . eglot-ensure)
(go-mode . eglot-ensure)
+ (go-ts-mode . eglot-ensure)
:custom
rustic-lsp-client 'eglot)
diff --git a/users/vincent/dev/default.nix b/users/vincent/dev/default.nix
@@ -16,6 +16,7 @@
home.packages = with pkgs; [
binutils
cmake
+ devenv
difftastic
fswatch
gnumake
