+1 -31

hosts/stellapent-cier/configuration.nix

reviewed

··· 22 22 { 23 23 imports = 24 24 [ 25 25 - ../../shared/desktop/bluetooth.nix 26 26 - ../../shared/desktop/firewall.nix 25 25 + ../../shared/desktop/base.nix 27 26 ../../shared/desktop/kde-plasma.nix 28 27 ../../shared/flatpak.nix 29 28 ../../shared/gnupg.nix ··· 36 35 ../../shared/yubikey.nix 37 36 ../../shared/server/devenv.nix 38 37 ../../shared/1password.nix 39 39 - ../../shared/desktop/firefox.nix 40 38 ../../shared/shells/bash.nix 41 39 ../../shared/server/cockpit.nix 42 40 ]; ··· 51 49 canTouchEfiVariables = true; 52 50 }; 53 51 }; 54 54 - binfmt.emulatedSystems = [ 55 55 - "aarch64-linux" 56 56 - "armv7l-linux" 57 57 - ]; # for raspi builds I guess 58 52 }; 59 53 60 54 networking = { ··· 129 123 }; 130 124 home-manager.users.gildedguy = import ./users/gildedguy.nix; 131 125 #programs.home-manager.enable = true; # allow home-manager to manage itself 132 132 - 133 133 - # List packages installed in system profile. To search, run: 134 134 - # $ nix search wget 135 135 - environment.systemPackages = with pkgs; [ 136 136 - wget 137 137 - dig 138 138 - btop 139 139 - htop 140 140 - icu 141 141 - thunderbird 142 142 - google-chrome 143 143 - microsoft-edge 144 144 - kdePackages.kate 145 145 - libreoffice-qt6-fresh 146 146 - hunspell 147 147 - hunspellDicts.en_US 148 148 - gnupg 149 149 - gpg-tui 150 150 - gpgme 151 151 - byobu 152 152 - tmux 153 153 - android-tools 154 154 - adbtuifm 155 155 - ]; 156 126 157 127 # logind adjustments for this laptop to run as a headless server while 158 128 # the lid is closed.

+4 -4

misc/bash/lib/ssh-agent-loader

reviewed

··· 1 1 #!/usr/bin/env bash 2 2 # shellcheck disable=SC2034 3 3 # SPDX-License-Identifier: MPL-2.0 4 4 - set -euo pipefail 4 4 + #set -eo pipefail 5 5 6 6 - if [[ $DEBUG == "1" ]]; then 6 6 + if [[ $DEBUG != "" ]]; then 7 7 set -x 8 8 fi 9 9 ··· 55 55 # Ripped off NixOS-generated set-environment on my laptop for yubikey-agent setup 56 56 try_yubikey_agent() { 57 57 if [[ -f "${XDG_RUNTIME_DIR}/yubikey-agent/yubikey-agent.sock" ]]; then 58 58 - logOps info "using YubiKey SSH Agent" yubikey-agent 58 58 + logOps info "using YubiKey SSH Agent via socket at XDG_RUNTIME_DIR" yubikey-agent 59 59 export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" 60 60 fi 61 61 } ··· 120 120 121 121 if [[ $DEBUG == "1" ]]; then 122 122 set +x 123 123 - fi 123 123 + fi

+28

shared/desktop/base.nix

reviewed

··· 1 1 + { pkgs, ... }: 2 2 + 3 3 + { 4 4 + imports = [ 5 5 + ./bluetooth.nix 6 6 + ./firefox.nix 7 7 + ./firewall.nix 8 8 + ./fonts.nix 9 9 + ]; 10 10 + 11 11 + # List packages installed in system profile. To search, run: 12 12 + # $ nix search wget 13 13 + environment.systemPackages = with pkgs; [ 14 14 + thunderbird 15 15 + 16 16 + # browsers (firefox is in ./firefox.nix) 17 17 + google-chrome 18 18 + microsoft-edge 19 19 + 20 20 + libreoffice-qt6-fresh 21 21 + hunspell 22 22 + hunspellDicts.en_US 23 23 + 24 24 + # android tools 25 25 + android-tools 26 26 + adbtuifm 27 27 + ]; 28 28 + }

+4

shared/desktop/kde-plasma.nix

reviewed

··· 1 1 + # Configs for KDE Plasma DE and friends 2 2 + 1 3 { config, pkgs, lib, ... }: 2 4 3 5 { ··· 10 12 11 13 environment.systemPackages = with pkgs; [ 12 14 kdePackages.krfb 15 15 + pinentry-qt 16 16 + kdePackages.kate 13 17 ]; 14 18 }

+9

shared/gnupg.nix

reviewed

··· 1 1 + { pkgs, ... }: 2 2 + 1 3 { 2 4 # enable gpg-agent with SSH support 3 5 programs.gnupg.agent = { ··· 5 7 enableSSHSupport = true; 6 8 enableBrowserSocket = true; 7 9 }; 10 10 + 11 11 + environment.systemPackages = with pkgs; [ 12 12 + gnupg 13 13 + gpgme 14 14 + pinentry-tty 15 15 + gpgme 16 16 + ]; 8 17 }

+2 -2

shared/home-manager/shell.nix

reviewed

··· 52 52 if [[ -f /etc/profile.d/nix.sh ]]; then 53 53 . /etc/profile.d/nix.sh 54 54 fi 55 55 - export PATH=/nix/var/nix/profiles/default/bin:$HOME/.nix-profile/bin:$HOME/bin:$PATH 55 55 + #export PATH=/nix/var/nix/profiles/default/bin:$HOME/.nix-profile/bin:$HOME/bin:$PATH 56 56 57 57 # set PATH so it includes user's private bin if it exists 58 58 if [ -d "$HOME/bin" ] ; then ··· 112 112 programs.zsh = { 113 113 enable = true; 114 114 }; 115 115 - } 115 115 + }

+2 -2

shared/meta-configs.nix

reviewed

··· 1 1 # This is the meta config file for nixpkgs and nix cli itself, including 2 2 - # trusted keys for cachnix caches 2 2 + # trusted keys for cachix caches. 3 3 4 4 { config, pkgs, lib, ... }: 5 5 ··· 17 17 nix = { 18 18 gc = { 19 19 automatic = true; 20 20 - randomizedDelaySec = "69min"; 20 20 + randomizedDelaySec = "30min"; 21 21 }; 22 22 settings = { 23 23 # See https://nix.dev/manual/nix/latest/development/experimental-features

+13 -9

shared/server/devenv.nix

reviewed

··· 5 5 direnv 6 6 cachix 7 7 devbox 8 8 + byobu 9 9 + tmux 10 10 + 11 11 + # git tools 12 12 + gitFull 13 13 + gh 14 14 + glab 15 15 + fjo 8 16 ]; 9 17 10 18 virtualisation = { 11 19 podman = { 12 20 enable = true; 13 13 - extraPackages = with pkgs; [ 14 14 - gvisor 15 15 - ]; 21 21 + package = pkgs.podman; 22 22 + #extraPackages = with pkgs; [ 23 23 + # gvisor 24 24 + #]; 16 25 }; 17 26 docker = { 18 27 enable = true; ··· 35 44 programs.virt-manager.enable = true; 36 45 services.qemuGuest.enable = true; 37 46 services.spice-vdagentd.enable = true; 38 38 - 39 39 - boot.binfmt = { 40 40 - preferStaticEmulators = true; 41 41 - addEmulatedSystemsToNixSandbox = true; 42 42 - }; 43 43 - } 47 47 + }