Compare commits
No commits in common. "2e024c538439cb9972f9c830dd095189713f40e0" and "299c8441c14ad5c88d312f46a6724fc80c449b79" have entirely different histories.
2e024c5384
...
299c8441c1
42
flake.lock
42
flake.lock
|
|
@ -26,11 +26,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765495779,
|
"lastModified": 1763759067,
|
||||||
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
|
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
|
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -47,11 +47,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765911005,
|
"lastModified": 1763949729,
|
||||||
"narHash": "sha256-avaLO3hlDITEagKvoUC0KtgZif3tyx8LpNSf9R5keNk=",
|
"narHash": "sha256-nZvKJf6WVjOAe9j5BoB0BLRTWdfMGF5Bci4/ITcWjps=",
|
||||||
"owner": "wamserma",
|
"owner": "wamserma",
|
||||||
"repo": "flake-programs-sqlite",
|
"repo": "flake-programs-sqlite",
|
||||||
"rev": "c98fbcdffe90188fc52c54b04d06f5dff4a2852f",
|
"rev": "0ceee55b8a9b70b7c3068fc5bb40ab502975e858",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -67,11 +67,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765860045,
|
"lastModified": 1763963090,
|
||||||
"narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=",
|
"narHash": "sha256-zR7uDZdQUUC+gBOi4byefMvIZuSBeMC6GswGNsTgQlM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99",
|
"rev": "7702d14879e8f0148fa168e38f3eaa2650fa0d85",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -88,11 +88,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765937051,
|
"lastModified": 1763949820,
|
||||||
"narHash": "sha256-JBbnxGZDzLtYoqragAnTrpLMAEWMJoQAMpAx2k0hIYg=",
|
"narHash": "sha256-nN+Ebv2czqqMFIpH1/VfrjoaHzZTxTE/diuLhw1HqPQ=",
|
||||||
"owner": "fufexan",
|
"owner": "fufexan",
|
||||||
"repo": "nix-gaming",
|
"repo": "nix-gaming",
|
||||||
"rev": "64cbe149f26ca2c6687ca5ab4f294d0b87c6ffb8",
|
"rev": "faa39649d0ad7e11bfcb7887ccda478515e489e8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -103,11 +103,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765779637,
|
"lastModified": 1763835633,
|
||||||
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
|
"narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
|
"rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -158,11 +158,11 @@
|
||||||
"uv2nix": "uv2nix"
|
"uv2nix": "uv2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765834918,
|
"lastModified": 1763909018,
|
||||||
"narHash": "sha256-jCX7Pi9T3bwDfLgTM3xMFvjMXGGmAe5lBXPcxsmsLqI=",
|
"narHash": "sha256-nX/L4W7z3DYlqXRduT8KyRWj7lTG5+6n0HlRY80B4HE=",
|
||||||
"owner": "pwndbg",
|
"owner": "pwndbg",
|
||||||
"repo": "pwndbg",
|
"repo": "pwndbg",
|
||||||
"rev": "dfdfbd4f7bd45869d7b4b7d3e4418aede29359d2",
|
"rev": "4f7e515775f4d5910017316493cc10e9e03c8892",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -240,11 +240,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765836173,
|
"lastModified": 1763870012,
|
||||||
"narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=",
|
"narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63",
|
"rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
lib,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -29,15 +28,7 @@
|
||||||
deviceSection = ''Option "TearFree" "true"'';
|
deviceSection = ''Option "TearFree" "true"'';
|
||||||
};
|
};
|
||||||
hardware.nvidia.open = true;
|
hardware.nvidia.open = true;
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
nixpkgs.config.allowUnfree = true;
|
||||||
builtins.elem (lib.getName pkg) [
|
|
||||||
"nvidia-x11"
|
|
||||||
"nvidia-settings"
|
|
||||||
"steam"
|
|
||||||
"steam-unwrapped"
|
|
||||||
]
|
|
||||||
|| pkgs._cuda.lib.allowUnfreeCudaPredicate pkg;
|
|
||||||
|
|
||||||
users.users.ahnwuoa = {
|
users.users.ahnwuoa = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = ["wheel"];
|
extraGroups = ["wheel"];
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,4 @@
|
||||||
{
|
{...}: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
imports = [
|
||||||
../../../../user
|
../../../../user
|
||||||
];
|
];
|
||||||
|
|
@ -11,15 +6,4 @@
|
||||||
home.username = "ahnwuoa";
|
home.username = "ahnwuoa";
|
||||||
u.has.activitywatch = true;
|
u.has.activitywatch = true;
|
||||||
u.has.jp = true;
|
u.has.jp = true;
|
||||||
home.packages = [
|
|
||||||
(pkgs.writeScriptBin "steam" ''
|
|
||||||
export HOME="${config.home.homeDirectory}/.local/home"
|
|
||||||
exec -a "$0" "/run/current-system/sw/bin/steam" "$@"
|
|
||||||
'')
|
|
||||||
pkgs.osu-lazer-bin
|
|
||||||
];
|
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
|
||||||
builtins.elem (lib.getName pkg) [
|
|
||||||
"osu-lazer-bin"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,29 +22,10 @@
|
||||||
extraModprobeConfig = ''
|
extraModprobeConfig = ''
|
||||||
options vfio-pci ids=10de:2b85,10de:22e8
|
options vfio-pci ids=10de:2b85,10de:22e8
|
||||||
options kvmfr static_size_mb=64
|
options kvmfr static_size_mb=64
|
||||||
options kvm_amd avic=1
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
services.udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
SUBSYSTEM=="kvmfr", GROUP="kvm", MODE="0660"
|
SUBSYSTEM=="kvmfr", GROUP="kvm", MODE="0660"
|
||||||
'';
|
'';
|
||||||
environment.systemPackages = [pkgs.looking-glass-client];
|
environment.systemPackages = [pkgs.looking-glass-client];
|
||||||
virtualisation.libvirtd.hooks.qemu = {
|
|
||||||
"isolatecpu.sh" =
|
|
||||||
pkgs.writeShellScript "isolatecpu.sh"
|
|
||||||
''
|
|
||||||
#!/bin/sh
|
|
||||||
PIN="AllowedCPUs=8-15,24-31"
|
|
||||||
ALL="AllowedCPUs=0-31"
|
|
||||||
if [ "$2" = "started" ]; then
|
|
||||||
systemctl set-property --runtime -- system.slice $PIN
|
|
||||||
systemctl set-property --runtime -- user.slice $PIN
|
|
||||||
systemctl set-property --runtime -- init.scope $PIN
|
|
||||||
elif [ "$2" = "release" ]; then
|
|
||||||
systemctl set-property --runtime -- system.slice $ALL
|
|
||||||
systemctl set-property --runtime -- user.slice $ALL
|
|
||||||
systemctl set-property --runtime -- init.scope $ALL
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,13 +15,6 @@ lib.mkIf config.u.has.graphical {
|
||||||
};
|
};
|
||||||
autoRepeatDelay = 200;
|
autoRepeatDelay = 200;
|
||||||
autoRepeatInterval = 30;
|
autoRepeatInterval = 30;
|
||||||
inputClassSections = [
|
|
||||||
''
|
|
||||||
Identifier "system-keyboard"
|
|
||||||
MatchIsKeyboard "on"
|
|
||||||
Option "AutoRepeat" "200 30"
|
|
||||||
''
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
programs.partition-manager.enable = true;
|
programs.partition-manager.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -22,10 +22,6 @@ lib.mkIf (config.networking.hostName != "komikan") {
|
||||||
user = "1000";
|
user = "1000";
|
||||||
mode = "0755";
|
mode = "0755";
|
||||||
};
|
};
|
||||||
"/mnt/tmp".d = {
|
|
||||||
user = "1000";
|
|
||||||
mode = "0755";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
fileSystems."/mnt/pool" = {
|
fileSystems."/mnt/pool" = {
|
||||||
device = "//komikan/pool";
|
device = "//komikan/pool";
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ in {
|
||||||
edit = [];
|
edit = [];
|
||||||
auto-tmux = [tmux];
|
auto-tmux = [tmux];
|
||||||
sm = [];
|
sm = [];
|
||||||
rem = [fzf];
|
|
||||||
}
|
}
|
||||||
// lib.optionalAttrs config.u.has.graphical {
|
// lib.optionalAttrs config.u.has.graphical {
|
||||||
bell = [pipewire libnotify];
|
bell = [pipewire libnotify];
|
||||||
|
|
|
||||||
35
user/bin/rem
35
user/bin/rem
|
|
@ -1,35 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
# things you should remember but dont
|
|
||||||
|
|
||||||
REM="${XDG_DATA_HOME:=$HOME/.local/share}/rem.cmd"
|
|
||||||
|
|
||||||
if ! [ -f "$REM" ]; then
|
|
||||||
echo "missing $REM"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
cmd="$(cat $REM | fzf -e -q "$1" -1 -d "^" --with-nth="{1}" --accept-nth="{2..}")"
|
|
||||||
rest="$cmd"
|
|
||||||
final=""
|
|
||||||
|
|
||||||
prompt() {
|
|
||||||
if [ -z "$2" ]; then
|
|
||||||
while [ -z "$output" ]; do
|
|
||||||
read -E -p "$1: " output
|
|
||||||
done
|
|
||||||
else
|
|
||||||
read -E -p "$1 ($2): " output
|
|
||||||
fi
|
|
||||||
printf "%s" "${output:-$2}"
|
|
||||||
}
|
|
||||||
|
|
||||||
while case "$rest" in *\{\{*\}\}*) true;; *) false;; esac; do
|
|
||||||
prefix="${rest%%\{\{*}"
|
|
||||||
temp="${rest#*\{\{}"
|
|
||||||
cmd="${temp%%\}\}*}"
|
|
||||||
rest="${temp#*\}\}}"
|
|
||||||
final="$(printf "%s%s%s" "$final" "$prefix" "$(eval "$cmd")")"
|
|
||||||
done
|
|
||||||
final="$(printf "%s%s" "$final" "$rest")"
|
|
||||||
|
|
||||||
printf "%s" "$final"
|
|
||||||
|
|
@ -51,7 +51,7 @@ if [[ "$TERM" != "linux" ]]; then
|
||||||
# check if still in .bashrc
|
# check if still in .bashrc
|
||||||
if declare -F _bashrc_main > /dev/null; then
|
if declare -F _bashrc_main > /dev/null; then
|
||||||
return
|
return
|
||||||
elif [[ "$@" != @("starship_precmd"|""|"__fzf_history__"|"fzf-file-widget"|"history -a"|"__zoxide_hook") && ! "$@" =~ _comp.* ]]; then
|
elif [[ "$@" != @("starship_precmd"|""|"__fzf_history__"|"fzf-file-widget"|"history -a"|"__zoxide_hook") ]]; then
|
||||||
printf "\e]0;%s | %s | %s\a" "$(dirs +0)$_set_title_suffix" "$@" "$(date +"%H:%M:%S")"
|
printf "\e]0;%s | %s | %s\a" "$(dirs +0)$_set_title_suffix" "$@" "$(date +"%H:%M:%S")"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ function show() {
|
||||||
echo "$1 doesn't exist" ;;
|
echo "$1 doesn't exist" ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
complete -c show
|
|
||||||
function goto() {
|
function goto() {
|
||||||
if [[ "$#" -ne 1 ]]; then
|
if [[ "$#" -ne 1 ]]; then
|
||||||
echo "usage: goto <prog>" >&2
|
echo "usage: goto <prog>" >&2
|
||||||
|
|
@ -31,7 +30,6 @@ function goto() {
|
||||||
local real="$(realpath "$path")"
|
local real="$(realpath "$path")"
|
||||||
cd "${real%/*}"
|
cd "${real%/*}"
|
||||||
}
|
}
|
||||||
complete -c goto
|
|
||||||
function rl() {
|
function rl() {
|
||||||
local l="$1"
|
local l="$1"
|
||||||
local i=50
|
local i=50
|
||||||
|
|
@ -80,18 +78,3 @@ function venv() {
|
||||||
done
|
done
|
||||||
echo "not found"
|
echo "not found"
|
||||||
}
|
}
|
||||||
|
|
||||||
function _comp_rem_binding() {
|
|
||||||
local tty="$(stty -g)"
|
|
||||||
stty sane
|
|
||||||
READLINE_LINE="$(rem "$_comp_rem_arg")"
|
|
||||||
READLINE_POINT=${#READLINE_LINE}
|
|
||||||
stty "$tty"
|
|
||||||
}
|
|
||||||
function _comp_rem() {
|
|
||||||
COMPREPLY=""
|
|
||||||
_comp_rem_arg="${COMP_WORDS[@]:1}"
|
|
||||||
bind -x '"\e[0n": _comp_rem_binding'
|
|
||||||
printf '\e[5n' > /dev/tty
|
|
||||||
}
|
|
||||||
complete -F _comp_rem rem
|
|
||||||
|
|
|
||||||
|
|
@ -56,8 +56,6 @@
|
||||||
bluetuith
|
bluetuith
|
||||||
virt-viewer
|
virt-viewer
|
||||||
libreoffice-fresh
|
libreoffice-fresh
|
||||||
xdotool
|
|
||||||
(config.u.lib.localHome vesktop "vesktop" "bin/vesktop")
|
|
||||||
]
|
]
|
||||||
++ lib.optionals config.u.has.wine [
|
++ lib.optionals config.u.has.wine [
|
||||||
wineWowPackages.stable
|
wineWowPackages.stable
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{config, ...}: {
|
{...}: {
|
||||||
imports = [
|
imports = [
|
||||||
./nsxiv-rifle.nix
|
./nsxiv-rifle.nix
|
||||||
];
|
];
|
||||||
|
|
@ -14,5 +14,4 @@
|
||||||
force = true;
|
force = true;
|
||||||
};
|
};
|
||||||
xdg.dataFile."kwalletd".source = ./kwalletd;
|
xdg.dataFile."kwalletd".source = ./kwalletd;
|
||||||
xdg.dataFile."rem.cmd".source = config.u.lib.lnn "user/share/rem.cmd";
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
YUBIKEY: get ssh key from yubikey^ssh-keygen -K
|
|
||||||
YUBIKEY: enable pam u2f^mkdir -p ~/.config/Yubico && pamu2fcfg >> ~/.config/Yubico/u2f_keys
|
|
||||||
NIXOS: update nixos system^nixos-rebuild switch --flake ~/.local/nixos --show-trace --sudo
|
|
||||||
NIXOS: update home manager^home-manager switch --flake ~/.local/nixos --show-trace
|
|
||||||
NIXOS: list generations^nix-env --list-generations
|
|
||||||
NIXOS: delete old generations^nix-env --delete-generations +{{prompt "keep last n" "5"}}
|
|
||||||
SSH: access remote port at local port^ssh -L {{prompt "remote port"}}:localhost:{{prompt "local port"}} -T -N {{prompt "remote"}}
|
|
||||||
SSH: socks proxy^ssh -D {{prompt "port to use" "5555"}} -q -C -N -f {{prompt "remote"}}
|
|
||||||
SSH: mount with sshfs^sshfs {{prompt "remote host:/dir"}} {{prompt "target" "/mnt/tmp"}} -o uid={{id -u}} -o gid={{id -g}}
|
|
||||||
TOOL: ocr^maim -su | tesseract - -
|
|
||||||
MONITOR: disable auto sleep^xset s off -dpms
|
|
||||||
Loading…
Reference in a new issue