commit 82c3b5df8d55d2a59a42853a1bb4203bf0648bf8
parent 5dc56e87b63fa49aaa24a15ad7b3a46161528d5a
Author: jacobsGit <JacobDoesLinux@protonmail.com>
Date: Wed, 1 Jan 2020 11:50:14 -0800
fixing my mistakes
Diffstat:
7 files changed, 69 insertions(+), 165 deletions(-)
diff --git a/mpd/.config/mpd/mpd.conf b/mpd/.config/mpd/mpd.conf
@@ -10,7 +10,7 @@
# be disabled and audio files will only be accepted over ipc socket (using
# file:// protocol) or streaming files over an accepted protocol.
#
-music_directory "/home/jacob/media/audio/Music"
+music_directory "/home/jacob/media/audio/music"
#
# This setting sets the MPD internal playlist directory. The purpose of this
# directory is storage for playlists created by MPD. The server will use
@@ -59,7 +59,6 @@ sticker_file "~/.mpd/sticker.sql"
audio_output {
type "pulse"
name "pulse audio"
-# server "10.0.1.37"
}
audio_output {
@@ -88,7 +87,7 @@ user "jacob"
# This is useful if MPD needs to be a member of group such as "audio" to
# have permission to use sound card.
#
-group "jacob-arco"
+group "jacob"
#
# This setting sets the address for the daemon to listen on. Careful attention
# should be paid if this is assigned to anything other then the default, any.
diff --git a/ncmpcpp/.ncmpcpp/config b/ncmpcpp/.ncmpcpp/config
@@ -177,17 +177,16 @@ visualizer_color = blue, cyan, green, yellow, magenta, red
#
#alternative_header_second_line_format = {{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D}
#
-#current_item_prefix = $(yellow)$r
+current_item_prefix = $(cyan)$r
#
-#current_item_suffix = $/r$(end)
+current_item_suffix = $/r$(end)
#
-#current_item_inactive_column_prefix = $(white)$r
+current_item_inactive_column_prefix = $(blue)$r
#
#current_item_inactive_column_suffix = $/r$(end)
#
-#now_playing_prefix = $b
-#
-#now_playing_suffix = $/b
+now_playing_prefix = $b
+now_playing_suffix = $/b
#
#browser_playlist_prefix = "$2playlist$9 "
#
@@ -278,15 +277,12 @@ playlist_show_mpd_host = no
##
## Note: Possible display modes: classic, columns.
##
-#playlist_display_mode = columns
-#
-#browser_display_mode = classic
-#
-#search_engine_display_mode = classic
-#
-#playlist_editor_display_mode = classic
-#
-#discard_colors_if_item_is_selected = yes
+playlist_display_mode = columns
+browser_display_mode = classic
+search_engine_display_mode = classic
+playlist_editor_display_mode = classic
+
+discard_colors_if_item_is_selected = yes
#
#show_duplicate_tags = yes
#
@@ -294,7 +290,7 @@ playlist_show_mpd_host = no
#
#seek_time = 1
#
-#volume_change_step = 2
+#volume_change_step = 5
#
#autocenter_mode = no
#
@@ -363,7 +359,7 @@ media_library_primary_tag = artist
#
#space_add_mode = add_remove
#
-#show_hidden_files_in_local_browser = no
+show_hidden_files_in_local_browser = yes
#
##
## How shall screen switcher work?
@@ -398,12 +394,12 @@ media_library_primary_tag = artist
#
#ask_for_locked_screen_width_part = yes
#
-#jump_to_now_playing_song_at_start = yes
+jump_to_now_playing_song_at_start = yes
#
-#ask_before_clearing_playlists = yes
+ask_before_clearing_playlists = yes
#
clock_display_seconds = no
-display_volume_level = no
+display_volume_level = yes
display_bitrate = yes
display_remaining_time = no
#
@@ -435,7 +431,7 @@ tags_separator = " | "
#
#tag_editor_extended_numeration = no
#
-#media_library_sort_by_mtime = no
+media_library_sort_by_mtime = no
#
#enable_window_title = yes
#
@@ -455,11 +451,11 @@ tags_separator = " | "
#
#search_engine_default_search_mode = 1
#
-#external_editor = nano
+external_editor = vim
#
## Note: set to yes if external editor is a console application.
##
-#use_console_editor = yes
+use_console_editor = yes
#
##### colors definitions #####
##
@@ -491,35 +487,33 @@ tags_separator = " | "
## are used there is a possibility that you'll be able to use only colors with
## transparent background.
#
-#colors_enabled = yes
+colors_enabled = yes
#
-#empty_tag_color = cyan
+empty_tag_color = cyan
#
-#header_window_color = default
+header_window_color = white
#
volume_color = default
#
-#state_line_color = default
+state_line_color = default
#
-#state_flags_color = default:b
+state_flags_color = default
#
-#main_window_color = yellow
+main_window_color = 247
#
-#color1 = white
+color1 = white
#
-#color2 = green
+color2 = green
#
-progressbar_color = black:b
-progressbar_elapsed_color = green
+progressbar_color = red
+progressbar_elapsed_color = blue
#
statusbar_color = default
#
statusbar_time_color = white
+player_state_color = white
#
-player_state_color = default:b
-#
-alternative_ui_separator_color = black:b
+alternative_ui_separator_color = black
#
window_border_color = green
active_window_border = red
-
diff --git a/xmonad/.xmonad/xmo b/xmonad/.xmonad/xmo
@@ -1,96 +0,0 @@
-import XMonad
-import XMonad.Hooks.DynamicLog
-import XMonad.Hooks.ManageDocks
-import XMonad.Hooks.EwmhDesktops
-import XMonad.Hooks.ManageHelpers
-import XMonad.Layout.NoBorders
-import XMonad.Layout.Fullscreen
-import XMonad.Layout.Spacing
-import XMonad.Layout.Gaps
-
-import qualified Data.Map as M
-import qualified XMonad.StackSet as S
-------------------------------------------
-myConfig = defaultConfig
-myModMask = mod1Mask
-
-
-myBorderWidth = 1
-myNormalBorderColor = "#000000"
-myFocusedBorderColor = "#111195"
-
-
-myWorkspaces :: [WorkspaceId]
-myWorkspaces = ["1:chat", "2:web", "3:code", "4:pdf", "5:doc", "6:vbox" ,"7:games", "8:vid", "9:gimp" ]
-
-
-myBar = "xmobar"
-myPP = xmobarPP { ppCurrent = xmobarColor "#000000" "#dddddd" . wrap " " " "
--- , ppSep = "<fc=#00336a> | </fc>" --0033FF (nice blue)
--- , ppHiddenNoWindows = xmobarColor "#220000" ""
- , ppHidden = xmobarColor "#0caca0" ""
- , ppWsSep = " "
- , ppSep = ""
- , ppTitle = xmobarColor "#000000" "" . shorten 0
- , ppLayout = xmobarColor "#000000" ""}
-
-
-
-
-myLayoutHook = avoidStruts (
- gaps [(L,0), (R,0), (U,0), (D,0)] $ spacing 0 $ Tall 1 (3/100) (1/2) |||
- noBorders (fullscreenFull Full))
-
-
-
-myKeys conf = M.fromList $
- -- xmonad specific keybindings --
- [ ((myModMask .|. shiftMask , xK_q ), kill)
- , ((myModMask .|. shiftMask , xK_space ), setLayout $ XMonad.layoutHook conf)
- , ((myModMask , xK_space ), sendMessage NextLayout)
- , ((myModMask , xK_m ), windows S.focusMaster)
- , ((myModMask , xK_Return ), windows S.swapMaster)
- , ((myModMask , xK_Tab ), windows S.focusDown)
- , ((myModMask , xK_j ), windows S.focusDown)
- , ((myModMask .|. shiftMask , xK_Tab ), windows S.focusUp)
- , ((myModMask , xK_k ), windows S.focusUp)
- , ((myModMask .|. shiftMask , xK_h ), windows S.swapDown)
- , ((myModMask .|. shiftMask , xK_l ), windows S.swapUp)
- , ((myModMask , xK_j ), sendMessage Shrink)
- , ((myModMask , xK_k ), sendMessage Expand)
- , ((myModMask , xK_n ), refresh)
- , ((myModMask , xK_t ), withFocused $ windows . S.sink)
- , ((myModMask , xK_comma ), sendMessage (IncMasterN 1))
- , ((myModMask , xK_period ), sendMessage (IncMasterN (-1)))
- , ((myModMask , xK_z ), restart "xmonad" True)
- -- gaps --
- , ((myModMask .|. controlMask, xK_minus), (incWindowSpacing 8) >> (sendMessage $ IncGap 45 R) >> (sendMessage $ IncGap 45 L))
- , ((myModMask .|. controlMask, xK_equal), (decWindowSpacing 8) >> (sendMessage $ DecGap 45 R) >> (sendMessage $ DecGap 45 L))
- , ((myModMask .|. controlMask, xK_0), (sendMessage $ ToggleGaps) >> (toggleWindowSpacingEnabled))
- -- left/right --
- , ((myModMask .|. controlMask, xK_bracketleft), (sendMessage $ IncGap 150 R) >> (sendMessage $ DecGap 150 L))
- , ((myModMask .|. controlMask, xK_bracketright), (sendMessage $ DecGap 150 R) >> (sendMessage $ IncGap 150 L))
- , ((myModMask .|. controlMask, xK_bracketright), (sendMessage $ DecGap 150 R) >> (sendMessage $ IncGap 150 L))
- -- reset --
- , ((myModMask .|. controlMask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
- ]++
- -- workspaces --
- [((myModMask , k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]]++
- [((mod4Mask , k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]
- ]
-
-
-main = xmonad =<< statusBar myBar myPP toggleStrutsKey myConfig
- { modMask = myModMask
- , keys = myKeys
- , borderWidth = myBorderWidth
- , normalBorderColor = myNormalBorderColor
- , focusedBorderColor = myFocusedBorderColor
- , layoutHook = myLayoutHook
- , manageHook = myManageHook
- , handleEventHook = docksEventHook }
-
-
-
-myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
-toggleStrutsKey XConfig {XMonad.modMask = modMask} = (modMask, xK_b)
diff --git a/xmonad/.xmonad/xmonad-x86_64-linux b/xmonad/.xmonad/xmonad-x86_64-linux
Binary files differ.
diff --git a/xmonad/.xmonad/xmonad.errors b/xmonad/.xmonad/xmonad.errors
@@ -7,40 +7,40 @@ xmonad.hs:14:12: warning: [-Wdeprecations]
14 | myConfig = defaultConfig
| ^^^^^^^^^^^^^
-xmonad.hs:42:46: warning: [-Wdeprecations]
+xmonad.hs:42:42: warning: [-Wdeprecations]
In the use of `spacing' (imported from XMonad.Layout.Spacing):
Deprecated: "Use spacingRaw instead."
|
-42 | gaps [(L,25), (R,25), (U,25), (D,25)] $ spacing 0 $ Tall 1 (3/100) (1/2) |||
- | ^^^^^^^
+42 | gaps [(L,0), (R,0), (U,0), (D,0)] $ spacing 2 $ Tall 1 (3/100) (1/2) |||
+ | ^^^^^^^
-xmonad.hs:61:1: warning: [-Wtabs]
+xmonad.hs:68:1: warning: [-Wtabs]
Tab character found here.
Please use spaces instead.
|
-61 | , ((controlMask, xK_equal), (decWindowSpacing 8))
+68 | , ((controlMask, xK_equal), (decWindowSpacing 8))
| ^^^^^^^^
-xmonad.hs:76:85: warning: [-Wdeprecations]
+xmonad.hs:83:86: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
-76 | [((mod1Mask, k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, xK_o, xK_p ]]++
- | ^^^^^^^^^^^^^
+83 | [((myModMask, k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, xK_o, xK_p ]]++
+ | ^^^^^^^^^^^^^
-xmonad.hs:77:129: warning: [-Wdeprecations]
+xmonad.hs:84:116: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
-77 | [((mod1Mask .|. shiftMask, k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, xK_o, xK_p ]
- | ^^^^^^^^^^^^^
+84 | [((mod4Mask, k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, xK_o, xK_p ]
+ | ^^^^^^^^^^^^^
-xmonad.hs:93:78: warning: [-Wdeprecations]
+xmonad.hs:100:78: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
- |
-93 | myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
- | ^^^^^^^^^^^^^
+ |
+100 | myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
+ | ^^^^^^^^^^^^^
diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
@@ -12,7 +12,7 @@ import qualified Data.Map as M
import qualified XMonad.StackSet as S
------------------------------------------
myConfig = defaultConfig
-myModMask = mod4Mask
+myModMask = mod1Mask
myBorderWidth = 2
@@ -39,23 +39,30 @@ myPP = xmobarPP { ppCurrent = xmobarColor "#ffffff" "#001234" . wrap " " " "
myLayoutHook = avoidStruts (
- gaps [(L,25), (R,25), (U,25), (D,25)] $ spacing 0 $ Tall 1 (3/100) (1/2) |||
+ gaps [(L,0), (R,0), (U,0), (D,0)] $ spacing 2 $ Tall 1 (3/100) (1/2) |||
noBorders (fullscreenFull Full))
myKeys conf = M.fromList $
-- xmonad specific keybindings --
- [ ((mod1Mask, xK_space ), sendMessage NextLayout)
- , ((mod1Mask, xK_Return ), windows S.swapMaster)
- , ((mod1Mask, xK_n ), sendMessage Shrink)
- , ((mod1Mask, xK_m ), sendMessage Expand)
- , ((myModMask, xK_z ), restart "xmonad" True)
- , ((myModMask, xK_t ), withFocused $ windows . S.sink)
- , ((myModMask, xK_comma ), sendMessage (IncMasterN 1))
- , ((myModMask, xK_period ), sendMessage (IncMasterN (-1)))
- , ((mod1Mask, xK_Tab ), windows S.focusDown)
- , ((mod1Mask .|. shiftMask, xK_Tab), windows S.focusUp)
+ [ ((myModMask .|. shiftMask , xK_space ), setLayout $ XMonad.layoutHook conf)
+ , ((myModMask .|. shiftMask , xK_q ), kill)
+ , ((myModMask , xK_space ), sendMessage NextLayout)
+ --, ((myModMask , xK_m ), windows S.focusMaster)
+ , ((myModMask , xK_Return ), windows S.swapMaster)
+ , ((myModMask , xK_Tab ), windows S.focusDown)
+ --, ((myModMask , xK_k ), windows S.focusDown)
+ , ((myModMask .|. shiftMask , xK_Tab ), windows S.focusUp)
+ -- , ((myModMask , xK_n ), windows S.focusUp)
+ --, ((myModMask .|. shiftMask , xK_h ), windows S.swapDown)
+ --, ((myModMask .|. shiftMask , xK_l ), windows S.swapUp)
+ , ((myModMask , xK_n ), sendMessage Shrink)
+ , ((myModMask , xK_m ), sendMessage Expand)
+ --, ((myModMask , xK_n ), refresh)
+ , ((myModMask , xK_t ), withFocused $ windows . S.sink)
+ , ((myModMask , xK_comma ), sendMessage (IncMasterN 1))
+ , ((myModMask , xK_period ), sendMessage (IncMasterN (-1))) , ((myModMask , xK_z ), restart "xmonad" True)
-- gaps --
, ((controlMask, xK_minus), (incWindowSpacing 8))
, ((controlMask, xK_equal), (decWindowSpacing 8))
@@ -73,8 +80,8 @@ myKeys conf = M.fromList $
, ((controlMask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
]++
-- workspaces --
- [((mod1Mask, k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, xK_o, xK_p ]]++
- [((mod1Mask .|. shiftMask, k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, xK_o, xK_p ]
+ [((myModMask, k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, xK_o, xK_p ]]++
+ [((mod4Mask, k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, xK_o, xK_p ]
]
diff --git a/xmonad/.xmonad/xmonad.o b/xmonad/.xmonad/xmonad.o
Binary files differ.
