From 3e5ebc66539ea08b41e906f35e5b1214e1cdbf8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 2 Jun 2022 18:06:52 +0200 Subject: [PATCH] :sparkles: better formatting --- flake.lock | 129 +++++++++++++++++++++++++++++++---------------------- flake.nix | 20 ++++----- 2 files changed, 83 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 5581038..beada60 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1648942457, - "narHash": "sha256-i29Z1t3sVfCNfpp+KAfeExvpqHQSbLO1KWylTtfradU=", + "lastModified": 1652712410, + "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", "owner": "ryantm", "repo": "agenix", - "rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01", + "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1649497545, - "narHash": "sha256-ScO19N/EVpmMzdN2kkfjYIJN7c0CQdZJ9qMZReqMpI4=", + "lastModified": 1654091479, + "narHash": "sha256-fw8BZSCgEMLAD1IYvnCxTwYAPCrobZmmE7Y+foydkLk=", "owner": "arkenfox", "repo": "user.js", - "rev": "4ff931781a1bf012e0e7e2ec89dc5c2a9bedd890", + "rev": "662eddbc2124d9d09774da7d5bc385f45c287c0d", "type": "github" }, "original": { @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1643556194, - "narHash": "sha256-mU/pD30cIRcodLROhbIpRuEoEsO9aV5lDrYav0ZSIUA=", + "lastModified": 1651170200, + "narHash": "sha256-pg9dLMFpi068vY30tmPOI7JPoE/YdihVYR1QEgWMG/U=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "abc25e69d0e18ce54dbe6d95a531c4d63ed59932", + "rev": "2aaa4ae5e646cc82ee036cd541ebc5e3c026e46a", "type": "github" }, "original": { @@ -113,12 +113,18 @@ } }, "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1650709546, - "narHash": "sha256-3RGDsUVqXQxOTPcWor9Hc8xT6qiZMKdfVrQrz9cLxqA=", + "lastModified": 1654170097, + "narHash": "sha256-byrZN3k78pwg15puULonJUzTSEDjf8/YCkdUm/abla8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9e103bfabd3e1adbfc4e5aab8d12b8fe70d78885", + "rev": "489651e2927fdf356b68123ed6f8c7910bfa7f7d", "type": "github" }, "original": { @@ -168,11 +174,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -183,11 +189,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -197,6 +203,21 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -214,11 +235,11 @@ "forgit-git": { "flake": false, "locked": { - "lastModified": 1649600616, - "narHash": "sha256-OBRqjXEMmazBZeEagdUylNaBIKzH4Z1Ro24C6e7CAcM=", + "lastModified": 1653782663, + "narHash": "sha256-sWWv9UJR1K8Q5ZTcU7xjJtk8hTRXywVjSL2gQ5Kqj0M=", "owner": "wfxr", "repo": "forgit", - "rev": "fa9fd624398643d53ea9cea61d66eca77ca7c46c", + "rev": "6385f85360b6fe0a1ac19cd5ce595b4f3921a2a7", "type": "github" }, "original": { @@ -255,11 +276,11 @@ ] }, "locked": { - "lastModified": 1650478719, - "narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=", + "lastModified": 1654113406, + "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", "owner": "nix-community", "repo": "home-manager", - "rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644", + "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", "type": "github" }, "original": { @@ -270,11 +291,11 @@ }, "master": { "locked": { - "lastModified": 1650714033, - "narHash": "sha256-qrNGzbuTd8ncrQAcv53x68iud57PkQyaOC8rOB2mya0=", + "lastModified": 1654184077, + "narHash": "sha256-mLdmWjkTyzHzP6A5sExEtDYjGX80tGcXgYORBSmBAFA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4e4feb0e0666c44a53c130efaf1082060104408d", + "rev": "295b42b8dff482cd1bcd9f68b090c315d95cdc24", "type": "github" }, "original": { @@ -313,11 +334,11 @@ ] }, "locked": { - "lastModified": 1650265945, - "narHash": "sha256-SO8+1db4jTOjnwP++29vVgImLIfETSXyoz0FuLkiikE=", + "lastModified": 1653413650, + "narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=", "owner": "nix-community", "repo": "naersk", - "rev": "e8f9f8d037774becd82fce2781e1abdb7836d7df", + "rev": "69daaceebe12c070cd5ae69ba38f277bbf033695", "type": "github" }, "original": { @@ -328,11 +349,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1650647760, - "narHash": "sha256-Ng8CGYLSTxeI+oEux0x+tSRA6K7ydoyfJNQf56ld+Uo=", + "lastModified": 1654007547, + "narHash": "sha256-G812EeXZeGeGjkAvbTleGwcKFCGxdLOQb9aViOWASPc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b80f570a92d04e8ace67ff09c34aa48708a5c88c", + "rev": "5643714dea562f0161529ab23058562afeff46d0", "type": "github" }, "original": { @@ -359,11 +380,11 @@ ] }, "locked": { - "lastModified": 1647744458, - "narHash": "sha256-DK1kfMVS88eqYAnIjvYMInECVuWCe4MUTtUIpVhLQGk=", + "lastModified": 1652312435, + "narHash": "sha256-5i9OAMRtEKsiKYlZvUlSRJWnN5BIp+nkt5Cld48TN4w=", "owner": "jtojnar", "repo": "nixpkgs-hammering", - "rev": "0c54b7121a21f79e580773a46fc8d51482dc1d1c", + "rev": "fa0acf3c4e055e90fde1031cf9e5054effbd06e5", "type": "github" }, "original": { @@ -374,7 +395,7 @@ }, "nixpkgs-review-checks": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "naersk": "naersk_2", "nixpkgs": [ "nixpkgs" @@ -382,11 +403,11 @@ "nixpkgs-hammering": "nixpkgs-hammering" }, "locked": { - "lastModified": 1650972245, - "narHash": "sha256-ierkAyTWOCpMBWIpH8Fy6VGnNdqFugZkQnKqMGWJcxM=", + "lastModified": 1654111051, + "narHash": "sha256-tC+YeAiY7hHyO+vBQk7lbWYQzOOTR73M6n39U/RL05c=", "owner": "SuperSandro2000", "repo": "nixpkgs-review-checks", - "rev": "0e94cb24f60cfbc8c3aed6bb5dcd6a86dd4b4648", + "rev": "59e8ac2585fc1bb60359cbcad8c2ab4a132ee03f", "type": "github" }, "original": { @@ -397,11 +418,11 @@ }, "nur": { "locked": { - "lastModified": 1650712914, - "narHash": "sha256-+33AFZ0hlU9OLSJVlKgpYj9+CJqTjJ3f8WidBnQ7Wj4=", + "lastModified": 1654182755, + "narHash": "sha256-IQbkgdKNcM2KpgMP+Rp0iaGQkl5mAfsk1PRW5iQP63M=", "owner": "nix-community", "repo": "NUR", - "rev": "f0c47c63e6773688228fd38630b93c8effd9bd33", + "rev": "2a85a97e696a0900ece7abe4d25881e5107211fa", "type": "github" }, "original": { @@ -449,16 +470,16 @@ }, "stable": { "locked": { - "lastModified": 1650610227, - "narHash": "sha256-ofSO6FrMfC8+wmYy6ItxOfXpN0E6sumnQYQCauMjKvM=", + "lastModified": 1654005557, + "narHash": "sha256-J6elwUzPoco+r5qWPHhvS2EHVWomUtNcxzkfdAQOwEU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "692729210d05e0ae2f33edfc072318520dd12666", + "rev": "08950a6e29cf7bddee466592eb790a417550f7f9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } @@ -472,11 +493,11 @@ ] }, "locked": { - "lastModified": 1645337357, - "narHash": "sha256-tAhWlvSh2ANWckdxYbNiYNk67dc3VliintqA2pwmsck=", + "lastModified": 1651418255, + "narHash": "sha256-GDQuU/IJHyu/4KF5HXi9YSAxut3TOHqTKQk5d2CTMJ8=", "owner": "nerdypepper", "repo": "statix", - "rev": "448e6f2096b855bee1464c514dfb73477fb39774", + "rev": "d197ae112457f68728e3495498b8ae1b6d087db0", "type": "github" }, "original": { @@ -502,14 +523,14 @@ }, "utils_2": { "inputs": { - "flake-utils": "flake-utils_2" + "flake-utils": "flake-utils_3" }, "locked": { - "lastModified": 1647259887, - "narHash": "sha256-yEkMbEHVO9qydluQ3uHGWX1PkfZhgDKxnd1rhZYZ72w=", + "lastModified": 1652704544, + "narHash": "sha256-UTKE33tYgCmDszaVyWA33a8mtegM5xfH4fH8w4y6TxA=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "06dba5f3b4fa2cc0bfc98ce9cd6f9a4d8db11d46", + "rev": "f8d6d1f87b6177e3bc674c29f247bdbf897ba274", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6095ea9..271c7fe 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ inputs = { master.url = "github:nixos/nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - stable.url = "github:nixos/nixpkgs/nixos-21.11"; + stable.url = "github:nixos/nixpkgs/nixos-22.05"; nur = { url = "github:nix-community/NUR"; @@ -80,7 +80,7 @@ }; }; - outputs = inputs@{ self, agenix, home-manager, nixpkgs, utils, base16, ... }: + outputs = inputs@{ self, nixpkgs, utils, ... }: utils.lib.mkFlake { inherit self inputs; @@ -91,7 +91,7 @@ ################ overlay = import ./overlays { inherit inputs; }; - overlays = utils.lib.exportOverlays { inherit (self) pkgs inputs; }; + # overlays = utils.lib.exportOverlays { inherit (self) pkgs inputs; }; channels.nixpkgs.overlaysBuilder = channels: [ self.overlay @@ -104,14 +104,10 @@ ### Modules ### ############### - nixosModules = utils.lib.exportModules [ - ./modules/default.nix - ./modules/containers - ./modules/gaming - ]; - + nixosModules = utils.lib.exportModules [ ./modules/default.nix ]; hostDefaults.modules = [ - home-manager.nixosModule + ./modules + inputs.home-manager.nixosModule { home-manager = { useGlobalPkgs = true; @@ -120,8 +116,8 @@ }; } self.nixosModules.default - agenix.nixosModules.age - base16.nixosModule + inputs.agenix.nixosModules.age + inputs.base16.nixosModule ]; hosts.nixos-laptop.modules =