Compare commits
10 Commits
4b5da0e0a6
...
8b3e277f09
Author | SHA1 | Date |
---|---|---|
Jez Cope | 8b3e277f09 | |
Jez Cope | 1777ea6fd1 | |
Jez Cope | bd85939cac | |
Jez Cope | e372a3706e | |
Jez Cope | 094fc2b023 | |
Jez Cope | 09805cf35e | |
Jez Cope | bae2e8da51 | |
Jez Cope | dabb4418f1 | |
Jez Cope | c88977f9b3 | |
Jez Cope | 8ec986b559 |
24
flake.lock
24
flake.lock
|
@ -8,11 +8,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1658776433,
|
"lastModified": 1659070300,
|
||||||
"narHash": "sha256-QEPVVPoJ4O9sH/Z9Ofxmbv5YVXHCC2hw9Yx54YaGHKI=",
|
"narHash": "sha256-qFI9MDh6QjbtMtxdmN1lFodJKLG8OxLUB3TlzdBGZag=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "e6787f627285bf1963ad582c7d635c97efea524d",
|
"rev": "2882396c157712b2a58c7f04320e262df5adada8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -44,11 +44,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1658751516,
|
"lastModified": 1658924727,
|
||||||
"narHash": "sha256-Y/3dHoTjbvYBtWd+TTBQJUIgDPO9d+Gqt05C5dyR7E4=",
|
"narHash": "sha256-Fhh9FK9CvuCLxG1WkWJPoendDeXKI4gHYTfezo1n2Zg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "dbed4c794d20d51027fc1107f063ec5be027dafc",
|
"rev": "0e2f7876d2f2ae98a67d89a8bef8c49332aae5af",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -59,11 +59,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1658737577,
|
"lastModified": 1658916876,
|
||||||
"narHash": "sha256-xosJ5nJT9HX+b6UWsSX6R+ap4AdZOCrl/r+IKFp2ASQ=",
|
"narHash": "sha256-BG7MCClmy9esk8pZLCtKoggNv91tAMm7P6dGHXMl3zc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5a0e0d73b944157328d54c4ded1cf2f0146a86a5",
|
"rev": "2b0dd45aca6a260762395ca2e94beab247f455a7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -74,11 +74,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1658766050,
|
"lastModified": 1659073985,
|
||||||
"narHash": "sha256-c6iyt3h3crC7NPf6YTD4G+Y3HEwVjuZYOSaMSzMqVXM=",
|
"narHash": "sha256-YaaBCxdAQp44KijQSwN7cBcgnVpnJ1RYu5CTz/Tno8E=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "2599e014153184576a261f3d6634fed4285797c9",
|
"rev": "9258e659f8090dc4b9a5a61e7004632648654115",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -37,6 +37,7 @@ in {
|
||||||
requests
|
requests
|
||||||
httpx
|
httpx
|
||||||
furl
|
furl
|
||||||
|
jupyterlab
|
||||||
]);
|
]);
|
||||||
ghc = haskellPackages.ghcWithPackages (pkgs: [ pkgs.tidal ]);
|
ghc = haskellPackages.ghcWithPackages (pkgs: [ pkgs.tidal ]);
|
||||||
in [
|
in [
|
||||||
|
|
|
@ -21,15 +21,15 @@ in {
|
||||||
systemd.user.services = let
|
systemd.user.services = let
|
||||||
confFile = settingsFormat.generate "rslsync.conf" {
|
confFile = settingsFormat.generate "rslsync.conf" {
|
||||||
device_name = capitalise hostName;
|
device_name = capitalise hostName;
|
||||||
storage_path = toString ~/.cache/rslsync;
|
storage_path = "~/.cache/rslsync";
|
||||||
pid_file = toString ~/.cache/rslsync/rslsync.pid;
|
pid_file = "~/.cache/rslsync/rslsync.pid";
|
||||||
|
|
||||||
use_upnp = true;
|
use_upnp = true;
|
||||||
|
|
||||||
download_limit = 0;
|
download_limit = 0;
|
||||||
upload_limit = 0;
|
upload_limit = 0;
|
||||||
|
|
||||||
directory_root = toString ~/.;
|
directory_root = "~";
|
||||||
|
|
||||||
webui.listen = "0.0.0.0:8888";
|
webui.listen = "0.0.0.0:8888";
|
||||||
};
|
};
|
||||||
|
|
|
@ -21,6 +21,7 @@ with lib;
|
||||||
in [
|
in [
|
||||||
feh
|
feh
|
||||||
betterlockscreen
|
betterlockscreen
|
||||||
|
xclip
|
||||||
|
|
||||||
gn.gnome-tweaks
|
gn.gnome-tweaks
|
||||||
mate.atril
|
mate.atril
|
||||||
|
@ -53,6 +54,7 @@ with lib;
|
||||||
pulseaudio
|
pulseaudio
|
||||||
jack2
|
jack2
|
||||||
cadence
|
cadence
|
||||||
|
helvum
|
||||||
blueman
|
blueman
|
||||||
blanket
|
blanket
|
||||||
|
|
||||||
|
@ -61,7 +63,8 @@ with lib;
|
||||||
teams
|
teams
|
||||||
zoom-us
|
zoom-us
|
||||||
|
|
||||||
winePackages.full
|
wineWowPackages.staging
|
||||||
|
winetricks
|
||||||
|
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
|
|
||||||
|
@ -81,6 +84,7 @@ with lib;
|
||||||
vistafonts
|
vistafonts
|
||||||
carlito
|
carlito
|
||||||
caladea
|
caladea
|
||||||
|
atkinson-hyperlegible
|
||||||
];
|
];
|
||||||
|
|
||||||
home.activation = {
|
home.activation = {
|
||||||
|
@ -172,6 +176,7 @@ with lib;
|
||||||
{ id = "ldgfbffkinooeloadekpmfoklnobpien"; } # raindrop.io
|
{ id = "ldgfbffkinooeloadekpmfoklnobpien"; } # raindrop.io
|
||||||
{ id = "kkhfnlkhiapbiehimabddjbimfaijdhk"; } # gopass bridge
|
{ id = "kkhfnlkhiapbiehimabddjbimfaijdhk"; } # gopass bridge
|
||||||
{ id = "ldpochfccmkkmhdbclfhpagapcfdljkj"; } # DecentralEyes
|
{ id = "ldpochfccmkkmhdbclfhpagapcfdljkj"; } # DecentralEyes
|
||||||
|
{ id = "ekhagklcjbdpajgpjgmbionohlpdbjgc"; } # Zotero connector
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,9 @@
|
||||||
writeEnable = true;
|
writeEnable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nix-serve.enable = true;
|
services.nix-serve = {
|
||||||
services.nix-serve.secretKeyFile = "/etc/nix/gwydion.local-1.sec";
|
enable = true;
|
||||||
|
secretKeyFile = "/etc/nix/gwydion.local-1.sec";
|
||||||
|
openFirewall = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
39
overlay.nix
39
overlay.nix
|
@ -1,41 +1,4 @@
|
||||||
final: prev:
|
final: prev:
|
||||||
let
|
{
|
||||||
inherit (final) callPackage fetchpatch buildPackages;
|
|
||||||
# custom override for go 1.18 including the revert of CL411617, CL417615.
|
|
||||||
# Can be dropped if/once go 1.18.5 is released with CL417615.
|
|
||||||
# or when staging go 1.18.4 includes the revert.
|
|
||||||
__buildGo118ModuleCL417615 = let
|
|
||||||
fetchBase64Patch = args:
|
|
||||||
(fetchpatch args).overrideAttrs
|
|
||||||
(o: { postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; });
|
|
||||||
in prev.buildGo118Module.override {
|
|
||||||
go = buildPackages.go_1_18.overrideAttrs (oldAttrs: rec {
|
|
||||||
patches = oldAttrs.patches or [ ] ++ [
|
|
||||||
# https://go-review.googlesource.com/c/go/+/417615/
|
|
||||||
(fetchBase64Patch {
|
|
||||||
url =
|
|
||||||
"https://go-review.googlesource.com/changes/go~417615/revisions/3/patch";
|
|
||||||
sha256 = "sha256-Gu5eZUwGGch7et75A/BNynbs4VlQUBClVUxjxPkdjOs=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
});
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
gopass = prev.gopass.override { buildGoModule = __buildGo118ModuleCL417615; };
|
|
||||||
|
|
||||||
gopass-hibp =
|
|
||||||
prev.gopass-hibp.override { buildGoModule = __buildGo118ModuleCL417615; };
|
|
||||||
|
|
||||||
gopass-jsonapi = prev.gopass-jsonapi.override {
|
|
||||||
buildGoModule = __buildGo118ModuleCL417615;
|
|
||||||
};
|
|
||||||
|
|
||||||
git-credential-gopass = prev.git-credential-gopass.override {
|
|
||||||
buildGoModule = __buildGo118ModuleCL417615;
|
|
||||||
};
|
|
||||||
|
|
||||||
gopass-summon-provider = prev.gopass-summon-provider.override {
|
|
||||||
buildGoModule = __buildGo118ModuleCL417615;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue