blackadder: update
parent
16f84a6a27
commit
d31f99bd02
13
fixups.nix
13
fixups.nix
|
@ -1,9 +1,12 @@
|
|||
(pkgs: super: {
|
||||
# https://github.com/NixOS/nixpkgs/pull/145738
|
||||
tree = super.tree.overrideAttrs (o: {
|
||||
preConfigure = o.preConfigure + ''
|
||||
makeFlags+=("CC=$CC")
|
||||
'';
|
||||
makeFlags = pkgs.lib.filter (x: x != "CC=$CC") o.makeFlags;
|
||||
# tree = super.tree.overrideAttrs (o: {
|
||||
# preConfigure = o.preConfigure + ''
|
||||
# makeFlags+=("CC=$CC")
|
||||
# '';
|
||||
# makeFlags = pkgs.lib.filter (x: x != "CC=$CC") o.makeFlags;
|
||||
# });
|
||||
notmuch = super.notmuch.overrideAttrs (o: {
|
||||
doCheck = false;
|
||||
});
|
||||
})
|
||||
|
|
|
@ -6,6 +6,7 @@ let
|
|||
};
|
||||
thefuck-alias = shell: pkgs.runCommand "thefuck-alias" {
|
||||
TF_SHELL = shell;
|
||||
HOME = "/build";
|
||||
} "${pkgs.thefuck}/bin/thefuck -a > $out";
|
||||
in {
|
||||
imports = [ ./arbtt.nix ./desktop.nix ];
|
||||
|
@ -273,7 +274,7 @@ in {
|
|||
notmuch
|
||||
gmailieer
|
||||
git-absorb
|
||||
afew
|
||||
#afew
|
||||
broot
|
||||
fd
|
||||
htop
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "1bf9add4298e7fa48392a9b045b2b1e698f30f2d",
|
||||
"sha256": "19zb58bdpzcl253cr8xysm3gdvln7hf3silcg1kdv084qmbh3hls",
|
||||
"rev": "50c206818dd137d6c28f61143319691fd910b0c7",
|
||||
"sha256": "0vy42w223g00ckmi7d4kxf30f6bwcffkpj54gzni5bclq1af4lfz",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/1bf9add4298e7fa48392a9b045b2b1e698f30f2d.tar.gz",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/50c206818dd137d6c28f61143319691fd910b0c7.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"home-manager": {
|
||||
|
@ -17,10 +17,10 @@
|
|||
"homepage": "https://nix-community.github.io/home-manager/",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3f12ce5f7df69dfb8e12b02e88979b9d7770c663",
|
||||
"sha256": "0n38pp89z31d4qsjlyicz59mz7qv008hshyylvbc3fr6rmba1ppc",
|
||||
"rev": "d07df8d9a80a4a34ea881bee7860ae437c5d44a5",
|
||||
"sha256": "15jqh8jqbvrwardwi62bs7r9myppc90qkzbbp7mzzsjmfgbd35i0",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/3f12ce5f7df69dfb8e12b02e88979b9d7770c663.tar.gz",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/d07df8d9a80a4a34ea881bee7860ae437c5d44a5.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"niv": {
|
||||
|
@ -61,10 +61,10 @@
|
|||
"homepage": "https://github.com/NixOS/nixpkgs",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2fa862644fc15ecb525eb8cd0a60276f1c340c7c",
|
||||
"sha256": "00l884zydbrww2jxjvf62sm1y96jvys22jg9vb3fsznz2mbz41jb",
|
||||
"rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88",
|
||||
"sha256": "012db5d6k0lajp4q37byhgamz3ry04av1dcpgf3ahm9kzjwsjcch",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nixos/nixpkgs/archive/2fa862644fc15ecb525eb8cd0a60276f1c340c7c.tar.gz",
|
||||
"url": "https://github.com/nixos/nixpkgs/archive/b2737d4980a17cc2b7d600d7d0b32fd7333aca88.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs-mozilla": {
|
||||
|
@ -85,10 +85,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "956294fac27d1c8324f46fa338a04df50cbeb912",
|
||||
"sha256": "0w1z364pxx3lqvyqga5jbvp242i2gphaw17lxbgj3jmyg7ll7nb4",
|
||||
"rev": "d82f96a4e818ddd2fddcd5b157bff85b54e5ad80",
|
||||
"sha256": "1y68pf2d373jqnfvdidnz8682ss3ips49mg4mdzwy18y4b9m9dj7",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/nixpkgs-wayland/archive/956294fac27d1c8324f46fa338a04df50cbeb912.tar.gz",
|
||||
"url": "https://github.com/nix-community/nixpkgs-wayland/archive/d82f96a4e818ddd2fddcd5b157bff85b54e5ad80.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ in {
|
|||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.kernelModules = [ "nct6775" ];
|
||||
boot.kernelPackages = pkgs.linuxPackages_5_14; # todo: zfs
|
||||
boot.kernelPackages = pkgs.linuxPackages_5_15; # todo: zfs
|
||||
networking.hostId = "c7736638";
|
||||
services.zfs.autoScrub.enable = true;
|
||||
services.zfs.trim.enable = true;
|
||||
|
|
|
@ -120,7 +120,7 @@ in {
|
|||
}];
|
||||
postSetup = "ip link set dev wg-y mtu 1371";
|
||||
};
|
||||
security.acme.email = "acme@yori.cc";
|
||||
security.acme.defaults.email = "acme@yori.cc";
|
||||
security.acme.acceptTerms = true;
|
||||
nix.binaryCachePublicKeys =
|
||||
[ "yorick:Pmd0gyrTvVdzpQyb/raHJKdoOag8RLaj434qBgMm4I0=" ];
|
||||
|
|
|
@ -23,7 +23,6 @@ in {
|
|||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
pkgs.ghostscript
|
||||
pkgs.yubikey-manager
|
||||
pkgs.glib
|
||||
];
|
||||
environment.sessionVariables.XDG_DATA_DIRS = with pkgs; [
|
||||
|
|
|
@ -51,7 +51,7 @@ in {
|
|||
hledger
|
||||
#transmission-remote-gtk
|
||||
gopass
|
||||
yubioath-desktop
|
||||
#yubioath-desktop # todo
|
||||
];
|
||||
|
||||
media = mkEnv "y-media" [
|
||||
|
|
Loading…
Reference in New Issue