From 07da04b1ed33945ddb9bcc004be1e93d38a388e8 Mon Sep 17 00:00:00 2001 From: alisceon Date: Sat, 14 Feb 2026 10:04:20 +0100 Subject: [PATCH] lil thingies --- flake.lock | 36 +++++++++++++++++------------------ home/alisceon/workstation.nix | 14 ++++++++++---- home/conf/xonsh/xonshrc | 7 ++----- home/wm/sway.nix | 3 ++- hosts/common/workstation.nix | 1 + hosts/tower/configuration.nix | 12 ++++++++++++ shell.nix | 1 + util/swap_sound_device.xsh | 14 ++++++++++++++ 8 files changed, 60 insertions(+), 28 deletions(-) create mode 100644 util/swap_sound_device.xsh diff --git a/flake.lock b/flake.lock index 0178b9a..e2693cd 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1770520993, - "narHash": "sha256-ks1ZFBYlBmQ4CAM4WSmCFUtkUJzbmJ0VJH/JkKVMPqY=", + "lastModified": 1770864818, + "narHash": "sha256-VsRzFJ8+ndGgcwguZSQGHed/gragpW478qMqdNpm75k=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "b32f4325880b4fac47b8736161a8f032dd248b70", + "rev": "ca04d472340d6a3c8fe4f4a9c0d74faad048c204", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -273,11 +273,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770464364, - "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1770539365, - "narHash": "sha256-S9JMlTl8/JaXg38hG36kiN21sGCPCNz0coUcwO9cpdo=", + "lastModified": 1771058291, + "narHash": "sha256-XLcyFy6p3cV0aQPo8gp62LhtDcBX7TToSkM/hyTa710=", "owner": "nix-community", "repo": "NUR", - "rev": "90dc2680c2c166730cbbcb0e0832c8797174995d", + "rev": "f6e08de5ffa5cf88b9e051bc49ce80c2292548fa", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1770539365, - "narHash": "sha256-S9JMlTl8/JaXg38hG36kiN21sGCPCNz0coUcwO9cpdo=", + "lastModified": 1771058291, + "narHash": "sha256-XLcyFy6p3cV0aQPo8gp62LhtDcBX7TToSkM/hyTa710=", "owner": "nix-community", "repo": "NUR", - "rev": "90dc2680c2c166730cbbcb0e0832c8797174995d", + "rev": "f6e08de5ffa5cf88b9e051bc49ce80c2292548fa", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770504996, - "narHash": "sha256-CjgGVXmYuEqx9rT4o1EKZVhacp6TuwZRicmaekkSvfE=", + "lastModified": 1770914701, + "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", "owner": "danth", "repo": "stylix", - "rev": "044ac0cc6d914f1dac22a728013bc3797f77cfab", + "rev": "db03fed72e5ca02be34e1d24789345a943329738", "type": "github" }, "original": { diff --git a/home/alisceon/workstation.nix b/home/alisceon/workstation.nix index 856bd18..4505c61 100644 --- a/home/alisceon/workstation.nix +++ b/home/alisceon/workstation.nix @@ -20,17 +20,23 @@ pkgs.vscode-extensions.ms-vscode.cpptools pkgs.vscode-extensions.jnoortheen.nix-ide ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "xonsh"; + publisher = "jnoortheen"; + version = "0.3.3"; + hash = "sha256-EdAjVzqvbiSm/hL/SeJIlfY1QocpQPyzv4RV84t4bbg="; + } { name = "pyrefly"; publisher = "meta"; - version = "0.51.0"; - hash = "sha256-wVJ6PHWhHe//uYN6tpSaNXBM0pKDh8w0njdaE14F/nw="; + version = "0.52.0"; + hash = "sha256-vheW8D2jy3aTpAR/jsgw8Khj1z08GGmRaeYvL+UOXSI="; } { name = "chatgpt"; publisher = "openai"; - version = "0.5.70"; - hash = "sha256-qVlPepQoiJytjWrOJFUQLvFIbkOufJ9kujGCj8KFqhE="; + version = "0.5.74"; + hash = "sha256-yR9oR3w4AkoWaQDPwSaQtrKL6IcXANaMfFiw6K/b5o0="; } ]; }; diff --git a/home/conf/xonsh/xonshrc b/home/conf/xonsh/xonshrc index 56ecc55..60cda0e 100644 --- a/home/conf/xonsh/xonshrc +++ b/home/conf/xonsh/xonshrc @@ -23,11 +23,8 @@ aliases["theo"] = "python ~/.config/xonsh/theo.py" aliases["kittycatsay"] = "python ~/.config/xonsh/kittycatsay.py" aliases["code-extensions"] = "curl https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh | sh" -# Kitty helpers -aliases["kicat"] = "kitten icat" -aliases["kissh"] = "kitten ssh" -aliases["kidiff"] = "kitten diff" - +# Applications +aliases["gparted"] = "xhost +local: && sudo gparted" ## INTERACTIVE CONFIGURATION ## if $XONSH_INTERACTIVE: diff --git a/home/wm/sway.nix b/home/wm/sway.nix index ed40c63..73c5c43 100644 --- a/home/wm/sway.nix +++ b/home/wm/sway.nix @@ -224,6 +224,7 @@ "XF86AudioLowerVolume" = "exec 'pactl set-sink-volume @DEFAULT_SINK@ -3%'"; "XF86AudioMute" = "exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'"; "XF86AudioPlay" = "exec 'playerctl play-pause'"; + "${key_mod}+XF86AudioPlay" = ''exec ${notify} -t 2000 "$(xonsh ~/.nixos_config/util/swap_sound_device.xsh)"''; "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 9"; "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 3"; }; # end keybindings @@ -237,7 +238,7 @@ "1" = [{app_id = "chromium";}]; "2" = [{class = "steam";}]; "3" = []; - "4" = [{class = "Code";}]; + "4" = [{class = "VSCodium";}]; "5" = [{app_id = "obsidian";}]; "6" = []; "7" = []; diff --git a/hosts/common/workstation.nix b/hosts/common/workstation.nix index cebc95e..5b8b112 100644 --- a/hosts/common/workstation.nix +++ b/hosts/common/workstation.nix @@ -77,6 +77,7 @@ pkgs.vlc pkgs.via pkgs.plymouth + pkgs.xorg.xhost ]; # end systemPackages sessionVariables.NIXOS_OZONE_WL = "1"; }; # end environment diff --git a/hosts/tower/configuration.nix b/hosts/tower/configuration.nix index 57a2986..280f20a 100644 --- a/hosts/tower/configuration.nix +++ b/hosts/tower/configuration.nix @@ -32,6 +32,7 @@ }; # end edk2-uefi-shell }; # end systemd-boot }; # end loader + kernelPackages = pkgs.linuxPackages_6_18; }; # end boot hardware = { graphics.enable = true; @@ -63,4 +64,15 @@ pkgs.prismlauncher ]; }; + programs = { + gamemode.enable = true; + steam = { + enable = true; + package = pkgs.steam.override { + extraPkgs = (pkgs: [ + pkgs.gamemode + ]); + }; + }; + }; } # end file diff --git a/shell.nix b/shell.nix index 7d41d9d..7ec23d9 100644 --- a/shell.nix +++ b/shell.nix @@ -6,6 +6,7 @@ pkgs.mkShell { buildInputs = with pkgs; [ git pre-commit + python313Packages.pywayland ]; shellHook = '' diff --git a/util/swap_sound_device.xsh b/util/swap_sound_device.xsh new file mode 100644 index 0000000..48f1351 --- /dev/null +++ b/util/swap_sound_device.xsh @@ -0,0 +1,14 @@ +sinks = $(pactl list sinks | grep node.name) +names = $(pactl list sinks | grep alsa.card_name) +sinkdict = {} +for sink_line, name_line in zip(sinks.split("\n"), names.split("\n")): + sink = sink_line.split("=")[-1].strip().strip('"') + name = name_line.split("=")[-1].strip().strip('"') + if sink and name: + sinkdict[sink] = name +default_sink = $(pactl get-default-sink).strip() +sinklist = list(sinkdict.keys()) +i_next = (sinklist.index(default_sink) + 1) % len(sinklist) +next_sink = sinklist[i_next] +pactl set-default-sink @(next_sink) +print(f"PulseAudio sink: {sinkdict[next_sink]} active") \ No newline at end of file