don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

Squash merge main into testing

Browse source
This commit is contained in:
Don Harper 2025-11-11 15:19:17 -06:00
parent 3cf83fb118
commit c27f617078
22 changed files with 334 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/common/default.nix
View file

@ -77,7 +77,7 @@
nmap
notmuch
pandoc
pinentry
pinentry-curses
pipx
ps_mem
psmisc

41
home/common/files/bash/bashrc
View file

@ -18,32 +18,24 @@
# set some global stuff first
# colors
GREEN=''
YELLOW=''
RED=''
NONE=''
PATH="${HOME}/bin:/run/wrappers/bin:${HOME}/.nix-profile/bin:/etc/profiles/per-user/${USER}/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:${HOME}/go/bin:${HOME}/.local/bin:${HOME}/.cargo/bin:${HOME}/.local/share/gem/ruby/latest/bin"
GOPATH="${HOME}/go"
export NONE GREEN YELLOW RED
export PATH
export GOPATH
NIXPKGS_ALLOW_UNFREE=1
NIXPKGS_ALLOW_INSECURE=1
MOZ_USE_WAYLAND=1
GDK_BACKEND=wayland
export NIXPKGS_ALLOW_INSECURE NIXPKGS_ALLOW_UNFREE MOZ_USE_WAYLAND GDK_BACKEND
if [ -f ${HOME}/.nix-profile/etc/profile.d/hm-session-vars.sh ]
then
if [ -f ${HOME}/.nix-profile/etc/profile.d/hm-session-vars.sh ]; then
. ${HOME}/.nix-profile/etc/profile.d/hm-session-vars.sh
fi
HOSTNAME_SHORT=$(hostnamectl | awk -F: '$1=/Static hostname/{print $2}' | sed 's/^ //')
while [ "${HOSTNAME_SHORT}" == "localhost" ]
do
echo "${RED}@${GREEN}-,---${NONE}"
sleep 1
HOSTNAME_SHORT=$(hostnamectl | awk -F: '$1=/Static hostname/{print $2}' | sed 's/^ //')
done
export HOSTNAME_SHORT
# set coredump size to 0
ulimit -c 0
@ -65,8 +57,7 @@ test -d "${HOME}/bin/${HOSTNAME_SHORT}" && PATH="${PATH}:${HOME}/bin/${HOSTNAME_
######### #########
#####################################
if [ "${PS1}" ];
then
if [ "${PS1}" ]; then
unset i
set -o noclobber
set -o notify
@ -85,10 +76,10 @@ then
USER=$LOGNAME
fi
HISTNAME=$LOGNAME
if [ $EUID == 0 ];then HISTNAME=root;fi
HISTFILE="${HOME}/.bash_history.${HISTNAME}.${HOSTNAME_SHORT}.$(tty|cut -c10-)"
if [ $EUID == 0 ]; then HISTNAME=root; fi
HISTFILE="${HOME}/.bash_history.${HISTNAME}.${HOSTNAME_SHORT}.$(tty | cut -c10-)"
export HISTFILE
test -f "${HOME}/.bash_ssh" && source "${HOME}/.bash_ssh"
test -f "${HOME}/.bash_ssh" && source "${HOME}/.bash_ssh"
PAGER=less
LESS="-Rs"
@ -101,14 +92,12 @@ then
unset COMPHOSTS
export COMPHOSTS=()
unset pathmunge
# set up man path
MANPATH="${MANPATH}:${HOME}/man:${HOME}/share/man"
export MANPATH
test -f $(ls -1 /nix/store/*bash-completion-*/etc/profile.d/bash_completion.sh | tail -n1) && \
test -f $(ls -1 /nix/store/*bash-completion-*/etc/profile.d/bash_completion.sh | tail -n1) &&
source $(ls -1 /nix/store/*bash-completion-*/etc/profile.d/bash_completion.sh | tail -n1)
export LOCKPRG=${HOME}/bin/myLock
@ -116,13 +105,13 @@ then
export HISTIGNORE='pwd:exit:clear:history'
[ ! -v ${BASH_COMPLETION_VERSINFO} -a -d ${HOME}/.bash_completion.d ] && for i in $(\ls -1 ${HOME}/.bash_completion.d/*.sh); do source $i; done
export PROMPT_COMMAND='history -a' # Always append history files
export PROMPT_COMMAND='history -a' # Always append history files
PS1='\u@\h:\w> '
test -f "${HOME}/.bash_aliases" && . ${HOME}/.bash_aliases
test -f "${HOME}/.bash_local" && . ${HOME}/.bash_local
test -f "${HOME}/.bash_aliases" && . ${HOME}/.bash_aliases
test -f "${HOME}/.bash_local" && . ${HOME}/.bash_local
file=$(\ls -1d /nix/store/*-$(\ls -1d /nix/store/*-liquidprompt-* | grep -v drv | awk -F- '{printf("%s-%s\n",$2,$3)}' | tail -n1) | tail -n1)
test -f ${file}/bin/liquidprompt && . ${file}/bin/liquidprompt
test -f ${file}/bin/liquidprompt && . ${file}/bin/liquidprompt
# BEGIN_KITTY_SHELL_INTEGRATION
if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi

60
home/common/pi-server.nix Normal file
View file

@ -0,0 +1,60 @@
{
pkgs,
inputs,
osConfig,
...
}: {
imports = [
./bash.nix
./btop.nix
./catppuccin.nix
./git.nix
./gnupg.nix
./liquidprompt.nix
./ssh.nix
./topgrade.nix
];
home.packages = with pkgs; [
figlet
file
fzf
gnupg
gping
htop
iftop
iw
jq
keychain
keyutils
links2
liquidprompt
moreutils
ncdu
nmap
pinentry-curses
pipx
ps_mem
psmisc
sqlite
trippy
unzip
wget
zip
];
services = {
gpg-agent = {
enable = true;
defaultCacheTtl = 1800;
enableSshSupport = true;
};
};
programs.keychain = {
enable = true;
enableBashIntegration = true;
keys = "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B";
};
home.file.".links/links.cfg".source = files/links.cfg;
xdg.configFile."nix/nix.conf".text = ''
extra-experimental-features = flakes nix-command
'';
}

2
home/gui/default.nix
View file

@ -67,7 +67,7 @@ in {
shikane
# signal-desktop
simple-scan
syncthingtray
# syncthingtray
systemd-lock-handler
# telegram-desktop
texlive.combined.scheme-medium

4
home/gui/mpv.nix
View file

@ -35,8 +35,8 @@
ytdl = "yes";
ytdl-format = "bestvideo+bestaudio";
# Only needed when/if youtube blocks annon access again
ytdl-raw-options = "no-playlist=,cookies-from-browser=firefox,force-ipv4=";
# ytdl-raw-options = "no-playlist=";
# ytdl-raw-options = "no-playlist=,cookies-from-browser=firefox,force-ipv4=";
ytdl-raw-options = "no-playlist=,force-ipv4=";
};
profiles = {
utube = {

43
home/gui/sway.nix
View file

@ -14,8 +14,7 @@
set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle-00.iec958-stereo
set $lock /home/don/bin/lock.sh
exec_always sway-audio-idle-inhibit
exec swayidle -w \
exec ${pkgs.swayidle}/bin/swayidle -w \
timeout 300 $lock \
timeout 360 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \
@ -67,16 +66,16 @@
bindsym $mod+Shift+q kill
# start dmenu (a program launcher)
set $menu_command fuzzel
set $menu_command ${pkgs.fuzzel}/bin/fuzzel
set $bemenu_options -i --nb "#3f3f3f" --nf "#dcdccc" -fn "pango:JetBrains Mono 8"
set $menu dmenu-wl_path | bemenu $bemenu_options| xargs swaymsg exec --
set $menu ${pkgs.dmenu-wayland}/bin/dmenu-wl_path | ${pkgs.bemenu}/bin/bemenu $bemenu_options| xargs swaymsg exec --
bindsym $mod+Shift+d exec $menu
# Screenshots:
bindsym Mod4+p exec grimshot --notify save active # Current window
bindsym Mod4+Shift+p exec grimshot --notify save area # Select area
bindsym Mod4+Mod1+p exec grimshot --notify save output # Current output
bindsym Mod4+Ctrl+p exec grimshot --notify save window # Select a window
bindsym Mod4+p exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify save active # Current window
bindsym Mod4+Shift+p exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify save area # Select area
bindsym Mod4+Mod1+p exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify save output # Current output
bindsym Mod4+Ctrl+p exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify save window # Select a window
# rofi app and window launchers
bindsym $mod+p exec --no-startup-id $menu
@ -305,24 +304,24 @@
client.background #F8F8F2
exec ${pkgs.pasystray}/bin/pasystray
exec_always keyctl link @u @s
exec_always ${pkgs.keyutils}/bin/keyctl link @u @s
exec ${pkgs.shikane}/bin/shikane
exec ${pkgs.wayland-pipewire-idle-inhibit}/bin/wayland-pipewire-idle-inhibit
exec_always shikanectl reload
exec kitty -o initial_window_width=40c -o initial_window_height=30c --title ttmenu -e ttmenu-loop
exec_always ${pkgs.shikane}/bin/shikanectl reload
exec ${pkgs.foot}/bin/foot -W 36x22 -T ttmenu -f "Courier New:size=12" -e ttmenu-loop
seat * hide_cursor 8000
exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
exec dbus-update-activation-environment --all 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
exec --no-startup-id udiskie
exec wl-paste -t text --watch clipman store
exec configure-gtk
exec dovideo.sh
exec auto-start
exec swaync
exec nm-applet
exec ${pkgs.systemd}/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
exec ${pkgs.dbus}/bin/dbus-update-activation-environment --all 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
exec ${pkgs.udiskie}/bin/udiskie
exec ${pkgs.wl-clipboard}/bin/wl-paste -t text --watch clipman store
exec ~/bin/configure-gtk
exec ~/bin/dovideo.sh
exec ~/bin/auto-start
exec ${pkgs.swaynotificationcenter}/bin/swaync
exec ${pkgs.networkmanagerapplet}/bin/nm-applet
exec ${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator
exec myweb
exec myterm
exec ~/bin/myweb
exec ~/bin/myterm
exec ${pkgs.headset-charge-indicator}/bin/headset-charge-indicator.py
exec ${pkgs.wlsunset}/bin/wlsunset -l 29.7 -L -95.8
exec ${pkgs.blueberry}/bin/blueberry-tray

33
home/pi-server.nix Normal file
View file

@ -0,0 +1,33 @@
{
inputs,
outputs,
pkgs,
pkgs-stable,
...
}: {
imports = [inputs.home-manager.nixosModules.home-manager];
home-manager.extraSpecialArgs = {
pkgs-stable = import pkgs-stable {config.allowUnfree = true;};
inherit inputs outputs;
};
home-manager = {
useUserPackages = true;
backupFileExtension = "home-manager-backup";
users = {
don = {
imports = [
inputs.catppuccin.homeModules.catppuccin
./common/pi-server.nix
];
home = {
username = "don";
homeDirectory = "/home/don";
stateVersion = "23.05";
};
programs = {
home-manager = {enable = true;};
};
};
};
};
}

43
home/work/citrix.nix
View file

@ -1,11 +1,42 @@
{ lib, config, pkgs, inputs, outputs, home-manager, ... }:
with lib;
let cfg = config.roles.citrix;
{
lib,
config,
pkgs,
inputs,
outputs,
home-manager,
...
}:
with lib; let
cfg = config.roles.citrix;
# FIXME : remove when new version of Citrix is released
pkgs =
# DELME
import (builtins.fetchTarball {
# DELME
url = "https://github.com/NixOS/nixpkgs/archive/29b6e7097f50955f49a81d2665fb21c94c43df19.tar.gz"; # DELME
sha256 = "0zrkfxj130gbgixgk8yaxk5d9s5ppj667x38n4vys4zxw5r60bjz"; # DELME
}) {
# DELME
config = {
# DELME
allowUnfree = true; # DELME
allowInsecure = true; # DELME
permittedInsecurePackages = [
# DELME
"libsoup-2.74.3" # DELME
]; # DELME
}; # DELME
}; # DELME
citrix_workspace_overlay = pkgs.citrix_workspace; # DELME
in {
options.roles.citrix = { enable = lib.mkEnableOption "citrix tools"; };
options.roles.citrix = {enable = lib.mkEnableOption "citrix tools";};
config = mkIf cfg.enable {
home-manager.users.don.home.packages = with pkgs; [ citrix_workspace ];
nixpkgs.config.permittedInsecurePackages = [ "libsoup-2.74.3" ];
# FIXME : remove when new version of Citrix is released
# home-manager.users.don.home.packages = with pkgs; [citrix_workspace];
home-manager.users.don.home.packages = with pkgs; [citrix_workspace_overlay]; # DELME
nixpkgs.config.permittedInsecurePackages = ["libsoup-2.74.3"];
# home-manager.users.don.home.packages = with pkgs;
# [ citrix_workspace_24_11_0 ];
home-manager.users.don.home.file."ICAClient" = {