mirror of
https://github.com/callumio/nixfiles.git
synced 2026-05-06 11:08:09 +01:00
Compare commits
4 commits
76004eeb37
...
b8f1924a4c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b8f1924a4c | ||
| 7a7f7fb13d | |||
| ba4f1bcfcc | |||
| d400e84092 |
18 changed files with 234 additions and 431 deletions
549
flake.lock
generated
549
flake.lock
generated
File diff suppressed because it is too large
Load diff
13
flake.nix
13
flake.nix
|
|
@ -39,7 +39,7 @@
|
|||
inherit (mods) homeManagerModules nixosModules;
|
||||
# TODO: use ./hosts/
|
||||
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];
|
||||
};
|
||||
diskoConfigurations = {}; # maybe?
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
};
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
scenics.url = "github:callumio/scenics";
|
||||
|
|
@ -117,12 +117,12 @@
|
|||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
stylix = {
|
||||
url = "github:danth/stylix/release-25.05";
|
||||
url = "github:danth/stylix/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -161,11 +161,6 @@
|
|||
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
lanzaboote = {
|
||||
url = "github:nix-community/lanzaboote/v0.4.2";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nish = {
|
||||
url = "github:callumio/nish";
|
||||
inputs = {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
adwaita-icon-theme
|
||||
networkmanagerapplet
|
||||
libsecret
|
||||
bitwarden
|
||||
bitwarden-desktop
|
||||
#betterbird
|
||||
wl-clipboard
|
||||
discord
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{config, ...}: {
|
||||
{...}: {
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ in {
|
|||
enable = true;
|
||||
|
||||
interactiveShellInit = ''
|
||||
set sponge_purge_only_on_exit true
|
||||
set fish_greeting
|
||||
trap __trap_exit_tmux EXIT
|
||||
'';
|
||||
|
|
@ -31,7 +32,6 @@ in {
|
|||
};
|
||||
|
||||
plugins = with pkgs.fishPlugins; [
|
||||
(mkFishPlug z)
|
||||
(mkFishPlug hydro)
|
||||
(mkFishPlug sponge)
|
||||
(mkFishPlug grc)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{...}: {
|
||||
programs.git = {
|
||||
programs = {
|
||||
git = {
|
||||
enable = true;
|
||||
|
||||
userName = "Callum Leslie";
|
||||
|
|
@ -33,7 +34,8 @@
|
|||
push = {autoSetupRemote = true;};
|
||||
ghq = {root = "~/repos";};
|
||||
};
|
||||
|
||||
};
|
||||
delta.enable = true;
|
||||
delta.enableGitIntegration = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
chat = getProgFor "discord";
|
||||
media = getProgFor "spotify";
|
||||
terminal = getProgFor "alacritty";
|
||||
runner = getProgFor' "rofi-wayland" "rofi";
|
||||
runner = getProgFor "rofi";
|
||||
rofi-rbw = getProgFor' "rofi-rbw-wayland" "rofi-rbw";
|
||||
tmux = getProgFor "tmux";
|
||||
slurp = getProgFor "slurp";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{lib, ...}: {
|
||||
{...}: {
|
||||
programs.jujutsu = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{pkgs, ...}: {
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi-wayland;
|
||||
package = pkgs.rofi;
|
||||
#theme = "Arc-Dark";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
adwaita-icon-theme
|
||||
apple-cursor
|
||||
wget
|
||||
pinentry
|
||||
pinentry-gnome3
|
||||
fzf
|
||||
nil
|
||||
killall
|
||||
|
|
|
|||
|
|
@ -18,11 +18,8 @@
|
|||
];
|
||||
#kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
loader.systemd-boot.enable = lib.mkForce false;
|
||||
lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/etc/secureboot";
|
||||
};
|
||||
# loader.systemd-boot.enable = lib.mkForce false;
|
||||
loader.systemd-boot.enable = true;
|
||||
};
|
||||
hardware = {
|
||||
bluetooth = {
|
||||
|
|
@ -39,7 +36,7 @@
|
|||
#intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
|
||||
intel-ocl
|
||||
libvdpau-va-gl
|
||||
vaapiVdpau
|
||||
libva-vdpau-driver
|
||||
intel-compute-runtime
|
||||
vpl-gpu-rt
|
||||
];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ in {
|
|||
};
|
||||
};
|
||||
"/paperless" = {
|
||||
path = "/var/lib/media/library";
|
||||
path = "/var/lib/paperless";
|
||||
access = {
|
||||
rw = ["c"];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,10 @@ in {
|
|||
port = 8080;
|
||||
settings = {
|
||||
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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
{pkgs, ...}: let
|
||||
mediaDir = "/var/lib/media";
|
||||
in {
|
||||
users = {
|
||||
|
|
@ -40,7 +36,7 @@ in {
|
|||
extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
intel-vaapi-driver # previously vaapiIntel
|
||||
vaapiVdpau
|
||||
libva-vdpau-driver
|
||||
libvdpau-va-gl
|
||||
intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
|
||||
unstable.vpl-gpu-rt # QSV on 11th gen or newer
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ in {
|
|||
cloudflare-dyndns.domains = [domain];
|
||||
n8n = {
|
||||
enable = true;
|
||||
webhookUrl = "https://" + domain + "/";
|
||||
settings = {
|
||||
port = 5678;
|
||||
environment = {
|
||||
PORT = "5678";
|
||||
WEBHOOK_URL = "https://" + domain + "/";
|
||||
};
|
||||
};
|
||||
caddy.virtualHosts.${domain}.extraConfig = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
config,
|
||||
options,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
om = inputs'.omnix.packages.default;
|
||||
nvf = inputs'.nvf.packages.default;
|
||||
agenix = inputs'.agenix.packages.default;
|
||||
vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
|
||||
vaapiIntel = pkgs.intel-vaapi-driver.override {enableHybridCodec = true;};
|
||||
devour-flake = pkgs.callPackage inputs.devour-flake {};
|
||||
nish = inputs'.nish.packages.default;
|
||||
nsbm = inputs'.nsbm.packages.default;
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue