nix flake update
This commit is contained in:
parent
e33b3dc3f2
commit
3e7252796d
56
flake.lock
56
flake.lock
|
@ -455,16 +455,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714043624,
|
"lastModified": 1716736833,
|
||||||
"narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
|
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
|
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-23.11",
|
"ref": "release-24.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -665,21 +665,19 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nixpkgs-23_05": "nixpkgs-23_05",
|
|
||||||
"nixpkgs-23_11": "nixpkgs-23_11",
|
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706219574,
|
"lastModified": 1714720456,
|
||||||
"narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=",
|
"narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf",
|
"rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"ref": "nixos-23.11",
|
"ref": "master",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
@ -699,36 +697,6 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-23_05": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1704290814,
|
|
||||||
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"ref": "nixos-23.05",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-23_11": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1706098335,
|
|
||||||
"narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"ref": "nixos-23.11",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714870069,
|
"lastModified": 1714870069,
|
||||||
|
@ -800,16 +768,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714971268,
|
"lastModified": 1717144377,
|
||||||
"narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=",
|
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c",
|
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-23.11",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
{
|
{
|
||||||
description = "Yoricks dotfiles";
|
description = "Yoricks dotfiles";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
home-manager.url = "github:nix-community/home-manager/release-23.11";
|
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla";
|
nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla";
|
||||||
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
|
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
|
||||||
nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs";
|
nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
|
nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; # todo: nixos-24.05
|
||||||
nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
|
nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
agenix.url = "github:ryantm/agenix";
|
agenix.url = "github:ryantm/agenix";
|
||||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -1,14 +1,6 @@
|
||||||
{ lib, pkgs, options, ... }:
|
{ lib, pkgs, options, ... }:
|
||||||
let
|
let
|
||||||
bin = pkgs.callPackage ../bin { };
|
bin = pkgs.callPackage ../bin { };
|
||||||
fixed_slack = pkgs.slack.override {
|
|
||||||
xdg-utils = pkgs.xdg-utils.overrideAttrs (o: {
|
|
||||||
buildInputs = (o.buildInputs or []) ++ [ pkgs.makeWrapper ];
|
|
||||||
postInstall = o.postInstall + ''
|
|
||||||
wrapProgram "$out/bin/xdg-open" --unset GDK_BACKEND
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
};
|
|
||||||
bg = {
|
bg = {
|
||||||
xps9360 = "/home/yorick/wp/thorns__4k__by_kasperja-daqi5g7.jpg fill";
|
xps9360 = "/home/yorick/wp/thorns__4k__by_kasperja-daqi5g7.jpg fill";
|
||||||
desktop = "/home/yorick/wp/leonid5-high.webp fill";
|
desktop = "/home/yorick/wp/leonid5-high.webp fill";
|
||||||
|
@ -38,9 +30,10 @@ in {
|
||||||
invisible=1
|
invisible=1
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
services.gpg-agent.pinentryFlavor = "gnome3";
|
services.gpg-agent.pinentryPackage = pkgs.pinentry.gnome3;
|
||||||
wayland.windowManager.sway = {
|
wayland.windowManager.sway = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
checkConfig = false; # looks for wallpapers
|
||||||
config = {
|
config = {
|
||||||
bars = [ ];
|
bars = [ ];
|
||||||
gaps.inner = 5;
|
gaps.inner = 5;
|
||||||
|
@ -266,7 +259,7 @@ in {
|
||||||
grim
|
grim
|
||||||
element-desktop
|
element-desktop
|
||||||
libreoffice
|
libreoffice
|
||||||
fixed_slack
|
slack
|
||||||
slurp
|
slurp
|
||||||
sway-contrib.grimshot
|
sway-contrib.grimshot
|
||||||
swaybg
|
swaybg
|
||||||
|
|
|
@ -163,6 +163,7 @@ in {
|
||||||
notmuch
|
notmuch
|
||||||
watchman
|
watchman
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
|
appimage-run
|
||||||
|
|
||||||
## misc
|
## misc
|
||||||
moreutils
|
moreutils
|
||||||
|
@ -220,7 +221,7 @@ in {
|
||||||
## nix
|
## nix
|
||||||
nix-tree
|
nix-tree
|
||||||
niv
|
niv
|
||||||
nixfmt
|
nixfmt-rfc-style
|
||||||
patchelf
|
patchelf
|
||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
nix-du
|
nix-du
|
||||||
|
@ -252,10 +253,12 @@ in {
|
||||||
vim
|
vim
|
||||||
xdg-utils
|
xdg-utils
|
||||||
countfftabs
|
countfftabs
|
||||||
|
datasette
|
||||||
#wlrctl
|
#wlrctl
|
||||||
|
|
||||||
## coins
|
## coins
|
||||||
electrum
|
electrum
|
||||||
|
ledger-live-desktop
|
||||||
|
|
||||||
## apps
|
## apps
|
||||||
alacritty
|
alacritty
|
||||||
|
@ -284,6 +287,7 @@ in {
|
||||||
# openttd
|
# openttd
|
||||||
# wine
|
# wine
|
||||||
# winetricks
|
# winetricks
|
||||||
|
kmines
|
||||||
|
|
||||||
# work
|
# work
|
||||||
timesync
|
timesync
|
||||||
|
|
|
@ -33,4 +33,8 @@
|
||||||
nvidiaBusId = "PCI:5:0:0";
|
nvidiaBusId = "PCI:5:0:0";
|
||||||
amdgpuBusId = "PCI:15:0:0";
|
amdgpuBusId = "PCI:15:0:0";
|
||||||
};
|
};
|
||||||
|
hardware.cpu.amd = {
|
||||||
|
ryzen-smu.enable = true;
|
||||||
|
updateMicrocode = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,9 +62,9 @@ in
|
||||||
# docker
|
# docker
|
||||||
virtualisation.docker = {
|
virtualisation.docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableNvidia = true;
|
|
||||||
storageDriver = "overlay2";
|
storageDriver = "overlay2";
|
||||||
};
|
};
|
||||||
|
hardware.nvidia-container-toolkit.enable = true;
|
||||||
users.users.yorick.extraGroups = [ "docker" ];
|
users.users.yorick.extraGroups = [ "docker" ];
|
||||||
|
|
||||||
nix.optimise.automatic = true;
|
nix.optimise.automatic = true;
|
||||||
|
@ -84,13 +84,4 @@ in
|
||||||
listen = "0.0.0.0";
|
listen = "0.0.0.0";
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ config.services.fooocus.port ];
|
networking.firewall.allowedTCPPorts = [ config.services.fooocus.port ];
|
||||||
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
|
|
||||||
version = "550.54.14";
|
|
||||||
sha256_64bit = "sha256-jEl/8c/HwxD7h1FJvDD6pP0m0iN7LLps0uiweAFXz+M=";
|
|
||||||
sha256_aarch64 = "sha256-sProBhYziFwk9rDAR2SbRiSaO7RMrf+/ZYryj4BkLB0=";
|
|
||||||
openSha256 = "sha256-F+9MWtpIQTF18F2CftCJxQ6WwpA8BVmRGEq3FhHLuYw=";
|
|
||||||
settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4=";
|
|
||||||
persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4=";
|
|
||||||
#patches = config.boot.kernelPackages.nvidiaPackages.latest.patches;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -105,8 +105,7 @@
|
||||||
services.unifi = {
|
services.unifi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
jrePackage = pkgs.jre8_headless;
|
unifiPackage = pkgs.unifi;
|
||||||
unifiPackage = pkgs.unifiStable;
|
|
||||||
};
|
};
|
||||||
services.victoriametrics = {
|
services.victoriametrics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -234,22 +233,26 @@
|
||||||
recipient = "yorickvanpelt@gmail.com";
|
recipient = "yorickvanpelt@gmail.com";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.zfs.zed.settings = {
|
services.zfs.zed = {
|
||||||
|
enableMail = true;
|
||||||
|
settings = {
|
||||||
ZED_EMAIL_ADDR = [ "yorickvanpelt@gmail.com" ];
|
ZED_EMAIL_ADDR = [ "yorickvanpelt@gmail.com" ];
|
||||||
ZED_EMAIL_PROG = "/run/wrappers/bin/sendmail";
|
|
||||||
ZED_EMAIL_OPTS = "@ADDRESS@";
|
|
||||||
ZED_NOTIFY_INTERVAL_SECS = 3600;
|
ZED_NOTIFY_INTERVAL_SECS = 3600;
|
||||||
ZED_NOTIFY_VERBOSE = true;
|
ZED_NOTIFY_VERBOSE = true;
|
||||||
ZED_SCRUB_AFTER_RESILVER = true;
|
ZED_SCRUB_AFTER_RESILVER = true;
|
||||||
};
|
};
|
||||||
services.oauth2_proxy = {
|
};
|
||||||
|
services.oauth2-proxy = {
|
||||||
enable = true;
|
enable = true;
|
||||||
email.addresses = "yorickvanpelt@gmail.com";
|
email.addresses = "yorickvanpelt@gmail.com";
|
||||||
redirectURL = "https://priv.yori.cc/oauth2/callback";
|
redirectURL = "https://priv.yori.cc/oauth2/callback";
|
||||||
reverseProxy = true;
|
reverseProxy = true;
|
||||||
keyFile = config.age.secrets.oauth2-proxy.path;
|
keyFile = config.age.secrets.oauth2-proxy.path;
|
||||||
setXauthrequest = true;
|
setXauthrequest = true;
|
||||||
nginx.virtualHosts = [ "priv.yori.cc" ];
|
nginx.virtualHosts."priv.yori.cc" = {
|
||||||
|
allowed_emails = ["yorickvanpelt@gmail.com"];
|
||||||
|
};
|
||||||
|
nginx.domain = "priv.yori.cc";
|
||||||
extraConfig.whitelist-domain = ["priv.yori.cc"];
|
extraConfig.whitelist-domain = ["priv.yori.cc"];
|
||||||
};
|
};
|
||||||
services.nats = {
|
services.nats = {
|
||||||
|
|
|
@ -43,7 +43,7 @@ in {
|
||||||
};
|
};
|
||||||
# todo: back up this dir
|
# todo: back up this dir
|
||||||
services.paperless.enable = true;
|
services.paperless.enable = true;
|
||||||
services.paperless.extraConfig = {
|
services.paperless.settings = {
|
||||||
# todo: PAPERLESS_ENABLE_HTTP_REMOTE_USER, PAPERLESS_LOGOUT_REDIRECT_URL
|
# todo: PAPERLESS_ENABLE_HTTP_REMOTE_USER, PAPERLESS_LOGOUT_REDIRECT_URL
|
||||||
PAPERLESS_URL = "https://priv.yori.cc";
|
PAPERLESS_URL = "https://priv.yori.cc";
|
||||||
PAPERLESS_FORCE_SCRIPT_NAME = "/paperless";
|
PAPERLESS_FORCE_SCRIPT_NAME = "/paperless";
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
};
|
};
|
||||||
services.logind.lidSwitch = "ignore";
|
services.logind.lidSwitch = "ignore";
|
||||||
|
|
||||||
services.xserver.libinput.enable = true;
|
services.libinput.enable = true;
|
||||||
|
|
||||||
networking.wireless = {
|
networking.wireless = {
|
||||||
enable = false;
|
enable = false;
|
||||||
|
@ -38,7 +38,6 @@
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
|
||||||
services.udev.packages = [ pkgs.crda ];
|
|
||||||
hardware.firmware = [ pkgs.wireless-regdb ];
|
hardware.firmware = [ pkgs.wireless-regdb ];
|
||||||
# gotta go faster
|
# gotta go faster
|
||||||
networking.dhcpcd.extraConfig = ''
|
networking.dhcpcd.extraConfig = ''
|
||||||
|
|
|
@ -9,6 +9,7 @@ in pkgs: super: {
|
||||||
modules =
|
modules =
|
||||||
[ ({ lib, ... }: {
|
[ ({ lib, ... }: {
|
||||||
config.nixpkgs.pkgs = lib.mkDefault pkgs;
|
config.nixpkgs.pkgs = lib.mkDefault pkgs;
|
||||||
|
config.nixpkgs.flake.source = pkgs.flake-inputs.nixpkgs;
|
||||||
config._module.args = extraArgs;
|
config._module.args = extraArgs;
|
||||||
}) ]
|
}) ]
|
||||||
++ (if builtins.isList configuration then
|
++ (if builtins.isList configuration then
|
||||||
|
|
|
@ -21,8 +21,7 @@ in {
|
||||||
nix-netrc-yorick.file = ../../secrets/nix-netrc-yorick.age;
|
nix-netrc-yorick.file = ../../secrets/nix-netrc-yorick.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
nix.nixPath = [];# "nixpkgs=${pkgs.path}" ];
|
nix.package = pkgs.lix;
|
||||||
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
|
||||||
|
|
||||||
networking.domain = "yori.cc";
|
networking.domain = "yori.cc";
|
||||||
networking.hostName = machine;
|
networking.hostName = machine;
|
||||||
|
@ -147,4 +146,6 @@ in {
|
||||||
"yorick:sWqvIllvDhMS9vcWyk4+zSk9L6zq8UgcLPEEQJsAdW4="
|
"yorick:sWqvIllvDhMS9vcWyk4+zSk9L6zq8UgcLPEEQJsAdW4="
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fonts.fontconfig.subpixel.rgba = "rgb";
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
};
|
};
|
||||||
services.avahi = {
|
services.avahi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nssmdns = true;
|
nssmdns4 = true;
|
||||||
publish = {
|
publish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
addresses = true;
|
addresses = true;
|
||||||
|
|
|
@ -71,14 +71,6 @@
|
||||||
$out/bin/cog completion zsh > $out/share/zsh/site-functions/_cog
|
$out/bin/cog completion zsh > $out/share/zsh/site-functions/_cog
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
obsidian = with self.lib; throwIf (versionOlder "1.4.16" super.obsidian.version) "Obsidian no longer requires EOL Electron" (
|
|
||||||
super.obsidian.override {
|
|
||||||
electron = self.electron_25.overrideAttrs (_: {
|
|
||||||
preFixup = "patchelf --add-needed ${self.libglvnd}/lib/libEGL.so.1 $out/bin/electron"; # NixOS/nixpkgs#272912
|
|
||||||
meta.knownVulnerabilities = [ ]; # NixOS/nixpkgs#273611
|
|
||||||
});
|
|
||||||
}
|
|
||||||
);
|
|
||||||
noulith = self.rustPlatform.buildRustPackage rec {
|
noulith = self.rustPlatform.buildRustPackage rec {
|
||||||
pname = "noulith";
|
pname = "noulith";
|
||||||
version = "20231228";
|
version = "20231228";
|
||||||
|
|
Loading…
Reference in a new issue