yorick/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

nix flake update

Browse source
This commit is contained in:
Yorick van Pelt 2024-06-01 14:54:05 +02:00
parent e33b3dc3f2
commit 3e7252796d
Signed by: yorick
GPG key ID: D8D3CC6D951384DE
13 changed files with 49 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
flake.lock
View file

@ -455,16 +455,16 @@
]
},
"locked": {
"lastModified": 1714043624,
"narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
"lastModified": 1716736833,
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@ -665,21 +665,19 @@
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-23_05": "nixpkgs-23_05",
"nixpkgs-23_11": "nixpkgs-23_11",
"utils": "utils"
},
"locked": {
"lastModified": 1706219574,
"narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=",
"lastModified": 1714720456,
"narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf",
"rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
"ref": "nixos-23.11",
"ref": "master",
"repo": "nixos-mailserver",
"type": "gitlab"
}
@ -699,36 +697,6 @@
"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": {
"locked": {
"lastModified": 1714870069,
@ -800,16 +768,16 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1714971268,
"narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=",
"lastModified": 1717144377,
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c",
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}

6
flake.nix
View file

@ -1,14 +1,14 @@
{
description = "Yoricks dotfiles";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
home-manager.url = "github:nix-community/home-manager/release-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla";
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
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";
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";

13
home-manager/desktop.nix
View file

@ -1,14 +1,6 @@
{ lib, pkgs, options, ... }:
let
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 = {
xps9360 = "/home/yorick/wp/thorns__4k__by_kasperja-daqi5g7.jpg fill";
desktop = "/home/yorick/wp/leonid5-high.webp fill";
@ -38,9 +30,10 @@ in {
invisible=1
'';
};
services.gpg-agent.pinentryFlavor = "gnome3";
services.gpg-agent.pinentryPackage = pkgs.pinentry.gnome3;
wayland.windowManager.sway = {
enable = true;
checkConfig = false; # looks for wallpapers
config = {
bars = [ ];
gaps.inner = 5;
@ -266,7 +259,7 @@ in {
grim
element-desktop
libreoffice
fixed_slack
slack
slurp
sway-contrib.grimshot
swaybg

6
home-manager/home.nix
View file

@ -163,6 +163,7 @@ in {
notmuch
watchman
nix-output-monitor
appimage-run
## misc
moreutils
@ -220,7 +221,7 @@ in {
## nix
nix-tree
niv
nixfmt
nixfmt-rfc-style
patchelf
nix-prefetch-git
nix-du
@ -252,10 +253,12 @@ in {
vim
xdg-utils
countfftabs
datasette
#wlrctl
## coins
electrum
ledger-live-desktop
## apps
alacritty
@ -284,6 +287,7 @@ in {
# openttd
# wine
# winetricks
kmines
# work
timesync

4
nixos/machines/blackadder/3950x.nix
View file

@ -33,4 +33,8 @@
nvidiaBusId = "PCI:5:0:0";
amdgpuBusId = "PCI:15:0:0";
};
hardware.cpu.amd = {
ryzen-smu.enable = true;
updateMicrocode = true;
};
}

11
nixos/machines/blackadder/default.nix
View file

@ -62,9 +62,9 @@ in
# docker
virtualisation.docker = {
enable = true;
enableNvidia = true;
storageDriver = "overlay2";
};
hardware.nvidia-container-toolkit.enable = true;
users.users.yorick.extraGroups = [ "docker" ];
nix.optimise.automatic = true;
@ -84,13 +84,4 @@ in
listen = "0.0.0.0";
};
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;
};
}

25
nixos/machines/frumar/default.nix
View file

@ -105,8 +105,7 @@
services.unifi = {
enable = true;
openFirewall = true;
jrePackage = pkgs.jre8_headless;
unifiPackage = pkgs.unifiStable;
unifiPackage = pkgs.unifi;
};
services.victoriametrics = {
enable = true;
@ -234,22 +233,26 @@
recipient = "yorickvanpelt@gmail.com";
};
};
services.zfs.zed.settings = {
ZED_EMAIL_ADDR = [ "yorickvanpelt@gmail.com" ];
ZED_EMAIL_PROG = "/run/wrappers/bin/sendmail";
ZED_EMAIL_OPTS = "@ADDRESS@";
ZED_NOTIFY_INTERVAL_SECS = 3600;
ZED_NOTIFY_VERBOSE = true;
ZED_SCRUB_AFTER_RESILVER = true;
services.zfs.zed = {
enableMail = true;
settings = {
ZED_EMAIL_ADDR = [ "yorickvanpelt@gmail.com" ];
ZED_NOTIFY_INTERVAL_SECS = 3600;
ZED_NOTIFY_VERBOSE = true;
ZED_SCRUB_AFTER_RESILVER = true;
};
};
services.oauth2_proxy = {
services.oauth2-proxy = {
enable = true;
email.addresses = "yorickvanpelt@gmail.com";
redirectURL = "https://priv.yori.cc/oauth2/callback";
reverseProxy = true;
keyFile = config.age.secrets.oauth2-proxy.path;
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"];
};
services.nats = {

2
nixos/machines/frumar/paperless.nix
View file

@ -43,7 +43,7 @@ in {
};
# todo: back up this dir
services.paperless.enable = true;
services.paperless.extraConfig = {
services.paperless.settings = {
# todo: PAPERLESS_ENABLE_HTTP_REMOTE_USER, PAPERLESS_LOGOUT_REDIRECT_URL
PAPERLESS_URL = "https://priv.yori.cc";
PAPERLESS_FORCE_SCRIPT_NAME = "/paperless";

3
nixos/machines/jarvis/xps9360.nix
View file

@ -29,7 +29,7 @@
};
services.logind.lidSwitch = "ignore";
services.xserver.libinput.enable = true;
services.libinput.enable = true;
networking.wireless = {
enable = false;
@ -38,7 +38,6 @@
hardware.bluetooth.enable = true;
hardware.enableRedistributableFirmware = true;
services.udev.packages = [ pkgs.crda ];
hardware.firmware = [ pkgs.wireless-regdb ];
# gotta go faster
networking.dhcpcd.extraConfig = ''

1
nixos/overlay.nix
View file

@ -9,6 +9,7 @@ in pkgs: super: {
modules =
[ ({ lib, ... }: {
config.nixpkgs.pkgs = lib.mkDefault pkgs;
config.nixpkgs.flake.source = pkgs.flake-inputs.nixpkgs;
config._module.args = extraArgs;
}) ]
++ (if builtins.isList configuration then

5
nixos/roles/default.nix
View file

@ -21,8 +21,7 @@ in {
nix-netrc-yorick.file = ../../secrets/nix-netrc-yorick.age;
};
nix.nixPath = [];# "nixpkgs=${pkgs.path}" ];
nix.registry.nixpkgs.flake = inputs.nixpkgs;
nix.package = pkgs.lix;
networking.domain = "yori.cc";
networking.hostName = machine;
@ -147,4 +146,6 @@ in {
"yorick:sWqvIllvDhMS9vcWyk4+zSk9L6zq8UgcLPEEQJsAdW4="
];
};
fonts.fontconfig.subpixel.rgba = "rgb";
}

2
nixos/roles/homeserver.nix
View file

@ -5,7 +5,7 @@
};
services.avahi = {
enable = true;
nssmdns = true;
nssmdns4 = true;
publish = {
enable = true;
addresses = true;

8
pkgs/default.nix
View file

@ -71,14 +71,6 @@
$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 {
pname = "noulith";
version = "20231228";