From ec1cd5a7135c895575dfd9b3a364d5bab42e8eb5 Mon Sep 17 00:00:00 2001 From: horhik Date: Mon, 7 Jun 2021 14:44:23 +0300 Subject: [PATCH] add borders to windows, remove dim on infocused windows --- home/dunst/.config/dunst/dunstrc | 18 +++++++++--------- home/gtk/.config/gtk-2.0/gtkfilechooser.ini | 8 ++++---- .../.config/qutebrowser/autoconfig.yml | 10 ++++++++++ .../qutebrowser/qsettings/QtProject.conf | 5 +++++ home/xmonad/.xmonad/xmonad.hs | 17 ++++++++++++----- nix/configuration.nix | 2 +- nix/modules/.#picom.nix | 1 - nix/modules/gtk.nix | 8 ++++++-- nix/modules/picom.nix | 18 ++++++++++++------ nix/modules/steam.nix | 9 --------- nix/programs/mpv.nix | 0 nix/programs/qutebrowser.nix | 0 nix/programs/spotify.nix | 0 nix/programs/vifm.nix | 0 nix/programs/vim.nix | 0 nix/programs/zsh.nix | 0 16 files changed, 59 insertions(+), 37 deletions(-) create mode 100644 home/qutebrowser/.config/qutebrowser/autoconfig.yml create mode 100644 home/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf delete mode 120000 nix/modules/.#picom.nix delete mode 100644 nix/modules/steam.nix create mode 100644 nix/programs/mpv.nix create mode 100644 nix/programs/qutebrowser.nix create mode 100644 nix/programs/spotify.nix create mode 100644 nix/programs/vifm.nix create mode 100644 nix/programs/vim.nix create mode 100644 nix/programs/zsh.nix diff --git a/home/dunst/.config/dunst/dunstrc b/home/dunst/.config/dunst/dunstrc index 1d57634..4b6aa36 100644 --- a/home/dunst/.config/dunst/dunstrc +++ b/home/dunst/.config/dunst/dunstrc @@ -29,7 +29,7 @@ # the top and down respectively. # The width can be negative. In this case the actual width is the # screen width minus the width defined in within the geometry option. - geometry = "350x5-20+40" + geometry = "350x5-785+40" # Show how many messages are currently hidden (because of geometry). indicate_hidden = yes @@ -41,7 +41,7 @@ # The transparency of the window. Range: [0; 100]. # This option will only work if a compositing window manager is # present (e.g. xcompmgr, compiz, etc.). - transparency = 30 + transparency = 0 # The height of the entire notification. If the height is smaller # than the font height and padding combined, it will be raised @@ -51,17 +51,17 @@ # Draw a line of "separator_height" pixel height between two # notifications. # Set to 0 to disable. - separator_height = 5 + separator_height = 10 # Padding between text and separator. - padding = 0 + padding = 10 # Horizontal padding. - horizontal_padding = 0 + horizontal_padding = 10 # Defines width in pixels of frame around the notification window. # Set to 0 to disable. - frame_width = 3 + frame_width = 0 # Defines color of the frame around the notification window. frame_color = "#44475a" @@ -72,7 +72,7 @@ # * foreground: use the same color as the foreground; # * frame: use the same color as the frame; # * anything else will be interpreted as a X color. - separator_color = frame + separator_color = "#ff000000" # Sort messages by urgency. sort = yes @@ -86,7 +86,7 @@ ### Text ### - font = Mononoki 12 + font = Mononoki 14 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. @@ -163,7 +163,7 @@ icon_position = left # Scale larger icons down to this size, set to 0 to disable - max_icon_size = 120 + max_icon_size = 80 # Paths to default icons. icon_path = /usr/share/icons/Papirus-Dark/16x16:/usr/share/icons/Papirus/16x16:/home/horhik/Pictures/icons diff --git a/home/gtk/.config/gtk-2.0/gtkfilechooser.ini b/home/gtk/.config/gtk-2.0/gtkfilechooser.ini index 1da176b..5f1e0ab 100644 --- a/home/gtk/.config/gtk-2.0/gtkfilechooser.ini +++ b/home/gtk/.config/gtk-2.0/gtkfilechooser.ini @@ -4,8 +4,8 @@ ShowHidden=false ShowSizeColumn=true GeometryX=0 GeometryY=0 -GeometryWidth=637 -GeometryHeight=520 -SortColumn=name -SortOrder=ascending +GeometryWidth=768 +GeometryHeight=972 +SortColumn=modified +SortOrder=descending StartupMode=recent diff --git a/home/qutebrowser/.config/qutebrowser/autoconfig.yml b/home/qutebrowser/.config/qutebrowser/autoconfig.yml new file mode 100644 index 0000000..e5f9df3 --- /dev/null +++ b/home/qutebrowser/.config/qutebrowser/autoconfig.yml @@ -0,0 +1,10 @@ +# If a config.py file exists, this file is ignored unless it's explicitly loaded +# via config.load_autoconfig(). For more information, see: +# https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/configuring.asciidoc#loading-autoconfigyml +# DO NOT edit this file by hand, qutebrowser will overwrite it. +# Instead, create a config.py - see :help for details. + +config_version: 2 +settings: + content.media.audio_capture: + https://vk.com: true diff --git a/home/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf b/home/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf new file mode 100644 index 0000000..a1bd41b --- /dev/null +++ b/home/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf @@ -0,0 +1,5 @@ +[FileDialog] +history=@Invalid() +lastVisited=file:///home/horhik/Downloads/Telegram Desktop +qtVersion=5.15.2 +viewMode=Detail diff --git a/home/xmonad/.xmonad/xmonad.hs b/home/xmonad/.xmonad/xmonad.hs index cd6c0dd..843f000 100644 --- a/home/xmonad/.xmonad/xmonad.hs +++ b/home/xmonad/.xmonad/xmonad.hs @@ -19,9 +19,11 @@ import XMonad.Util.SpawnOnce import XMonad.Util.Run import XMonad.Hooks.ManageDocks import XMonad.Layout.Gaps +import XMonad.Layout.ToggleLayouts +import XMonad.Util.Themes import XMonad.Util.EZConfig import XMonad.Layout.Spacing -import XMonad.Layout.NoBorders +import XMonad.Layout.NoBorders (noBorders, smartBorders) import XMonad.Layout.Tabbed import XMonad.Hooks.DynamicLog import XMonad.Util.Scratchpad @@ -45,7 +47,7 @@ myFocusFollowsMouse :: Bool myFocusFollowsMouse = True myClickJustFocuses :: Bool myClickJustFocuses = False -myBorderWidth = 0 +myBorderWidth = 3 superKey = mod4Mask myModMask = superKey -- myWorkspaces = ["home 1","web 2","code 3","test 4","tkr 5","task 6","edit 7", "chat 8","book 9"] @@ -228,12 +230,16 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $ -- The available layouts. Note that each layout is separated by |||, -- which denotes layout choice. -- -defaultGapSize = 0 +defaultGapSize = 7; defaultGaps = gaps [(U,defaultGapSize), (R,defaultGapSize), (D, defaultGapSize), (L, defaultGapSize)] -defaultSpaces = spacingRaw True (Border 0 0 0 0) True (Border 0 0 0 0) True +defaultSpaces = spacingRaw True (Border 7 7 7 7) True (Border 7 7 7 7) True spacesAndGaps = defaultSpaces . defaultGaps -myLayout = smartBorders . avoidStruts $ spacesAndGaps $ tiled ||| Mirror tiled ||| Full ||| simpleTabbed +myTabConfig = def { inactiveBorderColor = commentColor + , activeTextColor = selectionColor} +myLayout = smartBorders . avoidStruts + $ spacesAndGaps + $ tiled ||| Mirror tiled ||| noBorders Full ||| simpleTabbed -- tabbed shrinkText (theme kavonAutumnTheme ) where -- default tiling algorithm partitions the screen into two panes tiled = Tall nmaster delta ratio @@ -421,6 +427,7 @@ myStartupHook = do spawnOnce "setxkbmap us,ru &" spawnOnce "eww daemon" spawnOnce "nextcloud" + spawnOnce "superProductivity" spawnOnce "syncthing" spawnOnce "sh ssh-agent bash ; ssh-add ~/.ssh/arch" spawnOnce "eval '$(ssh-agent -s)'; ssh-add ~/.ssh/id_rsa" diff --git a/nix/configuration.nix b/nix/configuration.nix index 05d7798..ec44005 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -20,7 +20,6 @@ ./modules/hosts.nix #./modules/picom.nix ./modules/sound.nix - ./modules/steam.nix ./modules/zsh.nix ./fonts.nix @@ -115,6 +114,7 @@ wget git vim neovim emacs alacritty xterm zsh tmux stow dunst # haskellPackages.xmonad haskellPackages.xmonad-contrib haskellPackages.xmonad-utils haskellPackages.xmobar + tabbed i3 surf dmenu st qutebrowser lightdm rofi nitrogen rofi-emoji mononoki fontmatrix diff --git a/nix/modules/.#picom.nix b/nix/modules/.#picom.nix deleted file mode 120000 index f49ba16..0000000 --- a/nix/modules/.#picom.nix +++ /dev/null @@ -1 +0,0 @@ -horhik@lap.122842:1622363905 \ No newline at end of file diff --git a/nix/modules/gtk.nix b/nix/modules/gtk.nix index 4ac65fe..fad9b86 100644 --- a/nix/modules/gtk.nix +++ b/nix/modules/gtk.nix @@ -1,15 +1,19 @@ {config, pkgs, ...}: { + programs.dconf.enable = true; + services.gnome.evolution-data-server.enable = true; + services.gnome.gnome-keyring.enable = true; services.xserver.desktopManager.cde.extraPackages = with pkgs; options.services.xserver.desktopManager.cde.extraPackages.default ++ [ cde-gtk-theme + yaru-theme ]; environment.etc."xdg/gtk-2.0/gtkrc".text = '' - gtk-theme-name="Yaru" + gtk-theme-name="Yaru-dark" ''; environment.etc."xdg/gtk-3.0/settings.ini".text = '' [Settings] - gtk-theme-name=yaru-theme + gtk-theme-name=Yaru-dark ''; qt5 = { enable = true; diff --git a/nix/modules/picom.nix b/nix/modules/picom.nix index 6890b09..3cfa89a 100644 --- a/nix/modules/picom.nix +++ b/nix/modules/picom.nix @@ -5,18 +5,21 @@ services.picom.package = pkgs.nur.repos.reedrw.picom-next-ibhagwan; services.picom.shadow = true; services.picom.vSync = true; - services.picom.inactiveOpacity = "0.8"; - services.picom.inactiveDim = "0.7"; +# services.picom.inactiveOpacity = "0.8"; +# services.picom.inactiveDim = "0.7"; services.picom.backend = "glx"; services.picom.experimentalBackends = true; services.picom.opacityRule = [ "80:class_g = 'Zathura'" - "80:class_g = 'TelegramDesktop'" "80:class_g = 'Discord'" "80:class_g = 'Emacs'" + "60:class_g = 'Anki'" "100:class_g = 'keynav'" "85:class_g = 'Alacritty'" ]; + services.picom.shadowExclude = [ + "class_g = 'Navigator'" + ]; services.picom.extraOptions = '' #inactive-dim = 0.5; #active-opacity = 1.0; @@ -31,15 +34,18 @@ background-fixed = false; }; blur-background-exclude = [ - "class_g = 'keynav'" + "class_g = 'keynav'", + "class_g = 'Dunst'", + "class_g = 'Navigator'", + "class_g = 'Firefox'" ]; - corner-radius = 0; + corner-radius = 4; rounded-corners-exclude = [ "window_type = 'dock'", "_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'", "class_g = 'keynav'", ]; - round-borders = 0; + round-borders = 4; round-borders-exclude = [ "class_g = 'keynav'" ]; diff --git a/nix/modules/steam.nix b/nix/modules/steam.nix deleted file mode 100644 index 3a96a3a..0000000 --- a/nix/modules/steam.nix +++ /dev/null @@ -1,9 +0,0 @@ -{config, pkgs, ...}: -{ - nixpkgs.config.packageOverrides = pkgs: { - steam = pkgs.steam.override { - nativeOnly = true; - }; - }; - programs.steam.enable = true; -} diff --git a/nix/programs/mpv.nix b/nix/programs/mpv.nix new file mode 100644 index 0000000..e69de29 diff --git a/nix/programs/qutebrowser.nix b/nix/programs/qutebrowser.nix new file mode 100644 index 0000000..e69de29 diff --git a/nix/programs/spotify.nix b/nix/programs/spotify.nix new file mode 100644 index 0000000..e69de29 diff --git a/nix/programs/vifm.nix b/nix/programs/vifm.nix new file mode 100644 index 0000000..e69de29 diff --git a/nix/programs/vim.nix b/nix/programs/vim.nix new file mode 100644 index 0000000..e69de29 diff --git a/nix/programs/zsh.nix b/nix/programs/zsh.nix new file mode 100644 index 0000000..e69de29