From cb15a811b40063272ca057ae6b002a2dd1c8a781 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 3 Jul 2025 12:44:06 -0700 Subject: [PATCH] improve --- configuration-nixos.nix | 6 +++- configuration.nix | 3 +- dotfiles/zsh-prompt.sh | 3 +- flake.lock | 8 ++--- flake.nix | 2 +- pkgs/condition-unmetered-network/default.nix | 2 +- sites/daisy/configuration.nix | 37 ++++++++++++++------ 7 files changed, 40 insertions(+), 21 deletions(-) diff --git a/configuration-nixos.nix b/configuration-nixos.nix index 0fb8caa..49fa1d3 100644 --- a/configuration-nixos.nix +++ b/configuration-nixos.nix @@ -50,7 +50,11 @@ in { programs = { virt-manager.enable = true; - nix-ld.enable = true; + nix-ld = { + enable = true; + libraries = { + }; + }; }; services.zfs.zed = { diff --git a/configuration.nix b/configuration.nix index 58a98db..1654869 100644 --- a/configuration.nix +++ b/configuration.nix @@ -48,6 +48,8 @@ in { unzip foremost binwalk + jq + nix-index (python3.withPackages (p: lib.concatMap (pl: pl p) rhelmot.globalPythonPackages)) ]; @@ -68,7 +70,6 @@ in { enableCompletion = true; syntaxHighlighting.enable = true; vteIntegration = true; - enableLsColors = true; histSize = 10000; promptInit = '' . ${pkgs.python3Packages.virtualenvwrapper}/bin/virtualenvwrapper.sh diff --git a/dotfiles/zsh-prompt.sh b/dotfiles/zsh-prompt.sh index 4decde3..564bb49 100644 --- a/dotfiles/zsh-prompt.sh +++ b/dotfiles/zsh-prompt.sh @@ -28,9 +28,8 @@ function update-prompt-color { [ "$MODE" = "main" ] && INDICATOR='+' || INDICATOR=' ' 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%}rhelmot@%m" TIME_STRING="%{$PURPLE%}[%{$YELLOW%}%D{%r}%{$PURPLE%}]" RPS1="$VENV_STRING $USER_STRING $TIME_STRING%{$NOCOLOR%}" diff --git a/flake.lock b/flake.lock index db19e4f..60f8dff 100644 --- a/flake.lock +++ b/flake.lock @@ -262,16 +262,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1750005367, + "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index de7aba0..5b0a283 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; 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"; diff --git a/pkgs/condition-unmetered-network/default.nix b/pkgs/condition-unmetered-network/default.nix index 42a0f46..229e780 100644 --- a/pkgs/condition-unmetered-network/default.nix +++ b/pkgs/condition-unmetered-network/default.nix @@ -5,7 +5,7 @@ pname = "condition-unmetered-network"; version = "0.1.0"; src = ./.; - cargoHash = "sha256-IyePhjLt2wwUV0QWWAC5b2PNRFPMu2+HPjC01DUYqCk="; + cargoHash = "sha256-BX9RJbE/NR5bGCC8G0Rh+TlFH22R9+c5RcboMSz6VLc="; meta.mainProgram = pname; } diff --git a/sites/daisy/configuration.nix b/sites/daisy/configuration.nix index 3645b97..a20eb73 100644 --- a/sites/daisy/configuration.nix +++ b/sites/daisy/configuration.nix @@ -9,13 +9,16 @@ 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 ]; @@ -54,18 +57,30 @@ #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; + }; }