From b56bb86c115c2545623ab3375b5aab69dd2716fd Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Oct 11 2019 05:27:36 +0000 Subject: Fixes and new features --- diff --git a/.gitignore b/.gitignore index 5cc2538..d542549 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ icewm-1.2.37.tar.gz /Araita+.tar.bz2 /Araita-Dark+.tar.bz2 /icewm-1.6.2.tar.gz +*.swp diff --git a/conky.conf b/conky.conf new file mode 100644 index 0000000..2009e60 --- /dev/null +++ b/conky.conf @@ -0,0 +1,88 @@ +--[[ +Conky, a system monitor, based on torsmo + +Any original torsmo code is licensed under the BSD license + +All code written since the fork of torsmo is licensed under the GPL + +Please see COPYING for details + +Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen +Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +All rights reserved. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +]] + +conky.config = { + alignment = 'top_right', + background = false, + border_width = 1, + cpu_avg_samples = 2, + default_color = 'eeeeec', + default_outline_color = 'eeeeec', + default_shade_color = 'eeeeec', + double_buffer = true, + draw_borders = false, + draw_graph_borders = true, + draw_outline = false, + draw_shades = false, + extra_newline = false, + font = 'Source Code Pro:size=10', + gap_x = 60, + gap_y = 60, + minimum_height = 5, + minimum_width = 5, + net_avg_samples = 2, + no_buffers = true, + out_to_console = false, + out_to_ncurses = false, + out_to_stderr = false, + out_to_x = true, + own_window = true, + own_window_class = 'Conky', + own_window_type = 'desktop', + show_graph_range = false, + show_graph_scale = false, + stippled_borders = 0, + update_interval = 2.0, + uppercase = false, + use_spacer = 'none', + use_xft = true, + own_window_colour = '2e3436', +-- own_window_argb_visual = true, +-- own_window_argb_value = '32', +-- own_window_transparent = true, +} + +conky.text = [[ +${color grey}Info:$color ${scroll 32 $sysname $nodename $kernel $machine} +$hr +${color grey}Uptime:$color $uptime +${color grey}Frequency (in GHz):$color $freq_g +${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4} +${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4} +${color grey}CPU Usage:$color $cpu% ${cpubar 4} +${color grey}Processes:$color $processes ${color grey}Running:$color $running_processes +$hr +${color grey}File systems: + / $color${fs_used /}/${fs_size /} ${fs_bar 6 /} +${color grey}Networking: +Up:$color ${upspeed} ${color grey} - Down:$color ${downspeed} +$hr +${color grey}Name PID CPU% MEM% +${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1} +${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2} +${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3} +${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4} +]] diff --git a/dunstrc b/dunstrc new file mode 100644 index 0000000..6d035cb --- /dev/null +++ b/dunstrc @@ -0,0 +1,414 @@ +[global] + ### Display ### + + # Which monitor should the notifications be displayed on. + monitor = 0 + + # Display notification on focused monitor. Possible modes are: + # mouse: follow mouse pointer + # keyboard: follow window with keyboard focus + # none: don't follow anything + # + # "keyboard" needs a window manager that exports the + # _NET_ACTIVE_WINDOW property. + # This should be the case for almost all modern window managers. + # + # If this option is set to mouse or keyboard, the monitor option + # will be ignored. + follow = mouse + + # The geometry of the window: + # [{width}]x{height}[+/-{x}+/-{y}] + # The geometry of the message window. + # The height is measured in number of notifications everything else + # in pixels. If the width is omitted but the height is given + # ("-geometry x2"), the message window expands over the whole screen + # (dmenu-like). If width is 0, the window expands to the longest + # message displayed. A positive x is measured from the left, a + # negative from the right side of the screen. Y is measured from + # 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 = "300x5-30+20" + + # Show how many messages are currently hidden (because of geometry). + indicate_hidden = yes + + # Shrink window if it's smaller than the width. Will be ignored if + # width is 0. + shrink = no + + # 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 = 10 + + # The height of the entire notification. If the height is smaller + # than the font height and padding combined, it will be raised + # to the font height and padding. + notification_height = 0 + + # Draw a line of "separator_height" pixel height between two + # notifications. + # Set to 0 to disable. + separator_height = 2 + + # Padding between text and separator. + padding = 8 + + # Horizontal padding. + horizontal_padding = 8 + + # Defines width in pixels of frame around the notification window. + # Set to 0 to disable. + frame_width = 3 + + # Defines color of the frame around the notification window. + frame_color = "#aaaaaa" + + # Define a color for the separator. + # possible values are: + # * auto: dunst tries to find a color fitting to the background; + # * 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 + + # Sort messages by urgency. + sort = yes + + # Don't remove messages, if the user is idle (no mouse or keyboard input) + # for longer than idle_threshold seconds. + # Set to 0 to disable. + # A client can set the 'transient' hint to bypass this. See the rules + # section for how to disable this if necessary + idle_threshold = 120 + + ### Text ### + + font = Source Code Pro 10 + + # The spacing between lines. If the height is smaller than the + # font height, it will get raised to the font height. + line_height = 0 + + # Possible values are: + # full: Allow a small subset of html markup in notifications: + # bold + # italic + # strikethrough + # underline + # + # For a complete reference see + # . + # + # strip: This setting is provided for compatibility with some broken + # clients that send markup even though it's not enabled on the + # server. Dunst will try to strip the markup but the parsing is + # simplistic so using this option outside of matching rules for + # specific applications *IS GREATLY DISCOURAGED*. + # + # no: Disable markup parsing, incoming notifications will be treated as + # plain text. Dunst will not advertise that it has the body-markup + # capability if this is set as a global setting. + # + # It's important to note that markup inside the format option will be parsed + # regardless of what this is set to. + markup = full + + # The format of the message. Possible variables are: + # %a appname + # %s summary + # %b body + # %i iconname (including its path) + # %I iconname (without its path) + # %p progress value if set ([ 0%] to [100%]) or nothing + # %n progress value if set without any extra characters + # %% Literal % + # Markup is allowed + format = "%s\n%b" + + # Alignment of message text. + # Possible values are "left", "center" and "right". + alignment = left + + # Show age of message if message is older than show_age_threshold + # seconds. + # Set to -1 to disable. + show_age_threshold = 60 + + # Split notifications into multiple lines if they don't fit into + # geometry. + word_wrap = yes + + # When word_wrap is set to no, specify where to make an ellipsis in long lines. + # Possible values are "start", "middle" and "end". + ellipsize = middle + + # Ignore newlines '\n' in notifications. + ignore_newline = no + + # Stack together notifications with the same content + stack_duplicates = true + + # Hide the count of stacked notifications with the same content + hide_duplicate_count = false + + # Display indicators for URLs (U) and actions (A). + show_indicators = yes + + ### Icons ### + + # Align icons left/right/off + icon_position = left + + # Scale larger icons down to this size, set to 0 to disable + max_icon_size = 32 + + # Paths to default icons. + icon_path = /usr/share/icons/Adwaita/32x32/status/:/usr/share/icons/Adwaita/32x32/devices/ + + ### History ### + + # Should a notification popped up from history be sticky or timeout + # as if it would normally do. + sticky_history = yes + + # Maximum amount of notifications kept in history + history_length = 20 + + ### Misc/Advanced ### + + # dmenu path. + dmenu = /usr/bin/dmenu -p dunst: + + # Browser for opening urls in context menu. + browser = /usr/bin/firefox -new-tab + + # Always run rule-defined scripts, even if the notification is suppressed + always_run_script = true + + # Define the title of the windows spawned by dunst + title = Dunst + + # Define the class of the windows spawned by dunst + class = Dunst + + # Print a notification on startup. + # This is mainly for error detection, since dbus (re-)starts dunst + # automatically after a crash. + startup_notification = false + + # Manage dunst's desire for talking + # Can be one of the following values: + # crit: Critical features. Dunst aborts + # warn: Only non-fatal warnings + # mesg: Important Messages + # info: all unimportant stuff + # debug: all less than unimportant stuff + verbosity = mesg + + # Define the corner radius of the notification window + # in pixel size. If the radius is 0, you have no rounded + # corners. + # The radius will be automatically lowered if it exceeds half of the + # notification height to avoid clipping text and/or icons. + corner_radius = 0 + + ### Legacy + + # Use the Xinerama extension instead of RandR for multi-monitor support. + # This setting is provided for compatibility with older nVidia drivers that + # do not support RandR and using it on systems that support RandR is highly + # discouraged. + # + # By enabling this setting dunst will not be able to detect when a monitor + # is connected or disconnected which might break follow mode if the screen + # layout changes. + force_xinerama = false + + ### mouse + + # Defines action of mouse event + # Possible values are: + # * none: Don't do anything. + # * do_action: If the notification has exactly one action, or one is marked as default, + # invoke it. If there are multiple and no default, open the context menu. + # * close_current: Close current notification. + # * close_all: Close all notifications. + mouse_left_click = close_current + mouse_middle_click = do_action + mouse_right_click = close_all + +# Experimental features that may or may not work correctly. Do not expect them +# to have a consistent behaviour across releases. +[experimental] + # Calculate the dpi to use on a per-monitor basis. + # If this setting is enabled the Xft.dpi value will be ignored and instead + # dunst will attempt to calculate an appropriate dpi value for each monitor + # using the resolution and physical size. This might be useful in setups + # where there are multiple screens with very different dpi values. + per_monitor_dpi = false + +[shortcuts] + + # Shortcuts are specified as [modifier+][modifier+]...key + # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", + # "mod3" and "mod4" (windows-key). + # Xev might be helpful to find names for keys. + + # Close notification. + close = ctrl+space + + # Close all notifications. + close_all = ctrl+shift+space + + # Redisplay last message(s). + # On the US keyboard layout "grave" is normally above TAB and left + # of "1". Make sure this key actually exists on your keyboard layout, + # e.g. check output of 'xmodmap -pke' + history = ctrl+grave + + # Context menu. + context = ctrl+shift+period + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + background = "#222222" + foreground = "#888888" + timeout = 10 + # Icon for notifications with low urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_normal] + background = "#285577" + foreground = "#ffffff" + timeout = 10 + # Icon for notifications with normal urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_critical] + background = "#900000" + foreground = "#ffffff" + frame_color = "#ff0000" + timeout = 0 + # Icon for notifications with critical urgency, uncomment to enable + #icon = /path/to/icon + +# Every section that isn't one of the above is interpreted as a rules to +# override settings for certain messages. +# +# Messages can be matched by +# appname (discouraged, see desktop_entry) +# body +# category +# desktop_entry +# icon +# match_transient +# msg_urgency +# stack_tag +# summary +# +# and you can override the +# background +# foreground +# format +# frame_color +# fullscreen +# new_icon +# set_stack_tag +# set_transient +# timeout +# urgency +# +# Shell-like globbing will get expanded. +# +# Instead of the appname filter, it's recommended to use the desktop_entry filter. +# GLib based applications export their desktop-entry name. In comparison to the appname, +# the desktop-entry won't get localized. +# +# SCRIPTING +# You can specify a script that gets run when the rule matches by +# setting the "script" option. +# The script will be called as follows: +# script appname summary body icon urgency +# where urgency can be "LOW", "NORMAL" or "CRITICAL". +# +# NOTE: if you don't want a notification to be displayed, set the format +# to "". +# NOTE: It might be helpful to run dunst -print in a terminal in order +# to find fitting options for rules. + +# Disable the transient hint so that idle_threshold cannot be bypassed from the +# client +#[transient_disable] +# match_transient = yes +# set_transient = no +# +# Make the handling of transient notifications more strict by making them not +# be placed in history. +#[transient_history_ignore] +# match_transient = yes +# history_ignore = yes + +# fullscreen values +# show: show the notifications, regardless if there is a fullscreen window opened +# delay: displays the new notification, if there is no fullscreen window active +# If the notification is already drawn, it won't get undrawn. +# pushback: same as delay, but when switching into fullscreen, the notification will get +# withdrawn from screen again and will get delayed like a new notification +#[fullscreen_delay_everything] +# fullscreen = delay +#[fullscreen_show_critical] +# msg_urgency = critical +# fullscreen = show + +#[espeak] +# summary = "*" +# script = dunst_espeak.sh + +#[script-test] +# summary = "*script*" +# script = dunst_test.sh + +#[ignore] +# # This notification will not be displayed +# summary = "foobar" +# format = "" + +#[history-ignore] +# # This notification will not be saved in history +# summary = "foobar" +# history_ignore = yes + +#[skip-display] +# # This notification will not be displayed, but will be included in the history +# summary = "foobar" +# skip_display = yes + +#[signed_on] +# appname = Pidgin +# summary = "*signed on*" +# urgency = low +# +#[signed_off] +# appname = Pidgin +# summary = *signed off* +# urgency = low +# +#[says] +# appname = Pidgin +# summary = *says* +# urgency = critical +# +#[twitter] +# appname = Pidgin +# summary = *twitter.com* +# urgency = normal +# +#[stack-volumes] +# appname = "some_volume_notifiers" +# set_stack_tag = "volume" +# +# vim: ft=cfg diff --git a/icewm-keys.patch b/icewm-keys.patch index 81c1131..a28aaa6 100644 --- a/icewm-keys.patch +++ b/icewm-keys.patch @@ -1,18 +1,19 @@ --- a/lib/keys.in 2019-09-18 19:52:15.000000000 +0300 -+++ b/lib/keys.in 2019-09-25 01:52:46.179000226 +0300 -@@ -9,12 +9,24 @@ ++++ b/lib/keys.in 2019-10-11 04:36:30.076380710 +0300 +@@ -9,12 +9,28 @@ # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper. # key "Alt+Ctrl+t" @XTERMCMD@ +key "Super+r" rofi -show drun +key "Super+s" gnome-screenshot -+#key "Super+s" deepin-screenshot -+key "Super+f" nautilus ++# key "Super+s" deepin-screenshot ++# key "Super+s" flameshot gui ++key "Super+f" xdg-open /home +key "Super+e" gedit -+key "Super+h" gnome-terminal -- htop ++key "Super+h" @XTERMCMD@ -- htop key "Alt+Ctrl+b" xdg-open about:blank -key "Alt+Ctrl+s" xdg-open https://www.google.com -+#key "Alt+Ctrl+s" xdg-open https://www.google.com ++# key "Alt+Ctrl+s" xdg-open https://www.google.com +key "Super+Shift+p" poweroff +key "Super+Shift+r" reboot +key "Super+Shift+s" systemctl suspend @@ -23,6 +24,9 @@ +key "Super+q" amixer sset Master 5%- +key "Super+w" amixer sset Master 5%+ + ++key "XF86MonBrightnessDown" xbacklight -dec 1 ++key "XF86MonBrightnessUp" xbacklight -inc 1 ++ # "Multimedia key" bindings for Xorg. Gather the keycodes of your # advanced function keys by watching the output of the xev command whilest # pressing those keys and map those symbols by using xmodmap. diff --git a/icewm-startup b/icewm-startup index 436f09f..abeaea8 100755 --- a/icewm-startup +++ b/icewm-startup @@ -2,20 +2,23 @@ sleep 1 && -## Compositor (lite and safe mode) -#compton -cC -r 20 -l -20 -t -20 -o 0.8 & -## Compositor -#compton --backend glx --glx-no-stencil -cC -r 20 -l -20 -t -20 -o 0.8 & -## Compositor (with blur) -#compton --backend glx --glx-no-stencil --blur-background --blur-kern 7x7box -cC -r 20 -l -20 -t -20 -o 0.8 & +# - Compositor (lite and safe mode) - +# compton -cC -r 20 -l -20 -t -20 -o 0.6 & +# - Compositor - +# compton --backend glx --glx-no-stencil -cC -r 20 -l -20 -t -20 -o 0.6 & + +# - Compositor (with blur) - +# compton --backend glx --glx-no-stencil --blur-background --blur-kern 7x7box -cC -r 20 -l -20 -t -20 -o 0.6 & + +conky & nm-applet & redshift-gtk & volumeicon & -#evolution & -#gwe & -#pasystray & -#telegram-desktop & -#workrave & +# evolution & +# gwe & +# pasystray & +# telegram-desktop & +# workrave & diff --git a/icewm-toolbar.patch b/icewm-toolbar.patch index 9b7868c..1a482d3 100644 --- a/icewm-toolbar.patch +++ b/icewm-toolbar.patch @@ -8,5 +8,5 @@ -prog "Web browser" web-browser xdg-open about:blank - +prog "Web browser" web-browser xdg-open about:blank -+prog "File manager" system-file-manager nautilus ++prog "File manager" system-file-manager xdg-open /home +prog "@XTERMCMD@" utilities-terminal @XTERMCMD@ diff --git a/icewm.spec b/icewm.spec index 50ece8b..29b23bf 100644 --- a/icewm.spec +++ b/icewm.spec @@ -6,31 +6,41 @@ Name: icewm Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window manager designed for speed, usability, and consistency License: LGPLv2+ URL: https://github.com/bbidulock/icewm Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# --- Themes --- +# - Themes - # https://www.box-look.org/p/1310273/ Source10: IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2 Source11: %{name}-fedora.tar.xz + # https://www.box-look.org/p/1266477/ Source12: KDE-Core-20181026134422.tar.bz2 + # https://www.box-look.org/p/1163246/ Source13: Windows7ice1.tar.xz + # https://www.box-look.org/p/1321163/ Source14: Araita+.tar.bz2 Source15: Araita-Dark+.tar.bz2 + # Better font rendering on non HiDPI screens Source20: local.conf Source21: gtkrc-2.0 Source22: gkt3-settings.ini Source30: %{name}-startup + # Wallpaper Source40: %{name}-wallpaper.png + +# 3rd party config files +Source50: dunstrc +Source51: conky.conf + Patch0: %{name}-keys.patch Patch1: %{name}-toolbar.patch @@ -66,42 +76,65 @@ BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) -Requires: %{name}-data = %{version}-%{release} +Requires: adwaita-icon-theme Requires: alsa-utils%{?_isa} -Requires: gnome-icon-theme +Requires: %{name}-data = %{version}-%{release} Requires: xdg-utils %if 0%{?fedora} || 0%{?rhel} >= 8 +Recommends: %{name}-3rd-party-cfg Recommends: %{name}-fonts-settings = %{version}-%{release} Recommends: %{name}-themes = %{version}-%{release} Recommends: %{name}-wallpaper Recommends: abattis-cantarell-fonts + # Compositor for X11 Recommends: compton-ng%{?_isa} +Recommends: conky%{?_isa} + +# Notification daemon +Recommends: dunst%{?_isa} + Recommends: gnome-screenshot%{?_isa} Recommends: gnome-terminal%{?_isa} + # Display resolution control Recommends: lxrandr%{?_isa} Recommends: network-manager-applet%{?_isa} + # Night mode Recommends: redshift-gtk%{?_isa} + # Launcher Recommends: rofi%{?_isa} + # Volume control Recommends: volumeicon%{?_isa} + Suggests: %{name}-minimal-session = %{version}-%{release} -# --- Various additional useful tools --- + +# - Various additional useful tools - +# Screenshot Suggests: deepin-screenshot%{?_isa} +Suggests: flameshot%{?_isa} + # Volume control Suggests: pasystray%{?_isa} Suggests: pavucontrol%{?_isa} + # Graphical app launcher for X with minimal dependencies Suggests: xlunch%{?_isa} + # https://github.com/bbidulock/icewm/issues/379 Suggests: xterm%{?_isa} %endif +%if 0%{?fedora} +# Screen brightness control (not available in EPEL8 yet) +Recommends: xbacklight%{?_isa} +%endif + %description IceWM is a window manager for the X Window System (freedesktop, XFree86). The goal of IceWM is speed, simplicity, and not getting in the user's way. @@ -112,9 +145,9 @@ You can install minimal version of IceWM without all optional dependencies: %package data +Summary: Data files for %{name} BuildArch: noarch -Summary: Data files for %{name} Requires: %{name} = %{version}-%{release} %description data @@ -122,9 +155,9 @@ Data files for %{name}. %package themes +Summary: Extra themes for %{name} BuildArch: noarch -Summary: Extra themes for %{name} Requires: %{name} = %{version}-%{release} %description themes @@ -132,9 +165,9 @@ Extra themes for %{name}. %package minimal-session +Summary: Minimal session for %{name} BuildArch: noarch -Summary: Minimal session for %{name} Requires: %{name} = %{version}-%{release} %description minimal-session @@ -142,9 +175,9 @@ Minimal, lightweight session for %{name}. %package wallpaper +Summary: Wallpaper for %{name} BuildArch: noarch -Summary: Wallpaper for %{name} Requires: %{name} %description wallpaper @@ -152,33 +185,50 @@ Wallpaper for %{name}. %package fonts-settings +Summary: Font settings and tweaks for %{name} BuildArch: noarch -Summary: Font settings and tweaks for %{name} Requires: %{name} = %{version}-%{release} %description fonts-settings Font settings and tweaks for %{name}. +%package 3rd-party-cfg +Summary: Config files for 3rd-party apps to play nicely with %{name} +BuildArch: noarch + +Requires: %{name} = %{version}-%{release} + +%description 3rd-party-cfg +Various config files for 3rd-party apps to play nicely with %{name}. + + %prep %setup -q %patch0 -p1 %patch1 -p1 %setup -q -D -T -a10 %setup -q -D -T -a11 + +# Tweak default theme sed -i 's!sans-serif:size=10!Cantarell:size=11!' IceClearlooks2*/*.theme sed -i 's!xmirs!xmis!' IceClearlooks2*/*.theme sed -i 's!#DesktopBackgroundScaled=1 # 0 / 1!DesktopBackgroundScaled=1 # 0 / 1!' IceClearlooks2*/*.theme sed -i 's!#DesktopBackgroundImage = "/home/ren/Imágenes/cafe70.jpg"!DesktopBackgroundImage = "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' IceClearlooks2*/*.theme + %setup -q -D -T -a12 %setup -q -D -T -a13 find Windows7ice1/. -type f -executable -exec chmod -x "{}" \; %setup -q -D -T -a14 %setup -q -D -T -a15 + +# Tweak Araita theme sed -i 's!carlito:size=12!Cantarell:size=11!' Araita*/*.theme sed -i 's!carlito:size=13!Cantarell:size=11!' Araita*/*.theme sed -i 's!#DesktopBackgroundImage= "/usr/share/wallpapers/default.jpg"!DesktopBackgroundImage= "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' Araita*/*.theme + + # Remove in next version # https://github.com/bbidulock/icewm/issues/387 sed -i 's/ IceWM.jpg//' lib/CMakeLists.txt @@ -212,6 +262,7 @@ pushd %{_target_platform} pushd %{_target_platform} %make_install popd + # Themes cp -a IceClearlooks2-* %{buildroot}%{_datadir}/%{name}/themes/ cp -rfa icewm-fedora/themes %{buildroot}%{_datadir}/%{name}/ @@ -220,6 +271,7 @@ cp -a Windows7ice1 %{buildroot}%{_datadir}/%{name}/themes/ cp -a Araita+ %{buildroot}%{_datadir}/%{name}/themes/ cp -a Araita-Dark+ %{buildroot}%{_datadir}/%{name}/themes/ echo "Theme=\"IceClearlooks2-Magi/default.theme\"" > %{buildroot}%{_datadir}/%{name}/theme + # Font settings install -Dpm0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/fonts/local.conf install -Dpm0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/gtk-2.0/gtkrc @@ -229,6 +281,21 @@ install -Dpm0755 %{SOURCE30} %{buildroot}%{_datadir}/%{name}/startup install -Dpm0644 %{SOURCE40} %{buildroot}%{_datadir}/backgrounds/%{name}-wallpaper.png %find_lang %{name} +# Tweak default settings +sed -i 's!# TaskBarShowMailboxStatus=1 # 0/1!TaskBarShowMailboxStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences +sed -i 's!# TaskBarShowCPUStatus=1 # 0/1!TaskBarShowCPUStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences +sed -i 's!# TaskBarShowMEMStatus=1 # 0/1!TaskBarShowMEMStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences +sed -i 's!# TaskBarShowNetStatus=1 # 0/1!TaskBarShowNetStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences + +# 3rd-party configs +install -Dpm0644 %{SOURCE50} %{buildroot}%{_sysconfdir}/xdg/dunst/dunstrc +install -Dpm0644 %{SOURCE51} %{buildroot}%{_sysconfdir}/xdg/conky/conky.conf + + +# Better default conky config +%post 3rd-party-cfg +install -pm0644 %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conky.conf + %files -f %{name}.lang %license COPYING @@ -295,8 +362,15 @@ install -Dpm0644 %{SOURCE40} %{buildroot}%{_datadir}/backgrounds/%{name}-wall %{_sysconfdir}/gtk-2.0/gtkrc %{_sysconfdir}/gtk-3.0/settings.ini +%files 3rd-party-cfg +%{_sysconfdir}/xdg/dunst/dunstrc +%{_sysconfdir}/xdg/conky/conky.conf + %changelog +* Thu Oct 10 2019 Artem Polishchuk - 1.6.2-2 +- Fixes and new features + * Tue Sep 24 2019 Artem Polishchuk - 1.6.2-1 - Update to 1.6.2