diff --git a/awesome/init.fnl b/awesome/init.fnl index 1b707ea..9a7a5a5 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -707,6 +707,7 @@ (when (= c.class "mpv") (awful.placement.centered c)) (when (= c.class "imv") (awful.placement.centered c)) (when (= c.class "Sxiv") (awful.placement.centered c)) + (when (= c.class "btop") (awful.placement.centered c)) (when (= c.class "Libre Presenter") (awful.placement.centered c)) (when (= c.name "Display Window") (set c.fullscreen true)) (when (= c.name "presentation-window") (set c.fullscreen true)) @@ -761,7 +762,7 @@ (awful.spawn.once "picom --experimental-backend") (awful.spawn.once "/usr/lib/polkit-kde-authentication-agent-1") (awful.spawn.once "kwalletd5") -(awful.spawn.once "feh --bg-fill /home/chris/Pictures/wallpapers/tech.jpg") +(awful.spawn.once "feh --bg-fill /home/chris/Pictures/wallpapers/nixorange.webp") (awful.spawn.once "bluetoothctl power on") (awful.spawn.once "nextcloud --background") (awful.spawn.once "rbw-agent") diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index 2cedaba..7675d6e 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -156,6 +156,8 @@ (awful.key [] "XF86MonBrightnessDown" (fn [] (awful.spawn.with_shell "brightnessctl s 5%- && lightget")) {:description "Decrease monitor brightness by 5%" :group "utilities"}) + (awful.key [modkey ctrl] "i" (fn [] (awful.spawn "alacritty --class btop -e btop")) + {:description "launch btop" :group "utilities"}) ;; Menubar ;; (awful.key [ modkey ] "p" (fn [] (menubar.show)) ;; {:description "show the menubar" :group "launcher"}) @@ -416,7 +418,7 @@ {:description "toggle floating" :group "client"}) (awful.key [ modkey ctrl ] "Return" (fn [c] (: c :swap (awful.client.getmaster))) {:description "move to master" :group "client"}) - (awful.key [ modkey ctrl ] "c" awful.placement.centered + (awful.key [ modkey ctrl ] "c" (fn [c] (set c.placement awful.placement.centered)) {:description "move the floating window to the center of the screen" :group "layout"}) (awful.key [ modkey ] "o" (fn [c] (: c :move_to_screen)) {:description "move to screen" :group "client"}) diff --git a/awesome/rules.fnl b/awesome/rules.fnl index 611a3f1..83f9c2d 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -168,6 +168,8 @@ :instance [ "pulsemixer" ] + :class [ + ] } :properties { :floating true @@ -179,6 +181,44 @@ :placement awful.placement.centered } } + { + :rule_any { + :instance [ + "btop" + ] + :class [ + "btop" + ] + } + :properties { + :floating true + :raise true + :ontop true + :screen awful.screen.preferred + :width (dpi 1000) + :height (dpi 700) + :placement awful.placement.centered + } + } + { + :rule_any { + :instance [ + "eww" + ] + :class [ + "eww" + ] + } + :properties { + :floating true + :raise true + :ontop true + :screen awful.screen.preferred + ;; :width (dpi 600) + ;; :height (dpi 200) + :placement (+ awful.placement.centered awful.placement.no_offscreen awful.placement.top) + } + } ;; Tell qb to open primarily on the secondary monitor { :rule_any { diff --git a/modules/emacs.nix b/modules/emacs.nix index b5a257b..5f9ec59 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -4,7 +4,7 @@ with lib; { services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages + package = with pkgs; ((emacsPackagesFor emacsGit).emacsWithPackages (epkgs: with epkgs; [ vterm magit @@ -12,6 +12,8 @@ with lib; consult-eglot org org-roam + denote + denote-refs command-log-mode all-the-icons doom-modeline @@ -114,7 +116,7 @@ with lib; password-store password-store-otp plz - ement + elpaPackages.ement mastodon qrencode gcmh diff --git a/picom.conf b/picom.conf index 016f70f..cfa4aed 100644 --- a/picom.conf +++ b/picom.conf @@ -1,14 +1,14 @@ # Animations -transition-length = 200 -transition-pow-x = 1 -transition-pow-y = 1 -transition-pow-w = 1 -transition-pow-h = 1 +transition-length = 250 +transition-pow-x = 0.5 +transition-pow-y = 0.5 +transition-pow-w = 0.5 +transition-pow-h = 0.5 size-transition = true spawn-center = true # Corners -corner-radius = 0.0; +corner-radius = 18.0; rounded-corners-exclude = [ #"window_type = 'normal'", "class_g = 'awesome'", @@ -18,7 +18,7 @@ rounded-corners-exclude = [ "class_g = 'Thunderbird'", # "_NET_WM_STATE@[0]:32a *= '_NET_WM_STATE_FULLSCREEN'", ]; -round-borders = 0; +round-borders = 18; round-borders-exclude = [ #"class_g = 'TelegramDesktop'", ]; @@ -30,7 +30,7 @@ round-borders-exclude = [ shadow = true; # The blur radius for shadows, in pixels. (defaults to 12) -shadow-radius = 25; +shadow-radius = 30; # The opacity of shadows. (0.0 - 1.0, defaults to 0.75) shadow-opacity = 1.0; @@ -81,7 +81,7 @@ shadow-exclude = [ "name = 'Display Window'", "name = 'Video'", "class_g = 'Conky'", - "class_g = 'Rofi'", + # "class_g = 'Rofi'", # "class_g = 'firefox'", # "class_g = 'Alacritty'", "class_g ?= 'Notify-osd'", @@ -157,7 +157,7 @@ inactive-opacity-override = false; active-opacity = 0.90; # Dim inactive windows. (0.0 - 1.0, defaults to 0.0) -inactive-dim = 0.4 +inactive-dim = 0.2 # Specify a list of conditions of windows that should always be considered focused. # focus-exclude = [] @@ -342,7 +342,7 @@ use-ewmh-active-win = true; # Unredirect all windows if a full-screen opaque window is detected, # to maximize performance for full-screen windows. Known to cause flickering # when redirecting/unredirecting windows. paint-on-overlay may make the flickering less obvious. -unredir-if-possible = false; +unredir-if-possible = true; # Delay before unredirecting the window, in milliseconds. Defaults to 0. # unredir-if-possible-delay = 0 diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 94ab77e..bd816ca 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -23,6 +23,8 @@ with lib; audacity krename kwallet-pam + nm-tray + # pantalaimon plasma5Packages.kwallet sierra-breeze-enhanced libimobiledevice @@ -105,7 +107,7 @@ with lib; rubberband texlive.combined.scheme-full wlroots - picom-next + picom-jonaburg pamixer playerctl jellyfin-mpv-shim diff --git a/user/home.nix b/user/home.nix index 4320839..91389f1 100644 --- a/user/home.nix +++ b/user/home.nix @@ -254,6 +254,24 @@ # services.kdeconnect.enable = true; services.easyeffects.enable = true; + # For matrix clients that don't have e2ee + services.pantalaimon = { + enable = true; + settings = { + Default = { + LogLevel = "Debug"; + SSL = true; + }; + local-matrix = { + Homeserver = "https://matrix.tfcconnection.org"; + ListenAddress = "localhost"; + ListenPort = 8008; + SSL = false; + IgnoreVerification = true; + }; + }; + }; + services.espanso = { enable = true; settings = { @@ -488,7 +506,6 @@ ''; }; - xdg.desktopEntries = { mpv-slow = { name = "MPV";