Compare commits

..

No commits in common. "f920de0beab9a7b95dc12677058c5e3aaea45a56" and "40598dadd228c8d17e6e21250dd80f5bcd39ffc5" have entirely different histories.

8 changed files with 24 additions and 43 deletions

View File

@ -50,10 +50,7 @@ in {
programs = {
virt-manager.enable = true;
nix-ld = {
enable = true;
libraries = [];
};
nix-ld.enable = true;
};
services.zfs.zed = {

View File

@ -48,8 +48,6 @@ in {
unzip
foremost
binwalk
jq
nix-index
(python3.withPackages (p: lib.concatMap (pl: pl p) rhelmot.globalPythonPackages))
];
@ -70,6 +68,7 @@ in {
enableCompletion = true;
syntaxHighlighting.enable = true;
vteIntegration = true;
enableLsColors = true;
histSize = 10000;
promptInit = ''
. ${pkgs.python3Packages.virtualenvwrapper}/bin/virtualenvwrapper.sh

View File

@ -28,8 +28,9 @@ function update-prompt-color {
[ "$MODE" = "main" ] && INDICATOR='+' || INDICATOR=' '
PS1="%{$COLOR%}[$INDICATOR] %~%# %{$NOCOLOR%}"
[ -n "$VIRTUAL_ENV" -a ! "${VIRTUAL_ENV##*/}" = "default" ] && VENV_STRING="%{$GREEN%}(${VIRTUAL_ENV##*/})" || VENV_STRING=
[ -n "$VIRTUAL_ENV" -a ! "$(basename "$VIRTUAL_ENV")" = "default" ] && VENV_STRING="%{$GREEN%}($(basename $VIRTUAL_ENV))" || VENV_STRING=
USER_STRING="%{$PURPLE%}%n@%m"
#USER_STRING="%{$PURPLE%}rhelmot@%m"
TIME_STRING="%{$PURPLE%}[%{$YELLOW%}%D{%r}%{$PURPLE%}]"
RPS1="$VENV_STRING $USER_STRING $TIME_STRING%{$NOCOLOR%}"

View File

@ -2,11 +2,11 @@
"nodes": {
"bingosync": {
"locked": {
"lastModified": 1751571764,
"narHash": "sha256-KEII5eCIBsBJy3eowAmmtRbdmV2aREOjU8AHypPz5y8=",
"lastModified": 1744669932,
"narHash": "sha256-QbxbpaV7Er0usuQJqjwcaAfxIrTwngDgLHDkfcR/eas=",
"owner": "rhelmot",
"repo": "bingosync",
"rev": "08ab441fee60360435c263430610fc10406b0602",
"rev": "4ffbdb75f278e6263160b0c4c05e118971c7edd2",
"type": "github"
},
"original": {
@ -262,16 +262,16 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1751211869,
"narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
"lastModified": 1744440957,
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}

View File

@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixbsd.url = "github:nixos-bsd/nixbsd/main";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz";

View File

@ -5,7 +5,7 @@
pname = "condition-unmetered-network";
version = "0.1.0";
src = ./.;
cargoHash = "sha256-BX9RJbE/NR5bGCC8G0Rh+TlFH22R9+c5RcboMSz6VLc=";
cargoHash = "sha256-IyePhjLt2wwUV0QWWAC5b2PNRFPMu2+HPjC01DUYqCk=";
meta.mainProgram = pname;
}

View File

@ -9,16 +9,13 @@
services.zfs.trim.enable = true;
# fstrim is also enabled by nixos-hardware, but only runs for /boot
#services.fprintd.enable = true;
services.fprintd.enable = true;
# fix hang on initial login
#security.pam.services.login.fprintAuth = false;
security.pam.services.login.fprintAuth = false;
networking.hostName = "daisy";
networking.hostId = "293a1290";
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
# Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 22 80 443 1337 8081 ];
networking.firewall.allowedUDPPorts = [ 1337 ];
@ -57,30 +54,18 @@
#services.pgadmin.initialEmail = "audrey@rhelmot.io";
#services.pgadmin.initialPasswordFile = "/var/lib/pgadmin/initial_password_file";
#services.bingosync = {
# enable = true;
# debug = true;
# domain = "celestebingo";
# socketsDomain = "sockets-celestebingo";
# #databaseUrl = "sqlite:////tmp/bingosync.db";
# databaseUrl = "postgres://%2Frun%2Fpostgresql/bingosync";
# extraPythonPackages = p: [ p.psycopg2 ];
#};
services.bingosync = {
enable = true;
debug = true;
domain = "celestebingo";
socketsDomain = "sockets-celestebingo";
#databaseUrl = "sqlite:////tmp/bingosync.db";
databaseUrl = "postgres://%2Frun%2Fpostgresql/bingosync";
extraPythonPackages = p: [ p.psycopg2 ];
};
networking.extraHosts = ''
127.0.0.1 celestebingo
127.0.0.1 sockets-celestebingo
'';
#programs.celestegame = {
# enable = true;
# withEverest = true;
# withOlympus = true;
# writableDir = "/var/lib/celeste";
#};
services.tailscale = {
enable = true;
openFirewall = true;
};
}

View File

@ -10,7 +10,6 @@
networking.hostName = "sunflower";
networking.hostId = "77d68c52";
networking.useNetworkd = true;
systemd.network.enable = true;
systemd.network.networks."30-wan" = {
matchConfig.Name = "enp1s0";