Update inputs

Signed-off-by: main <magic_rb@redalder.org>
This commit is contained in:
main 2022-04-18 23:19:34 +02:00
parent 42eeea33a6
commit 03e6940b04
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
6 changed files with 55 additions and 113 deletions

View file

@ -25,11 +25,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1643787431,
"narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=",
"lastModified": 1648475189,
"narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "4154ba1aaaf7333a916384c348d867d03b6f1409",
"rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
"type": "github"
},
"original": {
@ -64,11 +64,11 @@
"emacs": {
"flake": false,
"locked": {
"lastModified": 1647122078,
"narHash": "sha256-2uQUyf23WpXu2nF4kynD/Tm6yDL8NFrx3hiyzaSAtoM=",
"lastModified": 1650006558,
"narHash": "sha256-EstCPXqGMMAo1gegtB4Q/QYBiMGWtucKJ5qPraZwFTs=",
"owner": "emacs-mirror",
"repo": "emacs",
"rev": "49683652f8b7f3680b3bc76cfee39be0b8efd524",
"rev": "4d2aa420bd09ac5109a4c13bd163386ea276297e",
"type": "github"
},
"original": {
@ -79,11 +79,11 @@
},
"emacs-overlay": {
"locked": {
"lastModified": 1647105009,
"narHash": "sha256-lXB6eV1kttuoMxumLM+EtwDjYhKrBxPJTp3VIjjOAds=",
"lastModified": 1649992817,
"narHash": "sha256-ftWnBHg/lZ++3oSZlxaqKvkmnBjeFffy+DirQ0vl1ZA=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "de01e072b680fd65126900a37f4700eaba9f09e3",
"rev": "a71784bab52f5cd7875140284d469ba8dd938b7c",
"type": "github"
},
"original": {
@ -95,11 +95,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"lastModified": 1648199409,
"narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"type": "github"
},
"original": {
@ -110,26 +110,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"lastModified": 1649676176,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1610051610,
"narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github"
},
"original": {
@ -161,16 +146,16 @@
]
},
"locked": {
"lastModified": 1643933536,
"narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=",
"lastModified": 1649984295,
"narHash": "sha256-55dgKGs7W8eC3s9GYewll9y4IlP/KAlSinjQwshNpxM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2860d7e3bb350f18f7477858f3513f9798896831",
"rev": "d49d68f4196d32c5039cb9e91d730cee894f6f14",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-21.11",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
@ -200,11 +185,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1647033596,
"narHash": "sha256-7rQSktGC8+DmeyGOnzFMy1QwAYnw4JJphv+lEwFCwfU=",
"lastModified": 1649940927,
"narHash": "sha256-OpTA66dYzhDh8ygwYz3jVrkaC/tMKyXtrHEMNi5XVBM=",
"owner": "NixOS",
"repo": "nix",
"rev": "d5322698a2abbc6d141e1d244e17b0d226a2f18b",
"rev": "d6effddd3b9657988d1e86e1258c33de6ae4af2b",
"type": "github"
},
"original": {
@ -217,15 +202,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
],
"utils": "utils_2"
]
},
"locked": {
"lastModified": 1646694838,
"narHash": "sha256-CtxpyUuMRnNn+wsD3Oxi0YPnxESWj6C2l1rgED23LSQ=",
"lastModified": 1649885125,
"narHash": "sha256-6LQE506+5sVqJUasD101I6yOV2icKVK3+D0qvInfCZ0=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "fd45bde30b59f0ac22eabbfff9dba1ccd7c8c76d",
"rev": "45b7f54d05790c14930e7e922b56a24381626acb",
"type": "github"
},
"original": {
@ -256,11 +240,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1646933238,
"narHash": "sha256-RZJnLN0o4B35eTnUc2tEAD12X5TNeeJhhvH3Fd6Pmdo=",
"lastModified": 1649883785,
"narHash": "sha256-GhwcnCKisE5CKPU7YzTD1bwgTNmyokjl71ENIVAcnR8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bacbfd713b4781a4a82c1f390f8fe21ae3b8b95b",
"rev": "a62ce97f92b8b197ab6f278132535c1abf713ba0",
"type": "github"
},
"original": {
@ -272,11 +256,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1647124630,
"narHash": "sha256-AmfQbgEUsi0+pdKtd8TCHO/WUE3hCWohTQX6MBoT3WQ=",
"lastModified": 1650009088,
"narHash": "sha256-JvmZNbPWyyMJlQuILDfJoES1XsOOPiRX+o7wS1rPXgM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3c148df2c59b52892dcc6d5ae94f33c060fd4841",
"rev": "e8996276356e7e5815711c7f48eee4419af134dc",
"type": "github"
},
"original": {
@ -303,11 +287,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1646939531,
"narHash": "sha256-bxOjVqcsccCNm+jSmEh/bm0tqfE3SdjwS+p+FZja3ho=",
"lastModified": 1649809588,
"narHash": "sha256-f6sgDj9A8FXTVyA2zkxA66YX+j6BftxE9VHTeIMhEKE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fcd48a5a0693f016a5c370460d0c2a8243b882dc",
"rev": "ff9efb0724de5ae0f9db9df2debefced7eb1571d",
"type": "github"
},
"original": {
@ -319,17 +303,17 @@
},
"poetry2nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1646883208,
"narHash": "sha256-D4cEeShC6IkYafY5Ds39l/qhL4lRhDyh2JKdbsrRAzM=",
"lastModified": 1649924000,
"narHash": "sha256-mqsCUn0MoVKrVgvEid8SYv30KnPBZeXz9TtB30quc0c=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "58028ad0331f320a4e5f88a4bff37117b26e0a25",
"rev": "b39ae43cf62c29b007194485378fe75b7d350c46",
"type": "github"
},
"original": {
@ -341,11 +325,11 @@
"qmk": {
"flake": false,
"locked": {
"lastModified": 1647088945,
"narHash": "sha256-fjI/A3LRFShADmNhUoEnZJAPlpgxFLd3gTjsAdX7QCk=",
"lastModified": 1649960612,
"narHash": "sha256-e0OHdisnUK/5DMhb9Gt/mK0SWwdHQsXot27Hi92cmF0=",
"ref": "master",
"rev": "86b123141bea2e3f831a57eb115368cbbbdb2da1",
"revCount": 20186,
"rev": "8de4065b099a99bcffe436a038616b0c31ade7c3",
"revCount": 20321,
"type": "git",
"url": "https://github.com/qmk/qmk_firmware?ref=0.16.5"
},
@ -390,11 +374,11 @@
},
"utils": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"lastModified": 1648297722,
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
"type": "github"
},
"original": {
@ -403,32 +387,14 @@
"type": "github"
}
},
"utils_2": {
"inputs": {
"flake-utils": "flake-utils"
},
"locked": {
"lastModified": 1639385028,
"narHash": "sha256-oqorKz3mwf7UuDJwlbCEYCB2LfcWLL0DkeCWhRIL820=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "be1be083af014720c14f3b574f57b6173b4915d0",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"type": "github"
}
},
"vtermModule": {
"flake": false,
"locked": {
"lastModified": 1640506671,
"narHash": "sha256-uSzIDmRNk7u5VtCXYu+JVN7Gzkc65axCiK0Jq0X6MWQ=",
"lastModified": 1649763621,
"narHash": "sha256-GnJMGhucSOZ6o/O+Dz23y3o4RCjxCrTXLd3m8vnI6SM=",
"owner": "akermu",
"repo": "emacs-libvterm",
"rev": "a940dd2ee8a82684860e320c0f6d5e15d31d916f",
"rev": "a2f2286c40725244257f46d3a27a730e73f9f596",
"type": "github"
},
"original": {
@ -440,11 +406,11 @@
"yusdacra-dotfiles": {
"flake": false,
"locked": {
"lastModified": 1646859302,
"narHash": "sha256-W4t7eDS9TLCE5BELCz4Q2g9IA83bZMxyo/UopXeAoUo=",
"lastModified": 1649704506,
"narHash": "sha256-tmUZoxXnyskmuJ3Efa2Un+IsF+esZnb15ILT5go02Sg=",
"owner": "yusdacra",
"repo": "nixos-config",
"rev": "8a3b7aaa5739f3cb8d959fd82afc18c544b21446",
"rev": "71d4efd6162b6e600ad55a90a329eee57e010df7",
"type": "github"
},
"original": {

View file

@ -5,7 +5,7 @@
nixpkgs-master.url = "github:NixOS/nixpkgs?ref=master";
home-manager = {
url = "github:nix-community/home-manager?ref=release-21.11";
url = "github:nix-community/home-manager?ref=master";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};

View file

@ -14,21 +14,6 @@ in
};
config = mkIf cfg.enable {
nixpkgs.overlays = [
(final: prev:
{ python3Packages = prev.python3Packages.override (attrs:
{ overrides = final: prev:
{ pivy = prev.pivy.overrideAttrs (attrs:
{ postPatch = ''
substituteInPlace distutils_cmake/CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \
\$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}'
'';
});
};
});
}
)
];
home.packages = with pkgs; [
openscad

View file

@ -27,7 +27,6 @@ in
programs.direnv.enable = mkIf cfg.enableDirenv true;
programs.direnv.nix-direnv.enable = mkIf cfg.enableDirenv true;
programs.direnv.nix-direnv.enableFlakes = mkIf cfg.enableDirenv true;
home.file = {
".bashrc".source = pkgs.writeSubstitutedFile {

View file

@ -34,7 +34,7 @@ in
registry = mapAttrs (_: v: {
flake = v;
}) cfg.pins;
nixPath = mapAttrsToList (n: v: "${n}=${v}") cfg.pins;
# nixPath = mapAttrsToList (n: v: "${n}=${v}") cfg.pins;
};
})
(optionalAttrs

View file

@ -362,15 +362,7 @@ inputs: {
user = "klipper";
group = "klipper";
package = pkgs.klipper.overrideAttrs (_:
{ src = pkgs.fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "v0.10.0";
sha256 = "sha256-rbRDwchiicI+U3IIkIfpuR2/xMzZkC5n2PP335iyUKM=";
};
versin = "0.10.0";
});
package = pkgs.klipper;
settings =
let