From b1b38cef35d5a4c1c03493805735fd8103997fbb Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Sun, 10 Mar 2024 12:27:44 +0100 Subject: [PATCH] add dev shell --- flake.lock | 28 ++++++++++++++-------------- flake.nix | 27 ++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index d1329d1..1fb0d2c 100644 --- a/flake.lock +++ b/flake.lock @@ -496,11 +496,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1709988192, - "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", + "lastModified": 1710062421, + "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", + "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", "type": "github" }, "original": { @@ -521,11 +521,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1709999282, - "narHash": "sha256-8tcRPSMPJUc4gQaZS0X7YROMUTqXPt8nlqEV8fFwUeQ=", + "lastModified": 1710069451, + "narHash": "sha256-r9ZQji6W+N4Q2i074mGa/YTP0QeZkw5z5kmZGgMa6Xk=", "ref": "refs/heads/master", - "rev": "6d85a0a4f3da81c13b71add48927c4abecffd675", - "revCount": 11, + "rev": "cc46761cf2ea99d394b72838d9e3ac0d1df8b551", + "revCount": 14, "type": "git", "url": "ssh://gitea@pi1.odie.intranet/odie/home-manager-flake.git" }, @@ -816,11 +816,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -896,16 +896,16 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1710021367, + "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c9f5219..b814a6a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,14 @@ description = "A very basic flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; flake-utils.url = "github:numtide/flake-utils"; - nixos-wsl.url = "github:nix-community/NixOS-WSL"; home-manager.url = "github:nix-community/home-manager"; + home-manager-flake.url = "git+ssh://gitea@pi1.odie.intranet/odie/home-manager-flake.git"; neovim-flake.url = "git+ssh://gitea@pi1.odie.intranet/odie/neovim-flake.git"; + + nixos-wsl.url = "github:nix-community/NixOS-WSL"; }; outputs = inputs@{ self, nixpkgs, flake-utils, nixos-wsl, home-manager, ... }: @@ -35,8 +37,27 @@ ]; }; }; + overlays = []; + mkPkgs = system: + import nixpkgs { + inherit system overlays; + config.allowUnfree = true; + }; in { nixosConfigurations = mkSystem "x86_64-linux" "wsl-dev" // { }; - }; + } + // flake-utils.lib.eachDefaultSystem + (system: + let + pkgs = mkPkgs system; + in + { + formatter = pkgs.alejandra; + devShells = { + default = pkgs.mkShell { + name = "nixos"; + }; + }; + }); }