lots of updates from the past few months

This commit is contained in:
Callum Leslie 2026-01-29 15:37:13 +00:00
parent d400e84092
commit ba4f1bcfcc
Signed by: cleslie
GPG key ID: 5A944DF89B6F65AC
12 changed files with 228 additions and 420 deletions

549
flake.lock generated

File diff suppressed because it is too large Load diff

View file

@ -39,7 +39,7 @@
inherit (mods) homeManagerModules nixosModules; inherit (mods) homeManagerModules nixosModules;
# TODO: use ./hosts/ # TODO: use ./hosts/
nixosConfigurations = { nixosConfigurations = {
artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote] []; artemis = mkLinuxSystem [./hosts/artemis] [];
hermes = mkLinuxSystem [./hosts/hermes inputs.nocodb.nixosModules.nocodb inputs.copyparty.nixosModules.default] [inputs.copyparty.overlays.default]; hermes = mkLinuxSystem [./hosts/hermes inputs.nocodb.nixosModules.nocodb inputs.copyparty.nixosModules.default] [inputs.copyparty.overlays.default];
}; };
diskoConfigurations = {}; # maybe? diskoConfigurations = {}; # maybe?
@ -88,7 +88,7 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
scenics.url = "github:callumio/scenics"; scenics.url = "github:callumio/scenics";
@ -117,12 +117,12 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
url = "github:danth/stylix/release-25.05"; url = "github:danth/stylix/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -161,11 +161,6 @@
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.2";
inputs.nixpkgs.follows = "nixpkgs";
};
nish = { nish = {
url = "github:callumio/nish"; url = "github:callumio/nish";
inputs = { inputs = {

View file

@ -24,7 +24,7 @@
adwaita-icon-theme adwaita-icon-theme
networkmanagerapplet networkmanagerapplet
libsecret libsecret
bitwarden bitwarden-desktop
#betterbird #betterbird
wl-clipboard wl-clipboard
discord discord

View file

@ -1,5 +1,6 @@
{...}: { {...}: {
programs.git = { programs = {
git = {
enable = true; enable = true;
userName = "Callum Leslie"; userName = "Callum Leslie";
@ -33,7 +34,8 @@
push = {autoSetupRemote = true;}; push = {autoSetupRemote = true;};
ghq = {root = "~/repos";}; ghq = {root = "~/repos";};
}; };
};
delta.enable = true; delta.enable = true;
delta.enableGitIntegration = true;
}; };
} }

View file

@ -11,7 +11,7 @@
chat = getProgFor "discord"; chat = getProgFor "discord";
media = getProgFor "spotify"; media = getProgFor "spotify";
terminal = getProgFor "alacritty"; terminal = getProgFor "alacritty";
runner = getProgFor' "rofi-wayland" "rofi"; runner = getProgFor "rofi";
rofi-rbw = getProgFor' "rofi-rbw-wayland" "rofi-rbw"; rofi-rbw = getProgFor' "rofi-rbw-wayland" "rofi-rbw";
tmux = getProgFor "tmux"; tmux = getProgFor "tmux";
slurp = getProgFor "slurp"; slurp = getProgFor "slurp";

View file

@ -1,7 +1,7 @@
{pkgs, ...}: { {pkgs, ...}: {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi;
#theme = "Arc-Dark"; #theme = "Arc-Dark";
}; };
} }

View file

@ -32,7 +32,7 @@
adwaita-icon-theme adwaita-icon-theme
apple-cursor apple-cursor
wget wget
pinentry pinentry-gnome3
fzf fzf
nil nil
killall killall

View file

@ -18,11 +18,8 @@
]; ];
#kernelPackages = pkgs.linuxPackages_latest; #kernelPackages = pkgs.linuxPackages_latest;
loader.systemd-boot.enable = lib.mkForce false; # loader.systemd-boot.enable = lib.mkForce false;
lanzaboote = { loader.systemd-boot.enable = true;
enable = true;
pkiBundle = "/etc/secureboot";
};
}; };
hardware = { hardware = {
bluetooth = { bluetooth = {
@ -39,7 +36,7 @@
#intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
intel-ocl intel-ocl
libvdpau-va-gl libvdpau-va-gl
vaapiVdpau libva-vdpau-driver
intel-compute-runtime intel-compute-runtime
vpl-gpu-rt vpl-gpu-rt
]; ];

View file

@ -8,7 +8,10 @@ in {
port = 8080; port = 8080;
settings = { settings = {
server_url = "https://${domain}"; server_url = "https://${domain}";
dns = {base_domain = "net.cleslie.uk";}; dns = {
base_domain = "net.cleslie.uk";
override_local_dns = false;
};
ip_prefixes = "100.64.0.0/10"; ip_prefixes = "100.64.0.0/10";
}; };

View file

@ -40,7 +40,7 @@ in {
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver intel-media-driver
intel-vaapi-driver # previously vaapiIntel intel-vaapi-driver # previously vaapiIntel
vaapiVdpau libva-vdpau-driver
libvdpau-va-gl libvdpau-va-gl
intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in) intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
unstable.vpl-gpu-rt # QSV on 11th gen or newer unstable.vpl-gpu-rt # QSV on 11th gen or newer

View file

@ -5,9 +5,9 @@ in {
cloudflare-dyndns.domains = [domain]; cloudflare-dyndns.domains = [domain];
n8n = { n8n = {
enable = true; enable = true;
webhookUrl = "https://" + domain + "/"; environment = {
settings = { PORT = "5678";
port = 5678; WEBHOOK_URL = "https://" + domain + "/";
}; };
}; };
caddy.virtualHosts.${domain}.extraConfig = '' caddy.virtualHosts.${domain}.extraConfig = ''

Binary file not shown.