cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use stable discord

Browse source
This commit is contained in:
Cyryl Płotnicki 2022-10-23 10:51:00 +01:00
parent a10ad9d902
commit bb556d5533
3 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
flake.lock
View file

@ -101,11 +101,11 @@
}, },
"nixpkgs-22_05": { "nixpkgs-22_05": {
"locked": { "locked": {
"lastModified": 1665870850, "lastModified": 1666488099,
"narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=", "narHash": "sha256-DANs2epN5QgvxWzH7xF3dzb4WE0lEuMLrMEu/vPmQxw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f", "rev": "f9115594149ebcb409a42e303bec4956814a8419",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1666383964, "lastModified": 1666517449,
"narHash": "sha256-hcGxDlFPTFSAIQvMBum8b689ePuoX2RseBgPHTS3FQk=", "narHash": "sha256-zt3tlT8CJOuL8WnXsnKtkVWPayIloKZPyXWbTaiYCWE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "13ecba54c3246c8458dc434a213df64477571f19", "rev": "a914cf6ea386ad4354d4613d7882a3766decb888",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +133,11 @@
}, },
"nixpkgs-nixos-unstable": { "nixpkgs-nixos-unstable": {
"locked": { "locked": {
"lastModified": 1666282307, "lastModified": 1666377499,
"narHash": "sha256-O1T2HGLARLKDLfdOmjPBfn3eC4cSIaQD71wUN4I/6/s=", "narHash": "sha256-dZZCGvWcxc7oGnUgFVf0UeNHsJ4VhkTM0v5JRe8EwR8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b7d8c687782c8f9a1d425a7e486eb989654f6468", "rev": "301aada7a64812853f2e2634a530ef5d34505048",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,11 +149,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1666249138, "lastModified": 1666401273,
"narHash": "sha256-CzK8NA8xEMKAhvHXB8UMODckcH97sZXm6lziKNWLv0M=", "narHash": "sha256-AG3MoIjcWwz1SPjJ2nymWu4NmeVj9P40OpB1lsmxFtg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44fc3cb097324c9f9f93313dd3f103e78d722968", "rev": "3933d8bb9120573c0d8d49dc5e890cb211681490",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -165,11 +165,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1666379733, "lastModified": 1666511160,
"narHash": "sha256-xTccyWMYazUMUAlqpjni0kX6+/wrxHvr6KdKXGOaDek=", "narHash": "sha256-TDeV600LPda/RI+2Flz11r8AamzFBZBToSnuLvlKb0s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1fb7e7080e783fdcad15ba5ed0c6b7ce24a37f51", "rev": "0f5061ee4214d46ee0093c39899e6d07efcb1ef6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,11 +226,11 @@
"nixpkgs-22_05": "nixpkgs-22_05" "nixpkgs-22_05": "nixpkgs-22_05"
}, },
"locked": { "locked": {
"lastModified": 1666078616, "lastModified": 1666499473,
"narHash": "sha256-ifW3GhIxuKv5+AidKAPpmtS8M7TY2d7VS6eFnaCFdfU=", "narHash": "sha256-q1eFnBFL0kHgcnUPeKagw3BfbE/5sMJNGL2E2AR+a2M=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "8e470d4eac115aa793437e52e84e7f9abdce236b", "rev": "1b5f9512a265f0c9687dbff47893180f777f4809",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
flake.nix
View file

@ -41,13 +41,7 @@
} }
]; ];
specialArgs = { specialArgs = { inherit inputs system; };
inherit inputs system;
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
inherit system;
config = { allowUnfree = true; };
};
};
}; };
mkWorkstation = pkgs: system: hostname: mkWorkstation = pkgs: system: hostname:
pkgs.lib.nixosSystem { pkgs.lib.nixosSystem {
@ -73,6 +67,10 @@
]; ];
specialArgs = { specialArgs = {
inherit inputs system; inherit inputs system;
nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
inherit system;
config = { allowUnfree = true; };
};
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable { nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
inherit system; inherit system;
config = { allowUnfree = true; }; config = { allowUnfree = true; };

5
nixos/gui/default.nix
View file

@ -1,4 +1,5 @@
{ config, pkgs, discord, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: { config, pkgs, discord, inputs, nixpkgs-nixos-stable-and-unfree
, nixpkgs-nixos-unstable-and-unfree, ... }:
let let
unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system}; unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
nixpkgs-master = inputs.nixpkgs-master.legacyPackages.${pkgs.system}; nixpkgs-master = inputs.nixpkgs-master.legacyPackages.${pkgs.system};
@ -75,7 +76,7 @@ in {
yubikey-personalization yubikey-personalization
yubikey-personalization-gui yubikey-personalization-gui
] ++ [ unstable.gnucash unstable.thunderbird ] ++ [ ] ++ [ unstable.gnucash unstable.thunderbird ] ++ [
nixpkgs-nixos-unstable-and-unfree.discord nixpkgs-nixos-stable-and-unfree.discord
nixpkgs-nixos-unstable-and-unfree.hopper nixpkgs-nixos-unstable-and-unfree.hopper
]; ];
}; };