From a976e0d3609f948b2bcd446205057abfba080eec Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Mon, 11 Jul 2022 16:46:10 +0200 Subject: [PATCH] moved echidna to flakes --- echidna.nix | 13 +++++------ flake.lock | 64 ++++++++++++++++++++++++++++++++++++++++++----------- flake.nix | 12 +++++++++- 3 files changed, 68 insertions(+), 21 deletions(-) diff --git a/echidna.nix b/echidna.nix index 00986bb..5d67645 100644 --- a/echidna.nix +++ b/echidna.nix @@ -12,6 +12,10 @@ in { (pkgs.pass.withExtensions (exts: [ exts.pass-otp ])) choose-pass pkgs.alacritty + pkgs.starship + pkgs.exa + pkgs.neovim + pkgs.mpc-cli pkgs.ansible pkgs.black pkgs.cheat @@ -30,7 +34,7 @@ in { pkgs.htop pkgs.imagemagick pkgs.jq - pkgs.khal + # pkgs.khal pkgs.khard pkgs.libmysqlclient.dev pkgs.mosh @@ -58,7 +62,7 @@ in { pkgs.vdirsyncer pkgs.virtualenv pkgs.wget - pkgs.wireguard + pkgs.wireguard-tools pkgs.yubikey-personalization pkgs.zsh ]; @@ -128,10 +132,5 @@ in { ]; }; - users.users.rilla = { - name = "rilla"; - home = "/Users/rilla"; - }; - system.stateVersion = 4; } diff --git a/flake.lock b/flake.lock index c6f84fc..51b2d4b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,17 +1,39 @@ { "nodes": { - "home-manager": { + "darwin": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1653340164, - "narHash": "sha256-t6BPApyasx6FOv2cEVyFBXvkEDrknyUe7bngMbNSBkA=", + "lastModified": 1651916036, + "narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1657396086, + "narHash": "sha256-4cQ6hEuewWoFkTBlu211JGxPQQ1Zyli8oEq1cu7cVeA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e66f0ff69a6c0698b35034b842c4b68814440778", + "rev": "c645cc9f82c7753450d1fa4d1bc73b64960a9d7a", "type": "github" }, "original": { @@ -38,11 +60,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1653145312, - "narHash": "sha256-affCuB0Boa8CDFykoJVPZfhHLBok7Sq+QEOJvo3Xf+k=", + "lastModified": 1656933710, + "narHash": "sha256-SVG8EqY1OTJWBRY4hpct2ZR2Rk0L8hCFkug3m0ABoZE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8b5e1bf2fd62adefff05ae67cd49440be93ea193", + "rev": "3bf48d3587d3f34f745a19ebc968b002ef5b5c5a", "type": "github" }, "original": { @@ -54,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653060744, - "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", + "lastModified": 1657447684, + "narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfd82985c273aac6eced03625f454b334daae2e8", + "rev": "5f43d8b088d3771274bcfb69d3c7435b1121ac88", "type": "github" }, "original": { @@ -69,11 +91,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1653087707, - "narHash": "sha256-zfno3snrzZTWQ2B7K53QHrGZwrjnJLTRPalymrSsziU=", + "lastModified": 1656782578, + "narHash": "sha256-1eMCBEqJplPotTo/SZ/t5HU6Sf2I8qKlZi9MX7jv9fw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009", + "rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b", "type": "github" }, "original": { @@ -84,12 +106,28 @@ }, "root": { "inputs": { + "darwin": "darwin", "home-manager": "home-manager", "impermanence": "impermanence", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" } + }, + "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d33b914..22718a8 100644 --- a/flake.nix +++ b/flake.nix @@ -9,9 +9,14 @@ }; impermanence.url = "github:nix-community/impermanence"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + darwin = { + url = "github:lnl7/nix-darwin/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; + outputs = { self, nixpkgs, nixpkgs-stable, nixos-hardware, home-manager - , impermanence }@inputs: { + , impermanence, darwin }@inputs: { nixosConfigurations = { trantor = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -44,5 +49,10 @@ ]; }; }; + + darwinConfigurations.echidna = darwin.lib.darwinSystem { + system = "x86_64-darwin"; + modules = [ ./echidna.nix ]; + }; }; }