diff --git a/configs/default.nix b/configs/default.nix index 0e1e8f0..501e8f0 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -46,6 +46,18 @@ + { + imports = [ + (import { + inherit lib config; + pkgs = pkgs // { + writeDash = pkgs.unstable.writers.writeDash; + }; + }) + ]; + + makefu.distrobump.enable = true; + } { niveum.user = { github = "kmein"; diff --git a/deploy.nix b/deploy.nix index 15767ec..430544f 100644 --- a/deploy.nix +++ b/deploy.nix @@ -15,6 +15,10 @@ let url = https://github.com/NixOS/nixpkgs-channels; ref = (importJson ./nixpkgs.json).rev; }; + nixos-unstable.git = { + url = https://github.com/NixOS/nixpkgs-channels; + ref = "nixos-unstable"; + }; system.file = toString path; lib.file = toString ./lib; packages.file = toString ./packages; @@ -28,10 +32,6 @@ let minimal = path: other: lib.evalSource [(niveum path // other)]; regular = path: minimal path (niveum path // { - nixos-unstable.git = { - url = https://github.com/NixOS/nixpkgs-channels; - ref = "nixos-unstable"; - }; home-manager.git = { url = https://github.com/rycee/home-manager; ref = "2ccbf43"; diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix index 80a9934..5806292 100644 --- a/systems/catullus/configuration.nix +++ b/systems/catullus/configuration.nix @@ -4,6 +4,7 @@ let homeros = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDn13Y6CznabMvKJPIrr/dj1TX4boe8F98yc3FDElJeprQo2RXlDzjg/po9/lHTHaoC5yQUjlRg/AnI4vizYkn2sqJebAeSPahmpS+l0eFnjZgsqds2cCFqSPB6Qc5YEkGRhN4aq/ABz0jdFJLBYOYGxuuXowYxyNrqrItxDR7tF7upG+kVjYiDoP/qFm8C7zv6Zy8aoehNbzf8HlIJd0ITbMr/vUftNsQ8C84QmbZljReHmchPgE8GUfVLTlCORkhndbvNX3jXo+75y7JOIZZ6193FZHM4seg/VSDWYLJtpnhttD1w6qmiLrlimqbJB9ihoXq2eDmQ+4zo6hxQ6pFH6P0xQClJ0hxVWn6hEM3rkMwoMfbq4v54gKJsYxcGdnwjAX6d9DQv/QVjmVZffKWsGGoC7uz7bdmc0akVKi+GLSPOx8sJwXqvyvFStfqLaweVcuikUqQ72JLK7pZyliA7na6KuQ1PE3LTpfSr0lbBJ73xtS2rU1nF/Oe5zwA4LX5s/QeDVmS86D8acUrSCO62pBB3Yv8go0KR4mEvfxLiUWV6gR2uTeIPXvo4ouYFZqyABAGybjUATlGCXJaeHd/y/VWkpIB8ocqNESlRMCEe4TrYjw91AEmYBL6kWIeop3dyhovm3dTB3fQvC97kbL16wuXBrOcN4lEc+56ShhmvdQ== kieran.meinhardt@gmail.com"; scardanelli = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19H0FhSNWcfBRPKzbTVSMJikIWZl0CoM8zCm+/3fdMgoaLRpeZWe/AfDK6b4qOjk/sez/J0JUFCGr+JbMwjsduoazsuQowu9L9DLP9Q5UkJje4BD7MHznaeu9/XfVng/MvyaEWArA/VUJeKQesHe76tR511/+n3+bdzlIh8Zw/3wfFxmg1OTNA99/vLkXrQzHDTuV/yj1pxykL4xFtN0OIssW1IKncJeKtkO/OHGT55ypz52Daj6bNKqvxiTuzeEhv5M+5ppyIPcRf1uj/7IaPKttCgZAntEqBTIR9MbyXFeAZVayzaFnLl2okeam5XreeZbj+Y1h2ZjxiIuWoab3MLndSekVfLtfa63gtcWIf8CIvZO2wJoH8v73y0U78JsfWVaTM09ZCfFlHHA/bWqZ6laAjW+mWLO/c77DcYkB3IBzaMVNfc6mfTcGFIC+biWeYpKgA0zC6rByUPbmbIoMueP9zqJwqUaM90Nwd6559inBB107/BK3Ktb3b+37mMCstetIPB9e4EFpGMjhmnL/G81jS53ACWLXJYzt7mKU/fEsiW93MtaB+Le46OEC18y/4G8F7p/nnH7i0kO74ukxbnc4PlpiM7iWT6ra2Cyy+nzEgdXCNXywIxr05TbCQDwX6/NY8k7Hokgdfyz+1Pq3sX0yCcWRPaoB26YF12KYFQ== kieran.meinhardt@gmail.com"; }; + unstable = import {}; in { imports = [ ./hardware-configuration.nix @@ -11,6 +12,18 @@ in { + { + imports = [ + (import { + inherit lib config; + pkgs = pkgs // { + writeDash = unstable.writers.writeDash; + }; + }) + ]; + + makefu.distrobump.enable = true; + } { sound.enable = true;