This commit is contained in:
Leon Kowarschick 2020-06-05 15:23:19 +02:00
parent 8c9a0f4554
commit f778dac528
9 changed files with 164 additions and 18 deletions

View file

@ -1,4 +1,4 @@
{ {
"optOut": false, "optOut": false,
"lastUpdateCheck": 1591026213722 "lastUpdateCheck": 1591345578701
} }

View file

@ -3,16 +3,16 @@
fields=0 48 17 18 38 39 40 2 46 47 49 1 fields=0 48 17 18 38 39 40 2 46 47 49 1
sort_key=46 sort_key=46
sort_direction=1 sort_direction=1
hide_threads=0 hide_threads=1
hide_kernel_threads=1 hide_kernel_threads=1
hide_userland_threads=0 hide_userland_threads=1
shadow_other_users=0 shadow_other_users=0
show_thread_names=0 show_thread_names=0
show_program_path=1 show_program_path=1
highlight_base_name=0 highlight_base_name=0
highlight_megabytes=1 highlight_megabytes=1
highlight_threads=1 highlight_threads=1
tree_view=1 tree_view=0
header_margin=1 header_margin=1
detailed_cpu_time=0 detailed_cpu_time=0
cpu_count_from_zero=0 cpu_count_from_zero=0

View file

@ -4,6 +4,6 @@ mode=5
bgcolor=#000000 bgcolor=#000000
[xin_0] [xin_0]
file=/home/leon/Bilder/wallpapers/ipgK.png file=/home/leon/Bilder/wallpapers/abstract-barb-wires-blur-close-up-116021.jpg
mode=5 mode=5
bgcolor=#000000 bgcolor=#000000

View file

@ -1,8 +1,8 @@
[geometry] [geometry]
posx=20 posx=20
posy=1130 posy=50
sizex=2516 sizex=2516
sizey=1366 sizey=1006
[nitrogen] [nitrogen]
view=icon view=icon

View file

