10 Commits
work ... main

Author SHA1 Message Date
Alexander Wainwright
afd8f090ec Add syncthing to count 2025-12-24 16:18:42 +10:00
Alexander Wainwright
c565a01115 Add syncthing to alt 2025-12-24 00:58:49 +10:00
Alexander Wainwright
717f75ef94 Update lock file 2025-12-21 13:54:23 +10:00
Alexander Wainwright
10a9f560e7 Add en-GB to firefox
Not sure if this actually did anything.
2025-12-21 13:53:48 +10:00
Alexander Wainwright
fcb71caa6c Reorganise packages 2025-12-21 13:52:59 +10:00
Alexander Wainwright
cb903ac830 Merge remote-tracking branch 'origin/main' 2025-12-17 16:43:33 +10:00
Alexander Wainwright
7d85656190 Update lock file 2025-12-17 16:42:17 +10:00
Alexander Wainwright
d1811ec7ec Add node
Unfortunately needed for some neovim plugins.
2025-12-17 16:41:28 +10:00
Alexander Wainwright
3cf0f456b7 Update git config with default branch main 2025-12-17 16:38:15 +10:00
Alexander Wainwright
c8027e8f82 Enable mouse in tmux 2025-12-17 13:17:20 +10:00
9 changed files with 52 additions and 113 deletions

View File

@@ -138,10 +138,14 @@
# basic configuration of git, please change to your own # basic configuration of git, please change to your own
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Alexander Wainwright"; settings = {
userEmail = "alexander.l.wainwright@boeing.com"; user = {
extraConfig = { name = "Alexander Wainwright";
pull.ff = "only"; email = "code@figtree.dev";
};
init = {
defaultBranch = "main";
};
}; };
}; };

View File

@@ -18,14 +18,7 @@ config.window_frame = {
config.font_size = 9.5 config.font_size = 9.5
config.hide_tab_bar_if_only_one_tab = true config.hide_tab_bar_if_only_one_tab = true
-- config.font = wezterm.font 'Fira Code' config.font = wezterm.font 'Fira Code'
-- config.font = wezterm.font 'Lilex Nerd Font' config.font = wezterm.font 'Lilex Nerd Font'
config.font = wezterm.font_with_fallback {
'Fira Code', -- Replace with your preferred main font
'Noto Sans Symbols 2', -- Great for arrows like \u{1f898}
'Noto Sans',
'Symbols Nerd Font Mono',
}
return config return config

12
flake.lock generated
View File

@@ -25,11 +25,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765605144, "lastModified": 1765979862,
"narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "90b62096f099b73043a747348c11dbfcfbdea949", "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -76,11 +76,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1765311797, "lastModified": 1765838191,
"narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -11,6 +11,7 @@
../modules/base.nix ../modules/base.nix
../modules/kafka-mounts.nix ../modules/kafka-mounts.nix
../modules/server.nix ../modules/server.nix
../modules/syncthing.nix
./caddy.nix ./caddy.nix
]; ];
@@ -20,6 +21,8 @@
privileged = true; privileged = true;
}; };
services.syncthing.guiAddress = "0.0.0.0:8384";
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
80 443 # caddy 80 443 # caddy
8000 8000
@@ -27,6 +30,7 @@
8010 # audio bookshelf 8010 # audio bookshelf
8080 # file browser 8080 # file browser
8234 # shiori (non-standard) 8234 # shiori (non-standard)
8384 # syncthing
9117 9117
8191 # flaresolverr 8191 # flaresolverr
]; ];

View File

