Compare commits

11 Commits
main ... work

Author SHA1 Message Date
Alexander Wainwright
5f4e768666 Set delete window longer on work laptop 2025-12-16 13:44:25 +10:00
Alexander Wainwright
3472cc5fb9 Remove duplicate libreoffice 2025-12-16 13:02:30 +10:00
Alexander Wainwright
9a77d382df Add meld 2025-12-16 13:02:18 +10:00
Alexander Wainwright
f61c516048 Add fonts 2025-12-16 13:01:31 +10:00
Alexander Wainwright
b0180f42b3 Add man, sqlite and node 2025-12-16 13:00:52 +10:00
Alexander Wainwright
1d685b3600 Disable swap file 2025-12-16 13:00:22 +10:00
Alexander Wainwright
32b0b38523 Add michael's user 2025-12-16 13:00:08 +10:00
Alexander Wainwright
24c7043fa2 Add nvidia driver and set kernel version 2025-12-16 12:58:40 +10:00
Alexander Wainwright
7e6f12dac9 Update some font stuff 2025-12-16 12:57:35 +10:00
Alexander Wainwright
e737b45307 Enable mouse in tmux 2025-12-16 12:56:48 +10:00
Alexander Wainwright
db3b4c0441 Add some git config and work email 2025-12-16 12:56:35 +10:00
6 changed files with 106 additions and 17 deletions

View File

@@ -139,7 +139,10 @@
programs.git = {
enable = true;
userName = "Alexander Wainwright";
userEmail = "code@figtree.dev";
userEmail = "alexander.l.wainwright@boeing.com";
extraConfig = {
pull.ff = "only";
};
};
# starship - an customizable prompt for any shell

View File

@@ -379,7 +379,7 @@ tmux_conf_urlscan_options="--compact --dedupe"
#set -g history-limit 10000
# start with mouse mode enabled
#set -g mouse on
set -g mouse on
# force Vi mode
# really you should export VISUAL or EDITOR environment variable, see manual

View File

@@ -18,7 +18,14 @@ config.window_frame = {
config.font_size = 9.5
config.hide_tab_bar_if_only_one_tab = true
config.font = wezterm.font 'Fira Code'
config.font = wezterm.font 'Lilex Nerd Font'
-- config.font = wezterm.font 'Fira Code'
-- 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

View File

@@ -13,15 +13,97 @@
../modules/laptop.nix
];
users.users.michael = {
isNormalUser = true;
description = "Michael Christian Latino";
extraGroups = [ ];
packages = with pkgs; [
];
shell = pkgs.fish;
};
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Use latest kernel.
boot.kernelPackages = pkgs.linuxPackages_latest;
# boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelPackages = pkgs.linuxPackages_6_12;
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
# settings for stateful data, like file locations and database versions

View File

@@ -11,11 +11,6 @@
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
zramSwap.enable = true;
@@ -70,7 +65,7 @@
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 30d";
options = "--delete-older-than 60d";
};
# Enable zeroconf
@@ -121,12 +116,14 @@
fd
git
gocryptfs
man-pages
mosh
neovim
python314
ripgrep
rsync
silver-searcher
sqlite
tldr
unzip
uv
@@ -141,6 +138,7 @@
clang
gnumake
libtool
nodejs_24
# rust
cargo

View File

@@ -31,17 +31,16 @@
bitwarden-desktop
khmeros
libreoffice-fresh
nerd-fonts.lilex
noto-fonts
noto-fonts-cjk-sans
noto-fonts-cjk-serif
nerd-fonts.lilex
noto-fonts-color-emoji
fira-code
meld
];
};
environment.systemPackages = with pkgs; [
libreoffice
];
# Enable networking
networking.networkmanager.enable = true;