improve
This commit is contained in:
parent
40598dadd2
commit
cb15a811b4
|
@ -50,7 +50,11 @@ in {
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
virt-manager.enable = true;
|
virt-manager.enable = true;
|
||||||
nix-ld.enable = true;
|
nix-ld = {
|
||||||
|
enable = true;
|
||||||
|
libraries = {
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.zfs.zed = {
|
services.zfs.zed = {
|
||||||
|
|
|
@ -48,6 +48,8 @@ in {
|
||||||
unzip
|
unzip
|
||||||
foremost
|
foremost
|
||||||
binwalk
|
binwalk
|
||||||
|
jq
|
||||||
|
nix-index
|
||||||
(python3.withPackages (p: lib.concatMap (pl: pl p) rhelmot.globalPythonPackages))
|
(python3.withPackages (p: lib.concatMap (pl: pl p) rhelmot.globalPythonPackages))
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -68,7 +70,6 @@ in {
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
vteIntegration = true;
|
vteIntegration = true;
|
||||||
enableLsColors = true;
|
|
||||||
histSize = 10000;
|
histSize = 10000;
|
||||||
promptInit = ''
|
promptInit = ''
|
||||||
. ${pkgs.python3Packages.virtualenvwrapper}/bin/virtualenvwrapper.sh
|
. ${pkgs.python3Packages.virtualenvwrapper}/bin/virtualenvwrapper.sh
|
||||||
|
|
|
@ -28,9 +28,8 @@ function update-prompt-color {
|
||||||
[ "$MODE" = "main" ] && INDICATOR='+' || INDICATOR=' '
|
[ "$MODE" = "main" ] && INDICATOR='+' || INDICATOR=' '
|
||||||
PS1="%{$COLOR%}[$INDICATOR] %~%# %{$NOCOLOR%}"
|
PS1="%{$COLOR%}[$INDICATOR] %~%# %{$NOCOLOR%}"
|
||||||
|
|
||||||
[ -n "$VIRTUAL_ENV" -a ! "$(basename "$VIRTUAL_ENV")" = "default" ] && VENV_STRING="%{$GREEN%}($(basename $VIRTUAL_ENV))" || VENV_STRING=
|
[ -n "$VIRTUAL_ENV" -a ! "${VIRTUAL_ENV##*/}" = "default" ] && VENV_STRING="%{$GREEN%}(${VIRTUAL_ENV##*/})" || VENV_STRING=
|
||||||
USER_STRING="%{$PURPLE%}%n@%m"
|
USER_STRING="%{$PURPLE%}%n@%m"
|
||||||
#USER_STRING="%{$PURPLE%}rhelmot@%m"
|
|
||||||
TIME_STRING="%{$PURPLE%}[%{$YELLOW%}%D{%r}%{$PURPLE%}]"
|
TIME_STRING="%{$PURPLE%}[%{$YELLOW%}%D{%r}%{$PURPLE%}]"
|
||||||
|
|
||||||
RPS1="$VENV_STRING $USER_STRING $TIME_STRING%{$NOCOLOR%}"
|
RPS1="$VENV_STRING $USER_STRING $TIME_STRING%{$NOCOLOR%}"
|
||||||
|
|
|
@ -262,16 +262,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744440957,
|
"lastModified": 1750005367,
|
||||||
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
|
"narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
|
"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"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||||
nixbsd.url = "github:nixos-bsd/nixbsd/main";
|
nixbsd.url = "github:nixos-bsd/nixbsd/main";
|
||||||
lix-module = {
|
lix-module = {
|
||||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz";
|
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz";
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
pname = "condition-unmetered-network";
|
pname = "condition-unmetered-network";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
cargoHash = "sha256-IyePhjLt2wwUV0QWWAC5b2PNRFPMu2+HPjC01DUYqCk=";
|
cargoHash = "sha256-BX9RJbE/NR5bGCC8G0Rh+TlFH22R9+c5RcboMSz6VLc=";
|
||||||
|
|
||||||
meta.mainProgram = pname;
|
meta.mainProgram = pname;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,13 +9,16 @@
|
||||||
services.zfs.trim.enable = true;
|
services.zfs.trim.enable = true;
|
||||||
# fstrim is also enabled by nixos-hardware, but only runs for /boot
|
# 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
|
# fix hang on initial login
|
||||||
security.pam.services.login.fprintAuth = false;
|
#security.pam.services.login.fprintAuth = false;
|
||||||
|
|
||||||
networking.hostName = "daisy";
|
networking.hostName = "daisy";
|
||||||
networking.hostId = "293a1290";
|
networking.hostId = "293a1290";
|
||||||
|
|
||||||
|
hardware.bluetooth.enable = true;
|
||||||
|
hardware.bluetooth.powerOnBoot = true;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
networking.firewall.allowedTCPPorts = [ 22 80 443 1337 8081 ];
|
networking.firewall.allowedTCPPorts = [ 22 80 443 1337 8081 ];
|
||||||
networking.firewall.allowedUDPPorts = [ 1337 ];
|
networking.firewall.allowedUDPPorts = [ 1337 ];
|
||||||
|
@ -54,18 +57,30 @@
|
||||||
#services.pgadmin.initialEmail = "audrey@rhelmot.io";
|
#services.pgadmin.initialEmail = "audrey@rhelmot.io";
|
||||||
#services.pgadmin.initialPasswordFile = "/var/lib/pgadmin/initial_password_file";
|
#services.pgadmin.initialPasswordFile = "/var/lib/pgadmin/initial_password_file";
|
||||||
|
|
||||||
services.bingosync = {
|
#services.bingosync = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
debug = true;
|
# debug = true;
|
||||||
domain = "celestebingo";
|
# domain = "celestebingo";
|
||||||
socketsDomain = "sockets-celestebingo";
|
# socketsDomain = "sockets-celestebingo";
|
||||||
#databaseUrl = "sqlite:////tmp/bingosync.db";
|
# #databaseUrl = "sqlite:////tmp/bingosync.db";
|
||||||
databaseUrl = "postgres://%2Frun%2Fpostgresql/bingosync";
|
# databaseUrl = "postgres://%2Frun%2Fpostgresql/bingosync";
|
||||||
extraPythonPackages = p: [ p.psycopg2 ];
|
# extraPythonPackages = p: [ p.psycopg2 ];
|
||||||
};
|
#};
|
||||||
|
|
||||||
networking.extraHosts = ''
|
networking.extraHosts = ''
|
||||||
127.0.0.1 celestebingo
|
127.0.0.1 celestebingo
|
||||||
127.0.0.1 sockets-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;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue