This commit is contained in:
wayne 2025-06-16 11:00:25 -07:00
parent d7c041ccf4
commit 48ff99f129
16 changed files with 636 additions and 311 deletions

0
25.05-updates.log Normal file
View File

View File

@ -66,6 +66,7 @@ in
zsh.enable = true; zsh.enable = true;
nix-ld.enable = true; nix-ld.enable = true;
fuse.userAllowOther = true; fuse.userAllowOther = true;
nm-applet.enable = true;
}; };
@ -164,6 +165,12 @@ in
log.level = 4; log.level = 4;
}; };
}; };
pulseaudio = {
enable = false;
daemon = {
logLevel = "debug";
};
};
# hardware.openrgb = { # hardware.openrgb = {
# enable = false; # enable = false;
# package = pkgs.openrgb-with-all-plugins; # package = pkgs.openrgb-with-all-plugins;
@ -172,7 +179,7 @@ in
# }; # };
pia = { pia = {
enable = true; enable = true;
authUserPassFile = config.age.secrets.pia.path; authUserPassFile = config.age.secrets.pia.path;
}; };
samba = { samba = {
enable = false; enable = false;
@ -191,7 +198,7 @@ in
keybase.enable = true; keybase.enable = true;
kbfs = { kbfs = {
enable = true; enable = true;
mountPoint = "keybase"; mountPoint = "%h/keybase";
extraFlags = [ extraFlags = [
"-label: kbfs" "-label: kbfs"
"-mount-type: normal" "-mount-type: normal"
@ -227,7 +234,7 @@ in
# kdePackages.wayland kdePackages.wayland-protocols kdePackages.xwaylandvideobridge kdePackages.kwayland kdePackages.wayqt kdePackages.qtwayland kdePackages.layer-shell-qt # marked broken kdePackages.kwayland-integration # kdePackages.wayland kdePackages.wayland-protocols kdePackages.xwaylandvideobridge kdePackages.kwayland kdePackages.wayqt kdePackages.qtwayland kdePackages.layer-shell-qt # marked broken kdePackages.kwayland-integration
kdePackages.kdeplasma-addons kdePackages.qtstyleplugin-kvantum kdePackages.full kdePackages.qtwebengine kdePackages.kdeplasma-addons kdePackages.qtstyleplugin-kvantum kdePackages.full kdePackages.qtwebengine
kdePackages.qtpositioning kdePackages.qtlocation kdePackages.ark kdePackages.dolphin kdePackages.qtpositioning kdePackages.qtlocation kdePackages.ark kdePackages.dolphin
kdePackages.dolphin-plugins kdePackages.dolphin-plugins kdePackages.okular
kdePackages.konsole kdePackages.konsole
# kdePackages.qtwayland kdePackages.qtsvg # kdePackages.qtwayland kdePackages.qtsvg
kdePackages.kio kdePackages.kio-fuse kdePackages.kio-extras kdePackages.kio-admin kdePackages.kio kdePackages.kio-fuse kdePackages.kio-extras kdePackages.kio-admin
@ -261,5 +268,5 @@ in
logiops logiops
]; ];
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }

46
flake.lock generated
View File

@ -8,11 +8,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1736955230, "lastModified": 1747575206,
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700795494, "lastModified": 1744478979,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703113217, "lastModified": 1745494811,
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,16 +189,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746171682, "lastModified": 1749154018,
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "50eee705bbdbac942074a8c120e8194185633675", "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -257,11 +257,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1703013332, "lastModified": 1745391562,
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -320,16 +320,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1744168086, "lastModified": 1750005367,
"narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=", "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73", "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -441,11 +441,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745121923, "lastModified": 1749874024,
"narHash": "sha256-8X9JuDfxAEQlBhB0ARgFj9fbDOlCvPx6AbQ1h2T47/g=", "narHash": "sha256-bFNesH4+qRcsA/bL+HT4ep1rNkn1A1AZ2RmlZlETwlw=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "02084a38e9dbc4fa17f3474c3e9d43bb7db55799", "rev": "d3d3c12550f1d4196bd7f2971c65ffde2bd92a07",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -4,11 +4,11 @@
inputs = { inputs = {
# Switched to unstable 10/13/24 Generation 109 and below stable # Switched to unstable 10/13/24 Generation 109 and below stable
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
legacy.url = "github:NixOS/nixpkgs-channels"; legacy.url = "github:NixOS/nixpkgs-channels";
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";

View File

@ -62,11 +62,5 @@
nvidia-container-toolkit = { nvidia-container-toolkit = {
enable = true; enable = true;
}; };
pulseaudio = {
enable = false;
daemon = {
logLevel = "debug";
};
};
}; };
} }

View File

@ -217,6 +217,7 @@ in
}; };
services = { services = {
blueman-applet.enable = true; blueman-applet.enable = true;
keybase.enable = true;
nextcloud-client = { nextcloud-client = {
enable = false; enable = false;
startInBackground = false; startInBackground = false;
@ -224,6 +225,8 @@ in
udiskie = { udiskie = {
enable = true; enable = true;
notify = true; notify = true;
# tray = "auto";
automount = true;
settings = { settings = {
program_options = { program_options = {
tray = "auto"; tray = "auto";
@ -238,5 +241,5 @@ in
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
home.stateVersion = "24.11"; home.stateVersion = "25.05";
} }

View File

@ -9,8 +9,8 @@
containers = { containers = {
nextcloud = { nextcloud = {
privateNetwork = true; privateNetwork = true;
hostAddress = "192.168.12.40"; hostAddress = "192.168.1.40";
localAddress = "192.168.12.71/24"; localAddress = "192.168.1.71/24";
hostBridge = "br0"; hostBridge = "br0";
autoStart = false; autoStart = false;
bindMounts = { bindMounts = {
@ -76,7 +76,7 @@
settings = { settings = {
default_phone_region = "US"; default_phone_region = "US";
trusted_domains = [ "localhost" "launchpad" "192.168.12.40" "192.168.12.71" ]; trusted_domains = [ "localhost" "launchpad" "192.168.1.40" "192.168.1.71" ];
}; };
config = { config = {
@ -94,7 +94,7 @@
autoStart = false; autoStart = false;
privateNetwork = true; privateNetwork = true;
hostBridge = "br0"; hostBridge = "br0";
localAddress = "192.168.12.72/24"; localAddress = "192.168.1.72/24";
bindMounts = { bindMounts = {
"/etc/ssh/ssh_host_ed25519_key".isReadOnly = true; "/etc/ssh/ssh_host_ed25519_key".isReadOnly = true;
}; };
@ -134,7 +134,7 @@
autoStart = false; autoStart = false;
privateNetwork = true; privateNetwork = true;
hostBridge = "br0"; hostBridge = "br0";
localAddress = "192.168.12.73/24"; localAddress = "192.168.1.73/24";
bindMounts = { bindMounts = {
"/etc/ssh/ssh_host_ed25519_key".isReadOnly = true; "/etc/ssh/ssh_host_ed25519_key".isReadOnly = true;
}; };
@ -189,7 +189,7 @@
autoStart = false; autoStart = false;
privateNetwork = true; privateNetwork = true;
hostBridge = "br0"; hostBridge = "br0";
localAddress = "192.168.12.74/24"; localAddress = "192.168.1.74/24";
bindMounts = { bindMounts = {
"/etc/ssh/ssh_host_ed25519_key".isReadOnly = true; "/etc/ssh/ssh_host_ed25519_key".isReadOnly = true;
}; };
@ -232,8 +232,8 @@
laravel = { laravel = {
privateNetwork = true; privateNetwork = true;
hostAddress = "192.168.12.40"; hostAddress = "192.168.1.40";
localAddress = "192.168.12.75/24"; localAddress = "192.168.1.75/24";
hostBridge = "br0"; hostBridge = "br0";
autoStart = false; autoStart = false;
bindMounts = { bindMounts = {
@ -252,7 +252,7 @@
allowedTCPPortRanges = [ { from = 8000; to = 9000; } ]; allowedTCPPortRanges = [ { from = 8000; to = 9000; } ];
}; };
enableIPv6 = false; enableIPv6 = false;
nameservers = [ "192.168.12.25" ]; nameservers = [ "192.168.1.25" ];
# extraHosts = '' # extraHosts = ''
# 140.82.116.6 api.github.com # 140.82.116.6 api.github.com
# ''; # '';
@ -366,8 +366,8 @@
mailpit = { mailpit = {
privateNetwork = true; privateNetwork = true;
hostAddress = "192.168.12.40"; hostAddress = "192.168.1.40";
localAddress = "192.168.12.76/24"; localAddress = "192.168.1.76/24";
hostBridge = "br0"; hostBridge = "br0";
autoStart = false; autoStart = false;
# bindMounts = { # bindMounts = {
@ -436,8 +436,8 @@
webserver = { webserver = {
privateNetwork = true; privateNetwork = true;
hostAddress = "192.168.12.40"; hostAddress = "192.168.1.40";
localAddress = "192.168.12.76/24"; localAddress = "192.168.1.76/24";
hostBridge = "br0"; hostBridge = "br0";
autoStart = false; autoStart = false;
allowedDevices = [ allowedDevices = [
@ -474,7 +474,7 @@
}; };
networking = { networking = {
enableIPv6 = false; enableIPv6 = false;
nameservers = [ "192.168.12.25" ]; nameservers = [ "192.168.1.25" ];
}; };
users = { users = {
@ -618,8 +618,8 @@
glance = { glance = {
privateNetwork = true; privateNetwork = true;
hostAddress = "192.168.12.40"; hostAddress = "192.168.1.40";
localAddress = "192.168.12.77/24"; localAddress = "192.168.1.77/24";
hostBridge = "br0"; hostBridge = "br0";
autoStart = false; autoStart = false;
@ -629,7 +629,7 @@
networking = { networking = {
firewall.enable = false; firewall.enable = false;
enableIPv6 = false; enableIPv6 = false;
nameservers = [ "192.168.12.25" ]; nameservers = [ "192.168.1.25" ];
}; };
services.glance = { services.glance = {
@ -860,8 +860,8 @@
vite = { vite = {
privateNetwork = true; privateNetwork = true;
hostAddress = "192.168.12.40"; hostAddress = "192.168.1.40";
localAddress = "192.168.12.78/24"; localAddress = "192.168.1.78/24";
hostBridge = "br0"; hostBridge = "br0";
autoStart = false; autoStart = false;
allowedDevices = [ allowedDevices = [
@ -910,7 +910,7 @@
allowedTCPPorts = [ 22 80 443 1025 5173 8025 8080 27017 ]; allowedTCPPorts = [ 22 80 443 1025 5173 8025 8080 27017 ];
}; };
enableIPv6 = false; enableIPv6 = false;
nameservers = [ "192.168.12.25" ]; nameservers = [ "192.168.1.25" ];
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -1025,8 +1025,8 @@
node = { node = {
privateNetwork = true; privateNetwork = true;
hostAddress = "192.168.12.40"; hostAddress = "192.168.1.40";
localAddress = "192.168.12.79/24"; localAddress = "192.168.1.79/24";
hostBridge = "br0"; hostBridge = "br0";
autoStart = false; autoStart = false;
allowedDevices = [ allowedDevices = [
@ -1051,7 +1051,7 @@
allowedTCPPorts = [ 22 80 443 1025 5173 8025 8080 ]; allowedTCPPorts = [ 22 80 443 1025 5173 8025 8080 ];
}; };
enableIPv6 = false; enableIPv6 = false;
nameservers = [ "192.168.12.25" ]; nameservers = [ "192.168.1.25" ];
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -1168,5 +1168,295 @@
system.stateVersion = "24.11"; system.stateVersion = "24.11";
}; };
}; };
dmp = {
privateNetwork = true;
hostAddress = "192.168.1.40";
localAddress = "192.168.1.90/24";
hostBridge = "br0";
autoStart = false;
allowedDevices = [
{
modifier = "rw";
node = "/dev/net/tun";
}
];
bindMounts = {
"/home/wayne/DMP" = {
hostPath = "/home/wayne/dev/whd/DMP/";
isReadOnly = false;
};
};
config = { config, pkgs, ... }:
{
# networking.firewall.allowedTCPPorts = [ 80 ];
networking = {
firewall = {
enable = false;
allowedTCPPorts = [ 22 80 443 1025 5173 8025 8080 27017 ];
};
enableIPv6 = false;
nameservers = [ "192.168.1.1" ];
};
nixpkgs.config.allowUnfree = true;
users = {
groups = {};
users = {
wayne = {
isNormalUser = true;
description = "Wayne Hayes";
extraGroups = [ "networkmanager" "wheel" "wayne" ];
openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6q75AXShVjzWerPFU3l0YXIKViNF4eyragL+RQIRwdNDMzW34GgxFhtyLsmRB2jsykf4gx76zSyJoii0K4uhS761w5oDXz9mqHnBzJutDTyltLyfgLsFKY8V2sOtSracWx4y6QrtmBR3MKV642kg5mufVEmCMVxBU9oVpIOJUSW+XNYBawaSkl5SjDMLI7flj0v9Hb2dZqjQigDM1+UHxTzcMoZnR6hAzoZpPNMGyZXtrgEotNywNdpxCqRV9T/KvKHSIVYc1umiDXc+5fyRo9v7CzvYY3MvRKWbgUfTVQRmR2kqwsGAsV5W+PEUb8qqmTjPVXusKxKlpGgYfsvIZOv0LgOvQMemga8psFIS9F4YQ1xuc092bKi1LteC+ZlabMLRMux6Wbhjci+v9wnLfTyBQc6wr3wDFJoELKyaLnI7Cn0KHn0k+BiYCCr2TjKrz9XztL490vprYtvVumNFZ3rxewGnZSn/2czaFfQgnXt+9xQGWWo9TJGE5jq1jThnsIbH3G9JIQ1WhomMq6DDRhGMX2ZKDk/M9/fk0XN5nvQyJNmbiHy5srW/VANx8R9jjsVkvX29MXeK6dzpR4ImywXggpYMeHB6moy06cJUu5WoR8aLS/rO5LbZM2j14AMQ2ZK79QfUJSdloA1/HHlmnx7YtzZOebD6BCR7xgasGRw== wayne"];
packages = with pkgs; [
sl cowsay lolcat
];
};
};
};
services.tailscale = {
enable = false;
package = pkgs.tailscale;
interfaceName = "tailscale0";
openFirewall = true;
port = 41641;
useRoutingFeatures = "client";
};
services.mailpit.instances = {
local = {
smtp = "127.0.0.1:1025";
listen = "127.0.0.1:8025";
database = "mailpit.db";
};
};
services.mongodb = {
enable = true;
package = pkgs.mongodb-ce;
user = "mongodb";
bind_ip = "0.0.0.0";
dbpath = "/var/db/mongodb";
enableAuth = false;
pidFile = "/run/mongodb.pid";
extraConfig = '''';
};
services.jenkins = {
enable = true;
};
services.openssh = {
enable = true;
ports = [ 22 ];
settings = {
PasswordAuthentication = true;
AllowUsers = [ "wayne" ];
UseDns = true;
X11Forwarding = false;
PermitRootLogin = "no";
};
};
# Configure bash globally
programs.bash = {
completion = {
enable = true;
package = pkgs.bash-completion;
};
enableLsColors = true;
# Global bash configuration that applies to all users
shellInit = ''
# Ensure .bashrc is sourced for all bash sessions
if [ -f ~/.bashrc ]; then
source ~/.bashrc
fi
'';
# Global aliases and functions
shellAliases = {
ll = "ls -alF";
la = "ls -A";
l = "ls -CF";
grep = "grep --color=auto";
fgrep = "fgrep --color=auto";
egrep = "egrep --color=auto";
};
};
programs.neovim.enable = true;
programs.tmux = {
enable = true;
terminal = "tmux-256color";
keyMode = "vi";
shortcut = "s";
extraConfig = ''
set -ag terminal-overrides ",xterm-256color:RGB"
set -g mouse on
# Resize pane key bindings
bind -r < resize-pane -L 5
bind -r > resize-pane -R 5
bind -r + resize-pane -U 5
bind -r - resize-pane -D 5
set-option -g status-position top
'';
plugins = [
pkgs.tmuxPlugins.weather
pkgs.tmuxPlugins.tmux-fzf
pkgs.tmuxPlugins.resurrect
pkgs.tmuxPlugins.nord
];
};
programs.zsh = {
enable = true;
enableCompletion = true;
autosuggestions.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {};
histSize = 10000;
histFile = "$HOME/.zsh_history";
};
# Ensure bash completion is available
environment.pathsToLink = [ "/share/bash-completion" ];
environment.systemPackages = ( with pkgs; [
vim git mailpit fzf eza jq bc
nodejs_22 nodePackages.npm nodePackages.browser-sync nodePackages.sass
yarn nodemon
mongodb-tools mongosh
python312 python312Packages.pip python312Packages.pipx python312Packages.distutils
# Add bash-completion for better bash experience
bash-completion
]);
system.stateVersion = "24.11";
};
};
docs = {
privateNetwork = true;
hostAddress = "192.168.1.40";
localAddress = "192.168.1.91/
0.24";
hostBridge = "br0";
autoStart = false;
allowedDevices = [
{
modifier = "rw";
node = "/dev/net/tun";
}
];
bindMounts = {
"/home/wayne/docs/dmp" = {
hostPath = "/home/wayne/dev/whd/WHD 2024 docs/DMP/";
isReadOnly = false;
};
};
config = { config, pkgs, ... }:
{
# networking.firewall.allowedTCPPorts = [ 80 ];
networking = {
firewall = {
enable = false;
allowedTCPPorts = [ 22 80 443 1025 5173 8025 8080 27017 ];
};
enableIPv6 = false;
nameservers = [ "192.168.1.1" ];
};
nixpkgs.config.allowUnfree = true;
users = {
groups = {};
users = {
wayne = {
isNormalUser = true;
description = "Wayne Hayes";
extraGroups = [ "networkmanager" "wheel" "wayne" ];
openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6q75AXShVjzWerPFU3l0YXIKViNF4eyragL+RQIRwdNDMzW34GgxFhtyLsmRB2jsykf4gx76zSyJoii0K4uhS761w5oDXz9mqHnBzJutDTyltLyfgLsFKY8V2sOtSracWx4y6QrtmBR3MKV642kg5mufVEmCMVxBU9oVpIOJUSW+XNYBawaSkl5SjDMLI7flj0v9Hb2dZqjQigDM1+UHxTzcMoZnR6hAzoZpPNMGyZXtrgEotNywNdpxCqRV9T/KvKHSIVYc1umiDXc+5fyRo9v7CzvYY3MvRKWbgUfTVQRmR2kqwsGAsV5W+PEUb8qqmTjPVXusKxKlpGgYfsvIZOv0LgOvQMemga8psFIS9F4YQ1xuc092bKi1LteC+ZlabMLRMux6Wbhjci+v9wnLfTyBQc6wr3wDFJoELKyaLnI7Cn0KHn0k+BiYCCr2TjKrz9XztL490vprYtvVumNFZ3rxewGnZSn/2czaFfQgnXt+9xQGWWo9TJGE5jq1jThnsIbH3G9JIQ1WhomMq6DDRhGMX2ZKDk/M9/fk0XN5nvQyJNmbiHy5srW/VANx8R9jjsVkvX29MXeK6dzpR4ImywXggpYMeHB6moy06cJUu5WoR8aLS/rO5LbZM2j14AMQ2ZK79QfUJSdloA1/HHlmnx7YtzZOebD6BCR7xgasGRw== wayne"];
packages = with pkgs; [
sl cowsay lolcat
];
};
};
};
services.tailscale = {
enable = false;
package = pkgs.tailscale;
interfaceName = "tailscale0";
openFirewall = true;
port = 41641;
useRoutingFeatures = "client";
};
services.openssh = {
enable = true;
ports = [ 22 ];
settings = {
PasswordAuthentication = true;
AllowUsers = [ "wayne" ];
UseDns = true;
X11Forwarding = false;
PermitRootLogin = "no";
};
};
programs.neovim.enable = true;
programs.tmux = {
enable = true;
terminal = "tmux-256color";
keyMode = "vi";
shortcut = "s";
extraConfig = ''
set -ag terminal-overrides ",xterm-256color:RGB"
set -g mouse on
# Resize pane key bindings
bind -r < resize-pane -L 5
bind -r > resize-pane -R 5
bind -r + resize-pane -U 5
bind -r - resize-pane -D 5
set-option -g status-position top
'';
plugins = [
pkgs.tmuxPlugins.weather
pkgs.tmuxPlugins.tmux-fzf
pkgs.tmuxPlugins.resurrect
pkgs.tmuxPlugins.nord
];
};
programs.zsh = {
enable = true;
enableCompletion = true;
autosuggestions.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {};
histSize = 10000;
histFile = "$HOME/.zsh_history";
};
environment.systemPackages = ( with pkgs; [
vim git mailpit fzf eza jq bc
nodejs_22 nodePackages.npm nodePackages.browser-sync nodePackages.sass
yarn nodemon
mongodb-tools mongosh
python312 python312Packages.pip python312Packages.pipx python312Packages.distutils
]);
system.stateVersion = "24.11";
};
};
}; };
} }

View File

@ -2,7 +2,7 @@
{ {
hardware.graphics = { # Renamed hardware.graphics hardware.graphics = { # Renamed hardware.graphics
enable = true; # Renamed enable = true; # Renamed
package = pkgs.mesa.drivers; # Renamed package = pkgs.mesa; # Renamed
# 32bit Support # 32bit Support
enable32Bit = true; # Renamed enable32Bit = true; # Renamed
# package32 = pkgsi686Linux.mesa.drivers; # package32 = pkgsi686Linux.mesa.drivers;

View File

@ -6,15 +6,14 @@
fsType = "cifs"; fsType = "cifs";
options = let options = let
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=1000,gid=100"]; in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=1000,gid=100"];
}; };
fileSystems."/mnt/share/Backupsups" = {
device = "//nas.local/Backups";
fsType = "cifs";
options = let
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=1000,gid=100"]; fileSystems."/mnt/share/Backupsups" = {
}; device = "//nas.local/Backups";
fsType = "cifs";
options = let
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=1000,gid=100"];
};
} }

View File

@ -1,12 +1,12 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
nerdfonts # nerdfonts
garamond-libre garamond-libre
liberation_ttf liberation_ttf
ubuntu_font_family ubuntu_font_family
libre-baskerville libre-baskerville
libre-bodoni libre-bodoni
]; ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
fonts.fontDir.enable = true; fonts.fontDir.enable = true;
} }

View File

@ -5,39 +5,46 @@
useDHCP = false; useDHCP = false;
enableIPv6 = false; enableIPv6 = false;
extraHosts = '' extraHosts = ''
192.168.12.20 router.local 192.168.76.20 router.local
192.168.12.21 switch.local
192.168.12.25 dhcpd.local
192.168.12.30 canon.local 192.168.1.1 gw.local
192.168.1.25 dns1.local
192.168.12.40 launchpad.local 192.168.1.30 canon.local
192.168.12.41 xeon.local
192.168.12.41 rover.local
192.168.12.41 legacy-node.local
192.168.12.50 wayne-s-pixel-5 192.168.1.40 launchpad.local
192.168.12.55 fire-tablet 192.168.1.41 xeon.local
192.168.1.41 legacy-node.local
192.168.1.42 rover.local
192.168.12.60 toons.local 192.168.76.50 wayne-s-pixel-5
192.168.12.61 tv.local 192.168.76.55 fire-tablet
192.168.12.80 robo.local 192.168.1.60 toons.local
192.168.12.81 nas.local 192.168.1.61 tv.local
192.168.12.83 homeassistant.local
192.168.76.80 robo.local
192.168.1.81 nas.local
192.168.1.83 homeassistant.local
192.168.12.84 tests.local 192.168.12.84 tests.local
# containers # containers .01 - .99 /27 255.255.255.128
192.168.12.71 nextcloud.local 192.168.1.71 nextcloud.local
192.168.12.72 livebook.local 192.168.1.72 livebook.local
192.168.12.73 grocy.local 192.168.1.73 grocy.local
192.168.12.74 openoffice.local 192.168.1.74 openoffice.local
192.168.12.75 laravel.local 192.168.1.75 laravel.local
192.168.12.76 nginx.local 192.168.1.76 nginx.local
192.168.12.77 glance.local 192.168.1.77 glance.local
192.168.12.78 vite.local 192.168.1.78 vite.local
192.168.12.79 node.local 192.168.1.79 node.local
192.168.1.90 dmp.local
192.168.1.91 docs.local
# Networking .200 - .254 /27 255.255.255.192
10.0.0.201 switch.local
# WAN
45.58.52.52 www 45.58.52.52 www
172.245.111.249 est 172.245.111.249 est
216.189.156.74 mail 216.189.156.74 mail
@ -52,15 +59,15 @@
ipv4 = { ipv4 = {
addresses = [ addresses = [
{ {
address = "192.168.12.40"; address = "192.168.1.40";
prefixLength = 24; prefixLength = 24;
} }
]; ];
}; };
}; };
}; };
defaultGateway = "192.168.12.20"; defaultGateway = "192.168.1.1";
nameservers = [ "192.168.12.25" ]; nameservers = [ "10.0.0.25" ];
firewall = { firewall = {
enable = true; enable = true;
# { from = 5000; to = 6000; } # { from = 5000; to = 6000; }

View File

@ -9,7 +9,7 @@
port = 41641; port = 41641;
useRoutingFeatures = "both"; useRoutingFeatures = "both";
extraSetFlags = [ extraSetFlags = [
"--advertise-routes=192.168.12.0/24" "--advertise-routes=192.168.1.1/24"
]; ];
}; };
} }

View File

@ -13,6 +13,7 @@
background-blur = 5; background-blur = 5;
font-size = 15; font-size = 15;
app-notifications = "no-clipboard-copy"; app-notifications = "no-clipboard-copy";
shell-integration-features = "sudo";
}; };
installBatSyntax = true; installBatSyntax = true;
installVimSyntax = true; installVimSyntax = true;

View File

@ -186,6 +186,16 @@
"$mod, code:18, workspace, 9" "$mod, code:18, workspace, 9"
"$mod, code:19, workspace, 10" "$mod, code:19, workspace, 10"
"$mod, code:37, code:87, workspace, 1"
"$mod, code:37, code:88, workspace, 2"
"$mod, code:37, code:89, workspace, 3"
"$mod, code:37, code:83, workspace, 4"
"$mod, code:37, code:84, workspace, 5"
"$mod, code:37, code:85, workspace, 6"
"$mod, code:37, code:79, workspace, 7"
"$mod, code:37, code:80, workspace, 8"
"$mod, code:37, code:81, workspace, 9"
"ALTSHIFT, code:10, movetoworkspace, 1" "ALTSHIFT, code:10, movetoworkspace, 1"
"ALTSHIFT, code:11, movetoworkspace, 2" "ALTSHIFT, code:11, movetoworkspace, 2"
"ALTSHIFT, code:12, movetoworkspace, 3" "ALTSHIFT, code:12, movetoworkspace, 3"
@ -196,6 +206,10 @@
"ALTSHIFT, code:17, movetoworkspace, 8" "ALTSHIFT, code:17, movetoworkspace, 8"
"ALTSHIFT, code:18, movetoworkspace, 9" "ALTSHIFT, code:18, movetoworkspace, 9"
"ALTSHIFT, code:19, movetoworkspace, 10" "ALTSHIFT, code:19, movetoworkspace, 10"
# Arrow keys scroll workspaces
"$mod, code:37, code:113, workspace, e+1"
"$mod, code:37, code:114, workspace, e-1"
]; ];
cursor = { cursor = {
@ -242,12 +256,12 @@
# "hyprpaper &" # "hyprpaper &"
"hypridle &" "hypridle &"
"swayosd &" "swayosd &"
"udiskie &" # "udiskie &"
"blueman-manager && blueman-applet & blueman-applet &" "blueman-manager && blueman-applet & blueman-applet &"
"wl-paste --type text --watch cliphist store" "wl-paste --type text --watch cliphist store"
"wl-paste --type image --watch cliphist store" "wl-paste --type image --watch cliphist store"
# "${config.home.homeDirectory}/.config/hypr/scripts/start-in-tray.sh &" # "${config.home.homeDirectory}/.config/hypr/scripts/start-in-tray.sh &"
# "${config.home.homeDirectory}/.config/hypr/scripts/start-keybase-gui.sh &" "${config.home.homeDirectory}/.config/hypr/scripts/start-keybase-gui.sh &"
"input-remapper-control --command autoload &" "input-remapper-control --command autoload &"
# "/nix/store/yvnjx0qis4qdajc52f4xswhz4g69lcbn-polkit-kde-agent-1-6.2.5/libexec/polkit-kde-authentication-agent-1" # "/nix/store/yvnjx0qis4qdajc52f4xswhz4g69lcbn-polkit-kde-agent-1-6.2.5/libexec/polkit-kde-authentication-agent-1"

View File

@ -17,9 +17,9 @@
"DP-5" "DP-5"
]; ];
include = "~/system/pkgs/wm/waybar/default.json"; include = "~/system/pkgs/wm/waybar/default.json";
modules-left = [ "custom/os_button" "hyprland/workspaces#roman" ]; modules-left = [ "custom/os_button" "hyprland/workspaces#roman" "custom/pavc" "cava" "pulseaudio/slider" ];
modules-center = [ "hyprland/window" "wlr/taskbar" ]; # replace wlr/taskbar modules-center = [ "hyprland/window" "wlr/taskbar" ]; # replace wlr/taskbar
modules-right = [ "custom/pavc" "cava" "pulseaudio/slider" "cpu" "temperature" "disk" "tray" "clock" "custom/exit" ]; modules-right = [ "cpu" "temperature" "disk" "tray" "clock" "custom/exit" ];
# modules-right = [ "custom/pavc" "cava" "pulseaudio/slider" "cpu" "temperature" "disk" "bluetooth" "tray" "clock" "custom/exit" ]; # modules-right = [ "custom/pavc" "cava" "pulseaudio/slider" "cpu" "temperature" "disk" "bluetooth" "tray" "clock" "custom/exit" ];
"custom/os_button" = { "custom/os_button" = {

View File

@ -335,7 +335,7 @@
"file": "flake.nix", "file": "flake.nix",
"settings": "settings":
{ {
"buffer_size": 4491, "buffer_size": 3476,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@ -344,25 +344,25 @@
"file": "configuration.nix", "file": "configuration.nix",
"settings": "settings":
{ {
"buffer_size": 9129, "buffer_size": 7941,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
}, },
{ {
"file": "pkgs/virtualisation/vbox.nix", "file": "modules/network.nix",
"settings": "settings":
{ {
"buffer_size": 463, "buffer_size": 2791,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
}, },
{ {
"file": "modules/users.nix", "file": "modules/containers.nix",
"settings": "settings":
{ {
"buffer_size": 1533, "buffer_size": 39494,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@ -371,11 +371,19 @@
"file": "hm/home.nix", "file": "hm/home.nix",
"settings": "settings":
{ {
"buffer_size": 7656, "buffer_size": 7531,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
}, },
{
"file": "hm/pkgs/inet-packages.nix",
"settings":
{
"buffer_size": 742,
"line_ending": "Unix"
}
},
{ {
"file": "pkgs/wm/waybar/default.json", "file": "pkgs/wm/waybar/default.json",
"settings": "settings":
@ -389,7 +397,7 @@
"file": "pkgs/wm/waybar/waybar.nix", "file": "pkgs/wm/waybar/waybar.nix",
"settings": "settings":
{ {
"buffer_size": 1989, "buffer_size": 1988,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@ -398,7 +406,7 @@
"file": "/home/wayne/.config/waybar/style.css", "file": "/home/wayne/.config/waybar/style.css",
"settings": "settings":
{ {
"buffer_size": 11267, "buffer_size": 11728,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@ -407,16 +415,7 @@
"file": "pkgs/wm/hyprland/hyprland.nix", "file": "pkgs/wm/hyprland/hyprland.nix",
"settings": "settings":
{ {
"buffer_size": 15139, "buffer_size": 15143,
"encoding": "UTF-8",
"line_ending": "Unix"
}
},
{
"file": "/home/wayne/.config/hypr/hyprland.conf",
"settings":
{
"buffer_size": 8038,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@ -443,7 +442,7 @@
"file": "/home/wayne/.config/hypr/scripts/start-in-tray.sh", "file": "/home/wayne/.config/hypr/scripts/start-in-tray.sh",
"settings": "settings":
{ {
"buffer_size": 1543, "buffer_size": 1551,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@ -452,7 +451,7 @@
"file": "/home/wayne/.config/hypr/scripts/start-keybase-gui.sh", "file": "/home/wayne/.config/hypr/scripts/start-keybase-gui.sh",
"settings": "settings":
{ {
"buffer_size": 1579, "buffer_size": 1581,
"encoding": "UTF-8", "encoding": "UTF-8",
"line_ending": "Unix" "line_ending": "Unix"
} }
@ -549,13 +548,20 @@
"/home/wayne/system/pkgs/app", "/home/wayne/system/pkgs/app",
"/home/wayne/system/pkgs/app/terminal", "/home/wayne/system/pkgs/app/terminal",
"/home/wayne/system/pkgs/app/utilities", "/home/wayne/system/pkgs/app/utilities",
"/home/wayne/system/pkgs/virtualisation" "/home/wayne/system/pkgs/virtualisation",
"/home/wayne/system/secrets"
], ],
"file_history": "file_history":
[ [
"/home/wayne/system/modules/files.nix",
"/home/wayne/system/modules/users.nix",
"/home/wayne/.config/waybar/style.css.bak",
"/home/wayne/.config/hypr/hyprland.conf",
"/home/wayne/system/modules/security.nix",
"/home/wayne/system/pkgs/virtualisation/vbox.nix",
"/home/wayne/bin/nextcloud_backup.sh",
"/home/wayne/system/modules/containers.nix", "/home/wayne/system/modules/containers.nix",
"/home/wayne/bin/rsync.sh", "/home/wayne/bin/rsync.sh",
"/home/wayne/bin/nextcloud_backup.sh",
"/home/wayne/system/hm/pkgs/inet-packages.nix", "/home/wayne/system/hm/pkgs/inet-packages.nix",
"/home/wayne/system/hm/pkgs/default.nix", "/home/wayne/system/hm/pkgs/default.nix",
"/home/wayne/system/modules/display.nix", "/home/wayne/system/modules/display.nix",
@ -577,25 +583,21 @@
"/home/wayne/.local/share/remmina/group_rdp_xeon_xeon-local.remmina", "/home/wayne/.local/share/remmina/group_rdp_xeon_xeon-local.remmina",
"/home/wayne/system/hm/pkgs/theme-packages.nix", "/home/wayne/system/hm/pkgs/theme-packages.nix",
"/home/wayne/system/environment.nix", "/home/wayne/system/environment.nix",
"/home/wayne/system/modules/security.nix",
"/home/wayne/system/secrets/secrets.nix", "/home/wayne/system/secrets/secrets.nix",
"/home/wayne/system/pkgs/app/servers/ff-sync.nix", "/home/wayne/system/pkgs/app/servers/ff-sync.nix",
"/home/wayne/system/hm/modules/hypr.nix", "/home/wayne/system/hm/modules/hypr.nix",
"/home/wayne/.config/wlogout/layout", "/home/wayne/.config/wlogout/layout",
"/home/wayne/system/pkgs/app/terminal/ghostty.nix", "/home/wayne/system/pkgs/app/terminal/ghostty.nix",
"/home/wayne/.config/systemd/user/blueman-applet.service", "/home/wayne/.config/systemd/user/blueman-applet.service",
"/home/wayne/system/pkgs/virtualisation/vbox.nix",
"/etc/systemd/system/polkit.service", "/etc/systemd/system/polkit.service",
"/etc/systemd/system/polkit.service.d/overrides.conf", "/etc/systemd/system/polkit.service.d/overrides.conf",
"/home/wayne/system/pkgs/virtualisation/docker.nix", "/home/wayne/system/pkgs/virtualisation/docker.nix",
"/home/wayne/system/hm/modules/theme.nix", "/home/wayne/system/hm/modules/theme.nix",
"/home/wayne/system/hm/pkgs/wm-packages.nix", "/home/wayne/system/hm/pkgs/wm-packages.nix",
"/home/wayne/system/modules/users.nix",
"/home/wayne/bin/hypr-logout.sh", "/home/wayne/bin/hypr-logout.sh",
"/home/wayne/tmp/hypr/hyprexitwithgrace.log", "/home/wayne/tmp/hypr/hyprexitwithgrace.log",
"/home/wayne/system/pkgs/app/utilities/bacula.nix", "/home/wayne/system/pkgs/app/utilities/bacula.nix",
"/home/wayne/system/modules/nix.nix", "/home/wayne/system/modules/nix.nix",
"/home/wayne/system/modules/files.nix",
"/home/wayne/.config/autostart/keybase_autostart.desktop", "/home/wayne/.config/autostart/keybase_autostart.desktop",
"/home/wayne/.config/waybar/style.css", "/home/wayne/.config/waybar/style.css",
"/home/wayne/modelfile", "/home/wayne/modelfile",
@ -625,7 +627,6 @@
"/etc/samba/smb.conf", "/etc/samba/smb.conf",
"/home/wayne/system/hm/pkgs/creative-packages.nix", "/home/wayne/system/hm/pkgs/creative-packages.nix",
"/etc/nixos/smb-secrets", "/etc/nixos/smb-secrets",
"/home/wayne/.config/hypr/hyprland.conf",
"/home/wayne/system/pkgs/wm/waybar/default.json", "/home/wayne/system/pkgs/wm/waybar/default.json",
"/home/wayne/system/pkgs/wm/waybar/waybar.nix", "/home/wayne/system/pkgs/wm/waybar/waybar.nix",
"/home/wayne/system/hm/home.nix", "/home/wayne/system/hm/home.nix",
@ -679,12 +680,11 @@
"/home/wayne/dev/whd/live/public/tpl/why.tpl.php", "/home/wayne/dev/whd/live/public/tpl/why.tpl.php",
"/home/wayne/dev/whd/live/public/index.php_", "/home/wayne/dev/whd/live/public/index.php_",
"/home/wayne/dev/whd/live/public/tpl/services.tpl.php", "/home/wayne/dev/whd/live/public/tpl/services.tpl.php",
"/home/wayne/dev/whd/live/public/tpl/head.tpl.php", "/home/wayne/dev/whd/live/public/tpl/head.tpl.php"
"/home/wayne/dev/whd/live/public/tpl/hero.tpl.php"
], ],
"find": "find":
{ {
"height": 35.0 "height": 47.0
}, },
"find_in_files": "find_in_files":
{ {
@ -701,6 +701,21 @@
"case_sensitive": false, "case_sensitive": false,
"find_history": "find_history":
[ [
"2ou",
"8153",
"859",
"bus",
"802.11",
"wlan",
"wireless",
"wire",
"wlan",
"eth0",
"wifi",
"https://downloads.openwrt.org/releases/24.10.0/targets/sunxi/cortexa53/openwrt-24.10.0-sunxi-cortexa53-xunlong_orangepi-zero3-ext4-sdcard.img.gz",
".12.",
"disk",
"udiskie",
"extraConfig", "extraConfig",
"phpfpm", "phpfpm",
"mpv", "mpv",
@ -813,22 +828,7 @@
"mastadon", "mastadon",
"streaming", "streaming",
"mastadon", "mastadon",
"zone", "zone"
"example.org",
"22",
"est",
"pipewire",
"wire",
"filezilla",
"8080",
"offsetTop",
"mypool",
"pkgs-unstable",
"cors",
"systemd",
"touch",
"i2c",
"kitty"
], ],
"highlight": false, "highlight": false,
"in_selection": false, "in_selection": false,
@ -836,6 +836,7 @@
"regex": false, "regex": false,
"replace_history": "replace_history":
[ [
".76.",
"${symbol}", "${symbol}",
"", "",
"querySelector", "querySelector",
@ -893,7 +894,7 @@
"groups": "groups":
[ [
{ {
"selected": 3, "selected": 2,
"sheets": "sheets":
[ [
{ {
@ -902,15 +903,15 @@
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 4491, "buffer_size": 3476,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
2035, 1210,
2035 1210
] ]
], ],
"settings": "settings":
@ -919,11 +920,11 @@
"tab_size": 2, "tab_size": 2,
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 28.0,
"translation.y": 0.0, "translation.y": 273.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 2, "stack_index": 7,
"type": "text" "type": "text"
}, },
{ {
@ -932,15 +933,15 @@
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 9129, "buffer_size": 7941,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
2262, 5465,
2262 5465
] ]
], ],
"settings": "settings":
@ -950,61 +951,32 @@
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 585.0, "translation.y": 5148.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 7, "stack_index": 3,
"type": "text" "type": "text"
}, },
{ {
"buffer": 2, "buffer": 2,
"file": "pkgs/virtualisation/vbox.nix", "file": "modules/network.nix",
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 463, "buffer_size": 2791,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
265, 704,
265 704
]
],
"settings":
{
"syntax": "Packages/Nix/nix.tmLanguage",
"tab_size": 2,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 1,
"type": "text"
},
{
"buffer": 3,
"file": "modules/users.nix",
"semi_transient": false,
"settings":
{
"buffer_size": 1533,
"regions":
{
},
"selection":
[
[
627,
627
] ]
], ],
"settings": "settings":
{ {
"spell_check": true,
"syntax": "Packages/Nix/nix.tmLanguage", "syntax": "Packages/Nix/nix.tmLanguage",
"tab_size": 2, "tab_size": 2,
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
@ -1017,20 +989,20 @@
"type": "text" "type": "text"
}, },
{ {
"buffer": 4, "buffer": 3,
"file": "hm/home.nix", "file": "modules/containers.nix",
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 7656, "buffer_size": 39494,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
821, 281,
821 281
] ]
], ],
"settings": "settings":
@ -1039,15 +1011,75 @@
"tab_size": 2, "tab_size": 2,
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 118.0, "translation.x": 0.0,
"translation.y": 3627.0, "translation.y": 351.0,
"zoom_level": 1.0
},
"stack_index": 2,
"type": "text"
},
{
"buffer": 4,
"file": "hm/home.nix",
"semi_transient": false,
"settings":
{
"buffer_size": 7531,
"regions":
{
},
"selection":
[
[
7251,
7251
]
],
"settings":
{
"syntax": "Packages/Nix/nix.tmLanguage",
"tab_size": 2,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 3526.0,
"zoom_level": 1.0
},
"stack_index": 1,
"type": "text"
},
{
"buffer": 5,
"file": "hm/pkgs/inet-packages.nix",
"semi_transient": true,
"settings":
{
"buffer_size": 742,
"regions":
{
},
"selection":
[
[
0,
0
]
],
"settings":
{
"syntax": "Packages/Nix/nix.tmLanguage",
"tab_size": 2,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 4, "stack_index": 4,
"type": "text" "type": "text"
}, },
{ {
"buffer": 5, "buffer": 6,
"file": "pkgs/wm/waybar/default.json", "file": "pkgs/wm/waybar/default.json",
"semi_transient": false, "semi_transient": false,
"settings": "settings":
@ -1059,8 +1091,8 @@
"selection": "selection":
[ [
[ [
2254, 1922,
2258 1922
] ]
], ],
"settings": "settings":
@ -1069,28 +1101,28 @@
"tab_size": 2, "tab_size": 2,
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 177.0,
"translation.y": 3951.0, "translation.y": 1143.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 6, "stack_index": 5,
"type": "text" "type": "text"
}, },
{ {
"buffer": 6, "buffer": 7,
"file": "pkgs/wm/waybar/waybar.nix", "file": "pkgs/wm/waybar/waybar.nix",
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 1989, "buffer_size": 1988,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
1737, 65,
1737 82
] ]
], ],
"settings": "settings":
@ -1099,20 +1131,20 @@
"tab_size": 2, "tab_size": 2,
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 693.0, "translation.x": 0.0,
"translation.y": 0.0, "translation.y": 0.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 8, "stack_index": 10,
"type": "text" "type": "text"
}, },
{ {
"buffer": 7, "buffer": 8,
"file": "/home/wayne/.config/waybar/style.css", "file": "/home/wayne/.config/waybar/style.css",
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 11267, "buffer_size": 11728,
"regions": "regions":
{ {
"col_0000004C": "col_0000004C":
@ -1196,12 +1228,12 @@
"regions": "regions":
[ [
[ [
10795, 11256,
10800 11261
], ],
[ [
11184, 11645,
11189 11650
] ]
], ],
"scope": "col_008000FF" "scope": "col_008000FF"
@ -1213,12 +1245,12 @@
"regions": "regions":
[ [
[ [
10786, 11247,
10786 11247
], ],
[ [
11175, 11636,
11175 11636
] ]
], ],
"scope": "col_gutter" "scope": "col_gutter"
@ -1474,12 +1506,16 @@
871 871
], ],
[ [
9900, 9414,
9907 9421
], ],
[ [
10322, 10361,
10329 10368
],
[
10783,
10790
] ]
], ],
"scope": "col_8FBCBBFF" "scope": "col_8FBCBBFF"
@ -1495,12 +1531,16 @@
863 863
], ],
[ [
9886, 9398,
9886 9398
], ],
[ [
10306, 10347,
10306 10347
],
[
10767,
10767
] ]
], ],
"scope": "col_gutter" "scope": "col_gutter"
@ -1752,16 +1792,16 @@
"regions": "regions":
[ [
[ [
9266, 9727,
9269 9730
], ],
[ [
10847, 11308,
10850 11311
], ],
[ [
11223, 11684,
11226 11687
] ]
], ],
"scope": "col_FF0000FF" "scope": "col_FF0000FF"
@ -1773,16 +1813,16 @@
"regions": "regions":
[ [
[ [
9252, 9713,
9252 9713
], ],
[ [
10838, 11299,
10838 11299
], ],
[ [
11214, 11675,
11214 11675
] ]
], ],
"scope": "col_gutter" "scope": "col_gutter"
@ -1913,8 +1953,8 @@
7046 7046
], ],
[ [
8195, 8310,
8200 8315
] ]
], ],
"scope": "col_FFFFFFFF" "scope": "col_FFFFFFFF"
@ -1946,8 +1986,8 @@
7015 7015
], ],
[ [
8169, 8284,
8169 8284
] ]
], ],
"scope": "col_gutter" "scope": "col_gutter"
@ -1956,8 +1996,8 @@
"selection": "selection":
[ [
[ [
1208, 8026,
1208 8026
] ]
], ],
"settings": "settings":
@ -1967,49 +2007,19 @@
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 0.0, "translation.y": 9451.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 13, "stack_index": 11,
"type": "text"
},
{
"buffer": 8,
"file": "pkgs/wm/hyprland/hyprland.nix",
"semi_transient": false,
"settings":
{
"buffer_size": 15139,
"regions":
{
},
"selection":
[
[
14993,
14455
]
],
"settings":
{
"syntax": "Packages/Nix/nix.tmLanguage",
"tab_size": 4,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 9711.0,
"zoom_level": 1.0
},
"stack_index": 5,
"type": "text" "type": "text"
}, },
{ {
"buffer": 9, "buffer": 9,
"file": "/home/wayne/.config/hypr/hyprland.conf", "file": "pkgs/wm/hyprland/hyprland.nix",
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 8038, "buffer_size": 15143,
"regions": "regions":
{ {
"col_66000001": "col_66000001":
@ -2018,8 +2028,8 @@
"regions": "regions":
[ [
[ [
592, 10909,
602 10919
] ]
], ],
"scope": "col_66000001" "scope": "col_66000001"
@ -2031,8 +2041,8 @@
"regions": "regions":
[ [
[ [
582, 10890,
582 10890
] ]
], ],
"scope": "col_gutter" "scope": "col_gutter"
@ -2041,21 +2051,21 @@
"selection": "selection":
[ [
[ [
1533, 10144,
1533 10144
] ]
], ],
"settings": "settings":
{ {
"syntax": "Packages/Text/Plain text.tmLanguage", "syntax": "Packages/Nix/nix.tmLanguage",
"tab_size": 2, "tab_size": 2,
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 1584.0, "translation.y": 2577.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 12, "stack_index": 6,
"type": "text" "type": "text"
}, },
{ {
@ -2083,13 +2093,13 @@
"translation.y": 0.0, "translation.y": 0.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 11, "stack_index": 13,
"type": "text" "type": "text"
} }
] ]
}, },
{ {
"selected": 0, "selected": 2,
"sheets": "sheets":
[ [
{ {
@ -2114,10 +2124,10 @@
"syntax": "Packages/Text/Plain text.tmLanguage" "syntax": "Packages/Text/Plain text.tmLanguage"
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 234.0, "translation.y": 781.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 3, "stack_index": 12,
"type": "text" "type": "text"
}, },
{ {
@ -2126,15 +2136,15 @@
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 1543, "buffer_size": 1551,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
560, 1551,
560 1551
] ]
], ],
"settings": "settings":
@ -2144,10 +2154,10 @@
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 234.0, "translation.y": 819.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 10, "stack_index": 9,
"type": "text" "type": "text"
}, },
{ {
@ -2156,15 +2166,15 @@
"semi_transient": false, "semi_transient": false,
"settings": "settings":
{ {
"buffer_size": 1579, "buffer_size": 1581,
"regions": "regions":
{ {
}, },
"selection": "selection":
[ [
[ [
0, 1285,
0 1285
] ]
], ],
"settings": "settings":
@ -2174,10 +2184,10 @@
"translate_tabs_to_spaces": true "translate_tabs_to_spaces": true
}, },
"translation.x": 0.0, "translation.x": 0.0,
"translation.y": 0.0, "translation.y": 585.0,
"zoom_level": 1.0 "zoom_level": 1.0
}, },
"stack_index": 9, "stack_index": 8,
"type": "text" "type": "text"
} }
] ]
@ -2259,7 +2269,7 @@
"rows": "rows":
[ [
0.0, 0.0,
0.814967220894, 0.867532136773,
1.0 1.0
] ]
}, },
@ -2300,7 +2310,7 @@
[ [
[ [
"", "",
"~/dev/laravel/budget-app/Laravel_Budget-app.sublime-project" "~/dev/www/whc/2025/dashboard/WHC-2025-Deshboard.sublime-project"
] ]
], ],
"width": 380.0 "width": 380.0
@ -2322,7 +2332,7 @@
"show_open_files": false, "show_open_files": false,
"show_tabs": true, "show_tabs": true,
"side_bar_visible": true, "side_bar_visible": true,
"side_bar_width": 154.0, "side_bar_width": 239.0,
"status_bar_visible": true, "status_bar_visible": true,
"template_settings": "template_settings":
{ {