From 3b8a007e27c19b3840d6377cb3dab5764696d96c Mon Sep 17 00:00:00 2001 From: Akshay Date: Sun, 26 Dec 2021 15:00:52 +0530 Subject: okapi -> porcupine --- flake.lock | 141 +++++++++++++++++++++++++----------------- flake.nix | 4 +- home.nix | 1 - hosts/olive/configuration.nix | 13 ++-- 4 files changed, 91 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index d34ba4d..300d0af 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "fenix": { + "inputs": { + "nixpkgs": [ + "statix", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1638080655, + "narHash": "sha256-ZPx8e8CukEBx31IcgivAWnN9Jg0r+LTBPHV7fREf+QI=", + "owner": "nix-community", + "repo": "fenix", + "rev": "78a0c55b6f9d8bb6f3b89eb995fa5bbdd73e9475", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -31,55 +53,45 @@ "type": "github" } }, - "home-manager": { + "gitignore": { "inputs": { "nixpkgs": [ + "statix", "nixpkgs" ] }, "locked": { - "lastModified": 1634544068, - "narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f", + "lastModified": 1635165013, + "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "release-21.05", - "repo": "home-manager", + "owner": "hercules-ci", + "repo": "gitignore.nix", "type": "github" } }, - "import-cargo": { - "locked": { - "lastModified": 1594305518, - "narHash": "sha256-frtArgN42rSaEcEOYWg8sVPMUK+Zgch3c+wejcpX3DY=", - "owner": "edolstra", - "repo": "import-cargo", - "rev": "25d40be4a73d40a2572e0cc233b83253554f06c5", - "type": "github" + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] }, - "original": { - "owner": "edolstra", - "repo": "import-cargo", - "type": "github" - } - }, - "mozillapkgs": { - "flake": false, "locked": { - "lastModified": 1629225446, - "narHash": "sha256-HJX4Pc5ZUAg4apxB/XHuJ+6ukzvRQqeZMjscOBst2bA=", - "owner": "mozilla", - "repo": "nixpkgs-mozilla", - "rev": "0510159186dd2ef46e5464484fbdf119393afa58", + "lastModified": 1639871969, + "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "697cc8c68ed6a606296efbbe9614c32537078756", "type": "github" }, "original": { - "owner": "mozilla", - "repo": "nixpkgs-mozilla", + "owner": "nix-community", + "ref": "release-21.11", + "repo": "home-manager", "type": "github" } }, @@ -90,11 +102,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1635322515, - "narHash": "sha256-PdD6Q+Fo+0uahqj5uYDZ2T8s647W1WDx6HgQ5LDDp5Q=", + "lastModified": 1639901638, + "narHash": "sha256-ZMP2xjjo3tHlWfgCd3Odn6qKNpNbvbawjcVpww54A1U=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "fe10413485850c15c53744644721fd0c8a351d70", + "rev": "8f7a0bbc9080f55c000344658a071994aa9c6b4b", "type": "github" }, "original": { @@ -113,11 +125,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1635277393, - "narHash": "sha256-pFFB7267CdwMXK/rrWpmLFYzA3e7+2AD8MAh2EX1+PI=", + "lastModified": 1639886342, + "narHash": "sha256-OkI09enAc4ID1zrxLkHR5b+WgUL2r2C9BIG4+gwVDFU=", "owner": "neovim", "repo": "neovim", - "rev": "a5d6f36fc7e67aa008b4ae8a72b1367a765660b8", + "rev": "abdf3a8128b78fb98ee944bc5d3086c680d779ed", "type": "github" }, "original": { @@ -129,11 +141,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1635319124, - "narHash": "sha256-Ldh40imhLYF8kGy9wSI2NWW6qiB/9lJ0C6CT2Yr1L6E=", + "lastModified": 1639240632, + "narHash": "sha256-BAXhgnPOW1COIfZ9EOOFTdolalYS73MFHSRajgrSdZw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "0bb7b0906c353703c2eea36bd73134f0216f3e62", + "rev": "2a7063461c3751d83869a2a0a8ebc59e34bec5b2", "type": "github" }, "original": { @@ -144,11 +156,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1634782485, - "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", + "lastModified": 1639699734, + "narHash": "sha256-tlX6WebGmiHb2Hmniff+ltYp+7dRfdsBxw9YczLsP60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", + "rev": "03ec468b14067729a285c2c7cfa7b9434a04816c", "type": "github" }, "original": { @@ -160,27 +172,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1635280654, - "narHash": "sha256-n0DKD1rG4gLZx6vDnalrQ5obZA9Y7uaOShTDSaOWGhM=", + "lastModified": 1640443850, + "narHash": "sha256-s3EhD+iNjyIE/gZkV5vES6d0eI4dJ2WBlaXyUsEmaek=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ebb1dca9bb056649cbd023f953c0c4e7970bb72", + "rev": "6979c0e49bb491e18dd4870abb104cc7375aa7e8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.05", + "ref": "nixos-21.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1633422745, - "narHash": "sha256-gA6Ok64nPbkjHk3Oanq4641EeYkjcKhisDF9wBjLxEk=", + "lastModified": 1638036523, + "narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8e1eab9eae4278c9bb1dcae426848a581943db5a", + "rev": "9c191ebcdfe917043195c54ab6ae8e934434fe7b", "type": "github" }, "original": { @@ -199,18 +211,35 @@ "statix": "statix" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1638036899, + "narHash": "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=", + "owner": "rust-analyzer", + "repo": "rust-analyzer", + "rev": "d9b2291f546abc77d24499339a72a89127464b95", + "type": "github" + }, + "original": { + "owner": "rust-analyzer", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "statix": { "inputs": { - "import-cargo": "import-cargo", - "mozillapkgs": "mozillapkgs", + "fenix": "fenix", + "gitignore": "gitignore", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1635335003, - "narHash": "sha256-qFzUBZkKWSPll6g+ZfXnNAUMWy9sppK8o5gdZ56SFCk=", + "lastModified": 1639455627, + "narHash": "sha256-vqGwh1AndJAG4lpHtRhfkvu+yAoo0Qxym0c6Imr7StA=", "owner": "nerdypepper", "repo": "statix", - "rev": "f909b20c540ea99dddfd04b8439ee35b8dd703b8", + "rev": "94a2edf57340ac3f3a2276c88a221ba3125172af", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b454cc9..07b27e1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "nerdypepper's nixos config"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; nixos-hardware.url = "github:nixos/nixos-hardware"; home-manager = { - url = "github:nix-community/home-manager/release-21.05"; + url = "github:nix-community/home-manager/release-21.11"; inputs.nixpkgs.follows = "nixpkgs"; }; neovim.url = "github:nix-community/neovim-nightly-overlay"; diff --git a/home.nix b/home.nix index 11b5eb7..2341bc5 100644 --- a/home.nix +++ b/home.nix @@ -63,7 +63,6 @@ nixpkgs-review nixpkgs-fmt nix-prefetch-scripts - statix ] ++ (import ./scripts { inherit pkgs; }); diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix index f36bc3f..f25e6e4 100644 --- a/hosts/olive/configuration.nix +++ b/hosts/olive/configuration.nix @@ -23,15 +23,10 @@ "wlp2s0" ]; networks = { - Sanic = { - pskRaw = "03fbbe8c6b400af40c64ea475be59812ca1d13f40beaf0bf188c50a1e959c8fd"; - }; - Gopalan = { - pskRaw = "52f7f6548fa6f7f24965aae2bd7aa1a34d22a650cdc319d9d6a8567f91be85c8"; - }; - Srividhya = { - pskRaw = "f4302c17d20d0ac8791960495bb3ca4e790677d87d16a7d8c414350dd67c9713"; - }; + Sanic.pskRaw = "03fbbe8c6b400af40c64ea475be59812ca1d13f40beaf0bf188c50a1e959c8fd"; + Gopalan.pskRaw = "52f7f6548fa6f7f24965aae2bd7aa1a34d22a650cdc319d9d6a8567f91be85c8"; + Srividhya.pskRaw = "f4302c17d20d0ac8791960495bb3ca4e790677d87d16a7d8c414350dd67c9713"; + sage.pskRaw = "576e51f80e4a6c2c6928f5655b9a75db0dac80aba30626a96b93b67c7c66c761"; }; extraConfig = '' ctrl_interface=/run/wpa_supplicant -- cgit v1.2.3