diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix index 024c6cf..60f5d9e 100644 --- a/boxes/mlg/default.nix +++ b/boxes/mlg/default.nix @@ -18,18 +18,16 @@ qemu virt-manager - gnome.cheese - calyx-vpn - android-studio - emacs deepin.deepin-album libreoffice nomacs vscodium thunderbird - minetest + kitty ]; + services.hardware.bolt.enable = true; + services.openssh.enable = true; services.ssh-phone-home = { enable = true; @@ -51,10 +49,6 @@ }; }; - virtualisation.libvirtd.enable = true; - programs.dconf.enable = true; - users.users.usr.extraGroups = [ "libvirtd" ]; - services.printing.enable = true; services.avahi.enable = true; # runs the Avahi daemon services.avahi.nssmdns = true; # enables the mDNS NSS plug-in diff --git a/boxes/mlg/nvidia.nix b/boxes/mlg/nvidia.nix index 21e57c9..dbde58e 100644 --- a/boxes/mlg/nvidia.nix +++ b/boxes/mlg/nvidia.nix @@ -30,10 +30,7 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; prime = { - offload = { - enable = true; - enableOffloadCmd = true; - }; + sync.enable = true; intelBusId = "PCI:0:2:0"; nvidiaBusId = "PCI:1:0:0"; diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index 64ff359..67151b3 100755 --- a/builds/utils/sh/disp +++ b/builds/utils/sh/disp @@ -1,4 +1,31 @@ #!/bin/sh +# you can think of this more as post-wm setup + +set_walls() { + for i in $(xrandr | grep ' connected' | cut -d' ' -f1); do + xwallpaper --output $i --zoom ~/.local/share/pape.jpg + done +} + +screensaver () { + pkill xscreensaver + HOME=".config/xscreensaver" xscreensaver --no-splash & +} + +keyboard () { + setxkbmap -option caps:super + pkill xcape + xcape -e 'Super_L=Escape' + xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock + xset -r 161 # tablet rotate key doesn't need repeat + xset r rate 200 40 +} + +# initial post-wm setup +keyboard +statuswrap +set_walls +screensaver find_card_pci() { [ -z $pci_path ] && pci_path=$(find /sys/devices | \ @@ -19,7 +46,6 @@ assert_edid() { exists() { xrandr | grep ' connected' | grep -c "${1}" } - case "$(hostname)" in "mainsail") echo "mainsail" @@ -28,10 +54,11 @@ case "$(hostname)" in bspc monitor HDMI-1 -d 2 4 6 8 0 ;; "mlg") - # holdover configuration for the time being - xrandr --output eDP-1 --brightness 0 - xrandr --output DP-1 --primary - bspc monitor DP-1 -d 1 2 3 4 5 6 7 8 9 + xrandr --output HDMI-0 --primary --mode 1920x1080 --rate 120 --pos 0x0 --rotate normal \ + --output DP-1-2 --mode 1920x1080 --rate 120 --pos 1920x0 --rotate normal \ + --output DP-0 --off \ + --output DP-1-1 --off + xinput set-prop 'INSTANT USB GAMING MOUSE ' 338 -1 ;; "x230t") echo "x230t" diff --git a/builds/utils/sh/keyboard b/builds/utils/sh/keyboard deleted file mode 100755 index 0ce2ebc..0000000 --- a/builds/utils/sh/keyboard +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -setxkbmap -option caps:super -killall xcape -xcape -e 'Super_L=Escape' -xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock -xset -r 161 # tablet rotate key doesn't need repeat -xset r rate 200 40 diff --git a/builds/utils/sh/mode b/builds/utils/sh/mode index ff5c3ff..8aaf7e2 100755 --- a/builds/utils/sh/mode +++ b/builds/utils/sh/mode @@ -3,7 +3,7 @@ if [ -n "$1" ]; then pkill sxhkd sxhkd -c ~/.config/sxhkd/$1 & disown - [ -f "~/.config/sxhkd/$1.sh ] && ~/.config/sxhkd/$1.sh + [ -f "~/.config/sxhkd/$1.sh" ] && ~/.config/sxhkd/$1.sh exit fi diff --git a/flake.lock b/flake.lock index 99bd06f..4a4fb6f 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1706081037, - "narHash": "sha256-R2dkUMLZa6qvRl4mXOG7bLHaGvoOYf5vIXWeyRDqML0=", + "lastModified": 1706306805, + "narHash": "sha256-BWJdcDmpqZuxCStx4RUl5SD6uELy8hRa5YzwFTdWrts=", "owner": "rycee", "repo": "nur-expressions", - "rev": "5f23ef51cad74dbf30633366e52eb895c9c633d1", + "rev": "24985136f4a5f98254e88c26d428114d206c2565", "type": "gitlab" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705916986, - "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=", + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", "type": "github" }, "original": { @@ -107,28 +107,13 @@ "type": "github" } }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, "nixpkgs-23_05": { "locked": { - "lastModified": 1684782344, - "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -139,11 +124,11 @@ }, "nixpkgs-23_11": { "locked": { - "lastModified": 1701539137, - "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", "type": "github" }, "original": { @@ -154,11 +139,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1670751203, - "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -180,17 +165,16 @@ "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs_2", - "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1703023684, - "narHash": "sha256-XQU4OaacV0F2tf9cNAvIMqlC0HBIrAtvb0MLjIHt+7M=", + "lastModified": 1706219574, + "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "4bfb8eb058f098302c97b909df2d019926e11220", + "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", "type": "gitlab" }, "original": { diff --git a/home/bspwm/bspwmrc b/home/bspwm/bspwmrc index c285482..ae481d0 100755 --- a/home/bspwm/bspwmrc +++ b/home/bspwm/bspwmrc @@ -9,20 +9,6 @@ bspc rule -a Zathura state=tiled bspc rule -a generic-st-window state=floating manage=on sticky=on border=on bspc rule -a floating-feh state=floating -set_walls() { - for i in $(xrandr | grep ' connected' | cut -d' ' -f1); do - xwallpaper --output $i --zoom ~/.local/share/pape.jpg - done -} - -# post-wm boilerplate -disp -statuswrap -set_walls -pkill xscreensaver -HOME=".config/xscreensaver" xscreensaver --no-splash & - -# set up the color scheme bspc config normal_border_color "#161510" bspc config active_border_color "#727A18" bspc config focused_border_color "#727A18" @@ -33,3 +19,6 @@ bspc config focus_follows_pointer true bspc config window_gap 0 bspc config top_padding 20 + +# post-wm configuration +disp diff --git a/home/sx/sxrc b/home/sx/sxrc index 7b564f2..03464ba 100755 --- a/home/sx/sxrc +++ b/home/sx/sxrc @@ -1,6 +1,3 @@ -# adjust some keybindings -keyboard -# # start the wm sxhkd & bspwm