@ -41,12 +41,13 @@ import XMonad.Layout.Renamed (renamed, Rename(Replace))
import XMonad.Layout.ResizableTile import XMonad.Layout.ResizableTile
import XMonad.Layout.Simplest import XMonad.Layout.Simplest
import XMonad.Layout.Reflect import XMonad.Layout.Reflect
import XMonad.Layout.Spacing (spacingRaw, Border(..), toggleWindowSpacingEnabled) import XMonad.Layout.Spacing (spacingRaw, Border(..), toggleWindowSpacingEnabled, incScreenWindowSpacing, decScreenWindowSpacing)
import XMonad.Layout.SubLayouts import XMonad.Layout.SubLayouts
import XMonad.Layout.Tabbed import XMonad.Layout.Tabbed
import XMonad.Layout.WindowNavigation ( windowNavigation ) import XMonad.Layout.WindowNavigation ( windowNavigation )
import XMonad.Layout.ZoomRow import XMonad.Layout.ZoomRow
import XMonad.Layout.ThreeColumns import XMonad.Layout.ThreeColumns
import XMonad.Layout.ResizableThreeColumns
import XMonad.Layout.WindowSwitcherDecoration import XMonad.Layout.WindowSwitcherDecoration
import XMonad.Layout.DraggingVisualizer import XMonad.Layout.DraggingVisualizer
@ -56,6 +57,7 @@ import XMonad.Util.EZConfig ( additionalKeysP
, checkKeymap , checkKeymap
) )
import XMonad.Layout.LayoutModifier
import XMonad.Util.NamedScratchpad import XMonad.Util.NamedScratchpad
import XMonad.Util.Run import XMonad.Util.Run
import XMonad.Util.SpawnOnce (spawnOnce) import XMonad.Util.SpawnOnce (spawnOnce)
@ -89,7 +91,7 @@ import qualified XMonad.Layout.PerScreen as PerScreen
myModMask = mod4Mask myModMask = mod4Mask
myLauncher = Rofi.asCommand (def { Rofi.theme = Rofi.bigTheme }) ["-show run"] myLauncher = Rofi.asCommand (def { Rofi.theme = Rofi.bigTheme }) ["-show run"]
myTerminal = "alacritty" myTerminal = "termite --name törminell"
myBrowser = "qutebrowser" myBrowser = "qutebrowser"
useSharedWorkspaces = False useSharedWorkspaces = False
--myBrowser = "google-chrome-stable" --myBrowser = "google-chrome-stable"
@ -110,7 +112,8 @@ scratchpads =
where where
--launchWhatsapp = "gtk-launch chrome-hnpfjngllnobngcgfapefoaidbinmjnm-Default.desktop" --launchWhatsapp = "gtk-launch chrome-hnpfjngllnobngcgfapefoaidbinmjnm-Default.desktop"
launchWhatsapp = "google-chrome-stable --start-fullscreen -kiosk --app='https://web.whatsapp.com'" launchWhatsapp = "google-chrome-stable --start-fullscreen -kiosk --app='https://web.whatsapp.com'"
launchDiscord = "beautifuldiscord --css /home/leon/.config/beautifuldiscord/custom_discord.css" launchDiscord = "discord"
--launchDiscord = "beautifuldiscord --css /home/leon/.config/beautifuldiscord/custom_discord.css"
@ -174,7 +177,7 @@ myLayout = avoidStruts
((rename "Tall" $ onlySpacing $ mouseResizableTile {draggerType = dragger}) ((rename "Tall" $ onlySpacing $ mouseResizableTile {draggerType = dragger})
||| (rename "Horizon" $ onlySpacing $ mouseResizableTileMirrored {draggerType = dragger}) ||| (rename "Horizon" $ onlySpacing $ mouseResizableTileMirrored {draggerType = dragger})
||| (rename "BSP" $ spacingAndGaps $ borderResize $ emptyBSP) ||| (rename "BSP" $ spacingAndGaps $ borderResize $ emptyBSP)
||| (rename "ThreeCol" $ makeTabbed $ spacingAndGaps $ reflectHoriz $ ThreeColMid 1 (3/100) (1/2)) ||| (rename "ThreeCol" $ makeTabbed $ spacingAndGaps $ reflectHoriz $ ResizableThreeColMid 1 (3/100) (1/2) [])
||| (rename "TabbedRow" $ makeTabbed $ spacingAndGaps $ zoomRow)) ||| (rename "TabbedRow" $ makeTabbed $ spacingAndGaps $ zoomRow))
vertScreenLayouts = vertScreenLayouts =
@ -193,7 +196,6 @@ myLayout = avoidStruts
-- | transform a layout into supporting tabs -- | transform a layout into supporting tabs
makeTabbed layout = BoringWindows.boringWindows . windowNavigation . addTabs shrinkText myTabTheme $ subLayout [] Simplest $ layout makeTabbed layout = BoringWindows.boringWindows . windowNavigation . addTabs shrinkText myTabTheme $ subLayout [] Simplest $ layout
-- | window decoration layout modifier. this needs you to add `dragginVisualizer` yourself -- | window decoration layout modifier. this needs you to add `dragginVisualizer` yourself
data WINDOWDECORATION = WINDOWDECORATION deriving (Read, Show, Eq, Typeable) data WINDOWDECORATION = WINDOWDECORATION deriving (Read, Show, Eq, Typeable)
instance MTog.Transformer WINDOWDECORATION Window where instance MTog.Transformer WINDOWDECORATION Window where
@ -208,7 +210,6 @@ instance MTog.Transformer WINDOWDECORATION Window where
myStartupHook :: X () myStartupHook :: X ()
myStartupHook = do myStartupHook = do
setWMName "LG3D" -- Java stuff hack setWMName "LG3D" -- Java stuff hack
--spawnOnce "pasystray" -- just open the UI by right-clicking on polybar's pulseaudio module
spawnOnce "nm-applet &" spawnOnce "nm-applet &"
spawnOnce "udiskie -s &" -- Mount USB sticks automatically. -s is smart systray mode: systray icon if something is mounted spawnOnce "udiskie -s &" -- Mount USB sticks automatically. -s is smart systray mode: systray icon if something is mounted
spawnOnce "xfce4-clipman &" spawnOnce "xfce4-clipman &"
@ -245,6 +246,7 @@ removedKeys :: [String]
removedKeys = ["M-<Tab>", "M-S-c", "M-S-q", "M-h", "M-l", "M-j", "M-k", "M-S-<Return>"] removedKeys = ["M-<Tab>", "M-S-c", "M-S-q", "M-h", "M-l", "M-j", "M-k", "M-S-<Return>"]
++ if useSharedWorkspaces then [] else [key ++ show n | key <- ["M-", "M-S-", "M-C-"], n <- [1..9 :: Int]] ++ if useSharedWorkspaces then [] else [key ++ show n | key <- ["M-", "M-S-", "M-C-"], n <- [1..9 :: Int]]
myKeys :: [(String, X ())] myKeys :: [(String, X ())]
myKeys = concat [ zoomRowBindings, tabbedBindings, multiMonitorBindings, programLaunchBindings, miscBindings, windowControlBindings, workspaceBindings ] myKeys = concat [ zoomRowBindings, tabbedBindings, multiMonitorBindings, programLaunchBindings, miscBindings, windowControlBindings, workspaceBindings ]
where where
@ -324,6 +326,8 @@ myKeys = concat [ zoomRowBindings, tabbedBindings, multiMonitorBindings, program
, ("<XF86AudioLowerVolume>", spawn "amixer sset Master 5%-") , ("<XF86AudioLowerVolume>", spawn "amixer sset Master 5%-")
, ("M-S-C-,", (notify "hi" (show $ map (\(a, _) -> show a) workspaceBindings)) >> (notify "ho" (show removedKeys))) , ("M-S-C-,", (notify "hi" (show $ map (\(a, _) -> show a) workspaceBindings)) >> (notify "ho" (show removedKeys)))
, ("M-<Delete>", spawn "flash_window") , ("M-<Delete>", spawn "flash_window")
, ("M-g", incScreenWindowSpacing 5)
, ("M-S-g", decScreenWindowSpacing 5)
] ]
workspaceBindings :: [(String, X ())] workspaceBindings :: [(String, X ())]

