Compare commits

..

No commits in common. "7a7f7fb13d91edd39d175a1e800cebebcae857bf" and "ce8f26e29beccb52432a487c4b512b295675d602" have entirely different histories.

18 changed files with 431 additions and 234 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] []; artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote] [];
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.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
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.11"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
url = "github:danth/stylix/release-25.11"; url = "github:danth/stylix/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -161,6 +161,11 @@
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-desktop bitwarden
#betterbird #betterbird
wl-clipboard wl-clipboard
discord discord

View file

@ -1,4 +1,4 @@
{...}: { {config, ...}: {
programs.direnv = { programs.direnv = {
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;

View file

@ -13,7 +13,6 @@ in {
enable = true; enable = true;
interactiveShellInit = '' interactiveShellInit = ''
set sponge_purge_only_on_exit true
set fish_greeting set fish_greeting
trap __trap_exit_tmux EXIT trap __trap_exit_tmux EXIT
''; '';
@ -32,6 +31,7 @@ in {
}; };
plugins = with pkgs.fishPlugins; [ plugins = with pkgs.fishPlugins; [
(mkFishPlug z)
(mkFishPlug hydro) (mkFishPlug hydro)
(mkFishPlug sponge) (mkFishPlug sponge)
(mkFishPlug grc) (mkFishPlug grc)

View file

@ -1,41 +1,39 @@
{...}: { {...}: {
programs = { programs.git = {
git = { enable = true;
enable = true;
userName = "Callum Leslie"; userName = "Callum Leslie";
userEmail = "git@cleslie.uk"; userEmail = "git@cleslie.uk";
signing.key = "03B01F427831BCFD!"; signing.key = "03B01F427831BCFD!";
signing.signByDefault = true; signing.signByDefault = true;
ignores = [".direnv/"]; ignores = [".direnv/"];
includes = [ includes = [
{ {
condition = "gitdir:~/repos/projects.cs.nott.ac.uk/"; condition = "gitdir:~/repos/projects.cs.nott.ac.uk/";
contents = { contents = {
user = { user = {
email = "psycl6@nottingham.ac.uk"; email = "psycl6@nottingham.ac.uk";
signingKey = "14861F1282EFB5C8!"; signingKey = "14861F1282EFB5C8!";
};
credential = {helper = "store";};
}; };
} credential = {helper = "store";};
];
extraConfig = {
core = {
longpaths = true;
autocrlf = false;
}; };
}
];
init = {defaultBranch = "main";}; extraConfig = {
core = {
push = {autoSetupRemote = true;}; longpaths = true;
ghq = {root = "~/repos";}; autocrlf = false;
}; };
init = {defaultBranch = "main";};
push = {autoSetupRemote = true;};
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"; runner = getProgFor' "rofi-wayland" "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,4 +1,4 @@
{...}: { {lib, ...}: {
programs.jujutsu = { programs.jujutsu = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,7 +1,7 @@
{pkgs, ...}: { {pkgs, ...}: {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi; package = pkgs.rofi-wayland;
#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-gnome3 pinentry
fzf fzf
nil nil
killall killall

View file

@ -18,8 +18,11 @@
]; ];
#kernelPackages = pkgs.linuxPackages_latest; #kernelPackages = pkgs.linuxPackages_latest;
# loader.systemd-boot.enable = lib.mkForce false; loader.systemd-boot.enable = lib.mkForce false;
loader.systemd-boot.enable = true; lanzaboote = {
enable = true;
pkiBundle = "/etc/secureboot";
};
}; };
hardware = { hardware = {
bluetooth = { bluetooth = {
@ -36,7 +39,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
libva-vdpau-driver vaapiVdpau
intel-compute-runtime intel-compute-runtime
vpl-gpu-rt vpl-gpu-rt
]; ];

View file

@ -20,7 +20,7 @@ in {
}; };
}; };
"/paperless" = { "/paperless" = {
path = "/var/lib/paperless"; path = "/var/lib/media/library";
access = { access = {
rw = ["c"]; rw = ["c"];
}; };

View file

@ -8,10 +8,7 @@ in {
port = 8080; port = 8080;
settings = { settings = {
server_url = "https://${domain}"; server_url = "https://${domain}";
dns = { dns = {base_domain = "net.cleslie.uk";};
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

@ -1,4 +1,8 @@
{pkgs, ...}: let {
pkgs,
config,
...
}: let
mediaDir = "/var/lib/media"; mediaDir = "/var/lib/media";
in { in {
users = { users = {
@ -36,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
libva-vdpau-driver vaapiVdpau
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;
environment = { webhookUrl = "https://" + domain + "/";
PORT = "5678"; settings = {
WEBHOOK_URL = "https://" + domain + "/"; port = 5678;
}; };
}; };
caddy.virtualHosts.${domain}.extraConfig = '' caddy.virtualHosts.${domain}.extraConfig = ''

View file

@ -1,5 +1,6 @@
{ {
config, config,
options,
lib, lib,
... ...
}: }:

View file

@ -7,7 +7,7 @@
om = inputs'.omnix.packages.default; om = inputs'.omnix.packages.default;
nvf = inputs'.nvf.packages.default; nvf = inputs'.nvf.packages.default;
agenix = inputs'.agenix.packages.default; agenix = inputs'.agenix.packages.default;
vaapiIntel = pkgs.intel-vaapi-driver.override {enableHybridCodec = true;}; vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
devour-flake = pkgs.callPackage inputs.devour-flake {}; devour-flake = pkgs.callPackage inputs.devour-flake {};
nish = inputs'.nish.packages.default; nish = inputs'.nish.packages.default;
nsbm = inputs'.nsbm.packages.default; nsbm = inputs'.nsbm.packages.default;

Binary file not shown.