@@ -13,97 +13,15 @@
../modules/laptop.nix ../modules/laptop.nix
]; ];
users.users.michael = {
isNormalUser = true;
description = "Michael Christian Latino";
extraGroups = [ ];
packages = with pkgs; [
];
shell = pkgs.fish;
};
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# Use latest kernel. # Use latest kernel.
# boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelPackages = pkgs.linuxPackages_6_12;
networking.hostName = "armitage"; networking.hostName = "armitage";
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
hardware.graphics.enable = true;
# Load nvidia driver for Xorg and Wayland
services.xserver.videoDrivers = ["nvidia" "displaylink" "modesetting"];
boot = {
blacklistedKernelModules = [ "nouveau" ];
};
hardware.nvidia = {
# Modesetting is required.
modesetting.enable = true;
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
# Enable this if you have graphical corruption issues or application crashes after waking
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
# of just the bare essentials.
powerManagement.enable = false;
# Fine-grained power management. Turns off GPU when not in use.
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
powerManagement.finegrained = false;
# Use the NVidia open source kernel module (not to be confused with the
# independent third-party "nouveau" open source driver).
# Support is limited to the Turing and later architectures. Full list of
# supported GPUs is at:
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
# Only available from driver 515.43.04+
open = true;
# Enable the Nvidia settings menu,
# accessible via `nvidia-settings`.
nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU.
# package = config.boot.kernelPackages.nvidiaPackages.stable;
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "580.76.05";
sha256_64bit = "sha256-IZvmNrYJMbAhsujB4O/4hzY8cx+KlAyqh7zAVNBdl/0=";
sha256_aarch64 = "sha256-NL2DswzVWQQMVM092NmfImqKbTk9VRgLL8xf4QEvGAQ=";
openSha256 = "sha256-xEPJ9nskN1kISnSbfBigVaO6Mw03wyHebqQOQmUg/eQ=";
settingsSha256 = "sha256-ll7HD7dVPHKUyp5+zvLeNqAb6hCpxfwuSyi+SAXapoQ=";
persistencedSha256 = "sha256-bs3bUi8LgBu05uTzpn2ugcNYgR5rzWEPaTlgm0TIpHY=";
};
prime = {
sync.enable = true;
amdgpuBusId = "PCI:0:65:0";
nvidiaBusId = "PCI:0:64:0";
};
};
# packages
environment.systemPackages = with pkgs; [
displaylink
libreoffice
];
# Already detected directories
programs = {
direnv = {
enable = true;
enableBashIntegration = true;
nix-direnv.enable = true;
};
};
# # display link drivers
# systemd.services.dlm.wantedBy = [ "multi-user.target" ];
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions

View File

@@ -12,6 +12,7 @@
../modules/desktop.nix ../modules/desktop.nix
../modules/brother-printer.nix ../modules/brother-printer.nix
../modules/home.nix ../modules/home.nix
../modules/syncthing.nix
]; ];
# Bootloader. # Bootloader.

View File

@@ -11,6 +11,11 @@
shell = pkgs.fish; shell = pkgs.fish;
}; };
# enable a 1GB swap file
swapDevices = [{
device = "/swapfile";
size = 1024;
}];
# enable zram. not totally sure if this does it in physical ram or just swap # enable zram. not totally sure if this does it in physical ram or just swap
zramSwap.enable = true; zramSwap.enable = true;
@@ -65,7 +70,7 @@
nix.gc = { nix.gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";
options = "--delete-older-than 60d"; options = "--delete-older-than 30d";
}; };
# Enable zeroconf # Enable zeroconf
@@ -116,14 +121,12 @@
fd fd
git git
gocryptfs gocryptfs
man-pages
mosh mosh
neovim neovim
python314 python314
ripgrep ripgrep
rsync rsync
silver-searcher silver-searcher
sqlite
tldr tldr
unzip unzip
uv uv

View File

@@ -28,19 +28,19 @@
enableDefaultPackages = true; enableDefaultPackages = true;
packages = with pkgs; [ packages = with pkgs; [
bitwarden-desktop
khmeros khmeros
libreoffice-fresh
nerd-fonts.lilex
noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-cjk-serif noto-fonts-cjk-serif
noto-fonts-color-emoji nerd-fonts.lilex
fira-code fira-code
meld
]; ];
}; };
environment.systemPackages = with pkgs; [
bitwarden-desktop
libreoffice-fresh
];
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@@ -67,5 +67,10 @@
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
# Install firefox. # Install firefox.
programs.firefox.enable = true; programs.firefox = {
enable = true;
languagePacks = [
"en-GB"
];
};
} }

View File

@@ -0,0 +1,11 @@
{ config, pkgs, inputs, ... }:
{
# sync thing
services.syncthing = {
enable = true;
openDefaultPorts = true;
user = "alex";
configDir = "/home/alex/.config/syncthing";
dataDir = "/home/alex";
};
}