View file

@ -3,7 +3,7 @@ resolver: lts-15.3
packages: packages:
- . - .
#- xmonad-contrib - xmonad-contrib
extra-deps: extra-deps:
- iwlib-0.1.0 - iwlib-0.1.0

View file

@ -0,0 +1,132 @@
#!/bin/sh
print_host()
{
[ -z "$HOST" ] && cat /etc/hostname || printf "$HOST\n"
}
print_kernel()
{
kernel=$(uname -r)
kernel="${kernel%%_*}"
kernel="${kernel%%-*}"
printf "$kernel\n"
}
print_pkgs()
{
C() { command -v "$@" >/dev/null 2>&1 ; }
if [ -d /bedrock ] ; then
pkgs="N/A"
elif C dpkg ; then
pkgs="$(printf $(dpkg-query -f '${binary:Package}\n' -W | wc -l))"
elif C rpm ; then
pkgs="$(rpm -qa | wc -l)"
elif C pacman ; then
pkgs="$(pacman -Qq | wc -l)"
elif C xbps-query ; then
pkgs="$(xbps-query -l | wc -l)"
elif C kiss l ; then
pkgs="$(kiss l | wc -l)"
elif C yum ; then
pkgs="$(yum list installed | wc -l)"
elif C bonsai ; then
pkgs="$(bonsai list | wc -l)"
elif C guix ; then
pkgs="$(guix package --list-installed | wc -l)"
elif C pkg ; then
pkgs="$(pkg info -a | wc -l | tr -d ' ')"
else
pkgs="N/A"
fi
printf "$pkgs\n"
}
print_shell()
{
shell="${SHELL##*/}"
printf "$shell\n"
}
print_os()
{
if [ -e /etc/os-release ] && . /etc/os-release ; then
printf "$PRETTY_NAME\n"
elif [ -d /bedrock ] ; then
cat /bedrock/etc/bedrock-release
else
uname -s || printf "N/A\n"
fi
}
print_wal()
{
wal=$(xrdb -q | grep wallpaper | awk 'NR == 2 {print $2}')
printf "$wal\n"
}
print_colors()
{
colors="$(xrdb -q | grep "#include" | awk '{print $2}')"
colors="${colors##*/}"
colors=${colors%\"}
printf "$colors\n"
}
print_user()
{
if [ -z "$LOGNAME" ]; then
printf "N/A\n"
else
printf "$LOGNAME\n"
fi
}
print_resolution()
{
printf "\n"
}
set_colors()
{
r="\033[32m"
re="\033[0m"
gb="\033[42m"
bl="\e[7m \e[0m"
gb="$g$bl"
gbs="$gb$gb$gb$gb$gb$gb"
}
print_colors()
{
printf "\n"
printf " \e[41m \e[42m \e[43m \e[44m \e[45m \e[46m \e[0m\n"
printf "\n"
}
print_wm()
{
if command -v xprop >/dev/null 2>&1 ; then
WM=$(xprop -id $(xprop -root -notype | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}') -notype -f _NET_WM_NAME 8t | grep "WM_NAME" | cut -f2 -d \")
else
WM="TTY"
fi
printf "$WM\n"
}
set_colors
printf "\n"
printf " $r┌────────────────────────────────────┐$re\n"
printf " $r│ KER:$re %-30s$r$re\n" "$(print_kernel)"
printf " $r│ PKG:$re %-30s$r$re\n" "$(print_pkgs)"
printf " $r│ SHE:$re %-30s$r$re\n" "$(print_shell)"
printf " $r│ DIS:$re %-30s$r$re\n" "$(print_os)"
printf " $r│ SES:$re %-30s$r$re\n" "$(print_wm)"
printf " $r│ HOS:$re %-30s$r$re\n" "$(print_host)"
printf " $r│ USE:$re %-30s$r$re\n" "$(whoami)"
printf " $r└────────────────────────────────────┘$re\n"
printf "\n"

View file

@ -16,18 +16,28 @@ def run_fan_check():
if len(tdie_temp) > 0: if len(tdie_temp) > 0:
temp = tdie_temp[0] temp = tdie_temp[0]
temp = float(re.findall(r"^Tdie:\s*\+(.*?)°C.+", temp)[0]) temp = float(re.findall(r"^Tdie:\s*\+(.*?)°C.+", temp)[0])
# if temp < 50:
# fan_speed = 20
# if temp < 60:
# fan_speed = 30
# elif temp < 70:
# fan_speed = 40
# elif temp < 80:
# fan_speed = 60
# else:
# fan_speed = 100
if temp < 50: if temp < 50:
fan_speed = 20 fan_speed = 50
if temp < 60: if temp < 60:
fan_speed = 30 fan_speed = 50
elif temp < 70: elif temp < 70:
fan_speed = 40 fan_speed = 50
elif temp < 80: elif temp < 80:
fan_speed = 60 fan_speed = 60
else: else:
fan_speed = 100 fan_speed = 100
print("applying fan curve to " + str(fan_speed) + "%, temp is " + str(temp)) print("setting fan speed to " + str(fan_speed) + "%, temp is " + str(temp))
for fan in fans: for fan in fans:
subprocess.run(["liquidctl", "set", fan, "speed", str(fan_speed)]) subprocess.run(["liquidctl", "set", fan, "speed", str(fan_speed)])