diff --git a/dotfiles/sway/config b/dotfiles/sway/config index 08d076c..ec3b364 100644 --- a/dotfiles/sway/config +++ b/dotfiles/sway/config @@ -35,6 +35,7 @@ input "1:1:AT_Translated_Set_2_keyboard" xkb_layout de input "0:0:TUXEDO_Keyboard" xkb_layout de input 1130:35:HID_046a:0023 xkb_layout de input "2362:628:PIXA3854:00_093A:0274_Touchpad" click_method clickfinger +input * xkb_options compose:paus output * bg $wallpaper fill output "BenQ Corporation BenQ SW2700 83H03922SL0" res --custom 2560x1440@60Hz @@ -56,7 +57,7 @@ bindsym $mod+z exec $lock bindsym $mod+Up exec light -A 5 bindsym $mod+Down exec light -U 5 bindsym $mod+c exec alacritty --class float -t pyCalc -e python -bindsym $mod+i exec alacritty --class float -t insect -e insect +bindsym $mod+i exec alacritty --class float -t numbat -e numbat bindsym $mod+m exec swayr switch-to bindsym $mod+n exec emacsclient -cn bindsym Print exec grim -g "$(slurp)" - | wl-copy -t image/png @@ -68,7 +69,7 @@ for_window [app_id="org.keepassxc.KeePassXC"] floating enable for_window [title="Firefox — Sharing Indicator"] floating enable for_window [title="Picture-in-Picture"] floating enable for_window [title="pyCalc"] floating enable -for_window [title="insect"] floating enable +for_window [title="numbat"] floating enable # border backgnd text indicator childborder client.focused $cyan $white $black $violet $cyan diff --git a/hardware/framework.nix b/hardware/framework.nix index dd83777..f029ec5 100644 --- a/hardware/framework.nix +++ b/hardware/framework.nix @@ -62,7 +62,6 @@ in #boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelParams = [ - "mem_sleep_default=deep" "nvme.noacpi=1" "i915.enable_psr=1" ]; diff --git a/roles/admin.nix b/roles/admin.nix index 7256f86..7d70648 100644 --- a/roles/admin.nix +++ b/roles/admin.nix @@ -14,6 +14,7 @@ in { nmap pwgen terraform + terraform-docs whois ipcalc @@ -23,6 +24,7 @@ in { pre-commit terraform-ls vault + yaml-language-server docker-compose fuse-overlayfs diff --git a/roles/desktop.nix b/roles/desktop.nix index 9eea2de..38f85c8 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -167,13 +167,13 @@ in mpv mumble neofetch - nodePackages.insect + numbat pavucontrol pcmanfm qrencode remmina - wezterm uxplay + wezterm solaar gdk-pixbuf diff --git a/roles/dev.nix b/roles/dev.nix index 28172b9..eba14da 100644 --- a/roles/dev.nix +++ b/roles/dev.nix @@ -4,16 +4,16 @@ let unstable = import { }; in { - services.emacs.package = pkgs.emacs29-pgtk; + services.emacs.package = pkgs.emacs-pgtk; environment.systemPackages = with pkgs; [ gnumake go + phpactor rustup shellcheck unstable.golangci-lint unstable.gopls - unstable.rust-analyzer (python311.withPackages (python-packages: with python-packages; [ @@ -30,7 +30,7 @@ in { musl dbeaver-bin - emacs29-pgtk + emacs-pgtk gitAndTools.delta lazygit ltrace diff --git a/roles/work.nix b/roles/work.nix index 502c1ae..7032d63 100644 --- a/roles/work.nix +++ b/roles/work.nix @@ -48,10 +48,6 @@ in { 127.0.0.1 database 127.0.0.1 youtube.com 127.0.0.1 www.youtube.com - - 34.49.192.42 www.tbone.audio - 34.49.192.42 jobs.thomann.de - ''; environment.systemPackages = with pkgs; [ @@ -66,6 +62,7 @@ in { chromium nodejs vscodium + git-lfs drone-cli govc