diff options
| -rw-r--r-- | flake.lock | 33 | ||||
| -rw-r--r-- | flake.nix | 26 | ||||
| -rw-r--r-- | nix/mkSystem.nix | 1 | ||||
| -rw-r--r-- | tools/default.nix | 4 |
4 files changed, 11 insertions, 53 deletions
diff --git a/flake.lock b/flake.lock index b6f534b..3d07120 100644 --- a/flake.lock +++ b/flake.lock @@ -105,24 +105,6 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1662220400, - "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", - "owner": "nix-community", - "repo": "naersk", - "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 0, @@ -153,18 +135,6 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 0, - "narHash": "sha256-/l1HI2tFLihda6yh+j848GlRDVUiSJPr+yzA7ip8Z84=", - "path": "/nix/store/wi84fkkl5lq0bmf7c1jycax5vrw7fl6s-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1658355931, "narHash": "sha256-/l1HI2tFLihda6yh+j848GlRDVUiSJPr+yzA7ip8Z84=", "owner": "nixos", @@ -224,8 +194,7 @@ "emacs-overlay": "emacs-overlay", "futils": "futils", "home-manager": "home-manager", - "naersk": "naersk", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", diff --git a/flake.nix b/flake.nix index 4715339..1bb9b3d 100644 --- a/flake.nix +++ b/flake.nix @@ -30,8 +30,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - naersk.url = "github:nix-community/naersk"; - pre-commit-hooks = { type = "github"; owner = "cachix"; @@ -48,25 +46,21 @@ outputs = { self, ... }@inputs: let inherit (inputs.futils.lib) eachSystem system; - mySystems = [ - system.x86_64-linux - ]; + mySystems = [ system.x86_64-linux ]; eachMySystem = eachSystem mySystems; lib = import ./nix { inherit inputs; }; in eachMySystem (system: let - naersk = inputs.naersk; pkgs = import inputs.nixpkgs { inherit system; }; home-manager = inputs.home-manager.defaultPackage."${system}"; in - rec - { + rec { packages = pkgs // { inherit home-manager; - tools = import ./tools { inherit pkgs naersk; }; + tools = import ./tools { inherit pkgs; }; ops = import ./ops { inherit pkgs; }; users.fcuny = import ./users/fcuny { inherit pkgs; }; }; @@ -78,23 +72,21 @@ hooks = { trailing-whitespace = { enable = true; - entry = "${pkgs.python3Packages.pre-commit-hooks}/bin/trailing-whitespace-fixer"; + entry = + "${pkgs.python3Packages.pre-commit-hooks}/bin/trailing-whitespace-fixer"; types = [ "text" ]; }; end-of-file-fixer = { enable = true; - entry = "${pkgs.python3Packages.pre-commit-hooks}/bin/end-of-file-fixer"; + entry = + "${pkgs.python3Packages.pre-commit-hooks}/bin/end-of-file-fixer"; types = [ "text" ]; }; - nixpkgs-fmt = { - enable = true; - }; + nixpkgs-fmt = { enable = true; }; - terraform-format = { - enable = true; - }; + terraform-format = { enable = true; }; shellcheck = { enable = true; diff --git a/nix/mkSystem.nix b/nix/mkSystem.nix index e33ddf7..1f7ccaf 100644 --- a/nix/mkSystem.nix +++ b/nix/mkSystem.nix @@ -15,7 +15,6 @@ inputs.nixpkgs.lib.nixosSystem { inputs.emacs-overlay.overlay inputs.nur.overlay inputs.rust.overlay - inputs.naersk.overlay (final: prev: { tools = import "${self}/tools" { pkgs = prev; }; }) diff --git a/tools/default.nix b/tools/default.nix index 17ece45..fc60a7e 100644 --- a/tools/default.nix +++ b/tools/default.nix @@ -1,4 +1,4 @@ -{ pkgs, naersk, ... }: +{ pkgs, ... }: pkgs.lib.makeScope pkgs.newScope (pkgs: { dnsupdate = pkgs.callPackage ./dnsupdate { }; @@ -10,6 +10,4 @@ pkgs.lib.makeScope pkgs.newScope (pkgs: { ipconverter = pkgs.callPackage ./ipconverter { }; git-blame-stats = pkgs.callPackage ./git-blame-stats { }; - - sendsms = pkgs.callPackage ./sendsms { inherit naersk; }; }) |