diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json index e8f0f69..aeb7f4e 100644 --- a/files/.config/configstore/update-notifier-npm.json +++ b/files/.config/configstore/update-notifier-npm.json @@ -1,4 +1,4 @@ { "optOut": false, - "lastUpdateCheck": 1584733774631 + "lastUpdateCheck": 1584909489032 } \ No newline at end of file diff --git a/files/.config/kitty/kitty.conf b/files/.config/kitty/kitty.conf index ba55a0b..dd8115b 100644 --- a/files/.config/kitty/kitty.conf +++ b/files/.config/kitty/kitty.conf @@ -1,11 +1,14 @@ include ./theme.conf +# font_family VictorMono Nerd Font Semibold +# font_family DejaVuSansMono Nerd +# font_family Iosevka Nerd Font +font_family JetbrainsMono Nerd Font -font_family Iosevka bold_font auto italic_font auto bold_italic_font auto #font_family monospace -font_size 14 +font_size 12 enable_audio_bell no @@ -22,3 +25,4 @@ map ctrl+shift+up neighboring_window up clipboard_control write-clipboard write-primary read-primary read-clipboard dynamic_background_opacity yes +allow_remote_control yes diff --git a/files/.config/termite/config b/files/.config/termite/config index 07bd542..3d7f69c 100644 --- a/files/.config/termite/config +++ b/files/.config/termite/config @@ -1,5 +1,7 @@ [options] font = Iosevka Medium 14 +;font = Victor mono 13 +# font = jetbrains mono 13 # font = monospace 13 [colors] diff --git a/files/.xmonad/.stack-work/stack.sqlite3 b/files/.xmonad/.stack-work/stack.sqlite3 index 0cc0f00..197dc54 100644 Binary files a/files/.xmonad/.stack-work/stack.sqlite3 and b/files/.xmonad/.stack-work/stack.sqlite3 differ diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs index 1a8771e..1e39747 100644 --- a/files/.xmonad/lib/Config.hs +++ b/files/.xmonad/lib/Config.hs @@ -4,7 +4,7 @@ module Config (main) where import qualified Data.Map as M -import Data.List (isSuffixOf) +import Data.List (isSuffixOf, isPrefixOf) import qualified Data.Maybe as Maybe import Data.Char (isDigit) import System.Exit (exitWith, ExitCode(ExitSuccess)) @@ -46,8 +46,7 @@ import XMonad.Util.SpawnOnce (spawnOnce) myModMask = mod4Mask myLauncher = "rofi -show run" -myTerminal = "termite" ---myTerminal = "kitty --single-instance" +myTerminal = "kitty --single-instance" myBrowser = "google-chrome-stable" --yBar = "xmobar" --myXmobarPP= xmobarPP { ppCurrent = xmobarColor "#429942" "" . wrap "<" ">" } @@ -59,6 +58,7 @@ scratchpads = , NS "ghci" (myTerminal ++ " -e \"stack exec -- ghci\" --class scratchpad_ghci") (className =? "scratchpad_ghci") (customFloating $ W.RationalRect 0 0.7 1 0.3) , NS "whatsapp" ("gtk-launch chrome-hnpfjngllnobngcgfapefoaidbinmjnm-Default.desktop") (("WhatsApp" `isSuffixOf`) <$> title) defaultFloating + , NS "slack" ("slack") (("Slack | " `isPrefixOf`) <$> title) defaultFloating ] {-| adds the scripts-directory path to the filename of a script |-} @@ -96,7 +96,7 @@ myLayout = smartBorders $ toggleLayouts Full $ withSpacing $ layoutHints -- mouseResizableTile ||| Mirror mouseResizableTile where -- add spacing between windows - withSpacing = spacingRaw True (Border 10 10 10 10) True (Border 10 10 10 10) True + withSpacing = spacingRaw True (Border 10 10 10 10) True (Border 7 7 7 7) True --withGaps = gaps' [((L, 10), True),((U, 10), True), ((D, 10), True), ((R, 10), True )] -- }}} @@ -135,11 +135,12 @@ myKeys = [ ("M-C-k", sendMessage MirrorExpand) -- programs , ("M-p", spawn myLauncher) - , ("M-S-p", spawn "rofi -combi-modi drun,window -show combi") + , ("M-S-p", spawn "rofi -combi-modi drun,window,ssh -show combi") , ("M-S-e", spawn "rofi -show emoji -modi emoji") , ("M-b", spawn myBrowser) , ("M-s", spawn $ scriptFile "rofi-search.sh") - , ("M-n", spawn "echo 'n: terminal, h: ghci, w: WhatsApp' | dzen2 -p 1" >> scratchpadSubmap) + , ("M-S-s", spawn $ "cat " ++ scriptFile "bookmarks" ++ " | rofi -p open -dmenu | bash") + , ("M-n", spawn "echo 'n: terminal, h: ghci, w: WhatsApp, s: slack' | dzen2 -p 1" >> scratchpadSubmap) , ("M-e", promptExecute specialCommands) ] ++ copyToWorkspaceMappings @@ -158,7 +159,8 @@ myKeys = [ ("M-C-k", sendMessage MirrorExpand) scratchpadSubmap = submap $ M.fromList [ ((myModMask, xK_n), namedScratchpadAction scratchpads "terminal") , ((myModMask, xK_h), namedScratchpadAction scratchpads "ghci") - , ((myModMask, xK_w), namedScratchpadAction scratchpads "whatsapp") ] + , ((myModMask, xK_w), namedScratchpadAction scratchpads "whatsapp") + , ((myModMask, xK_s), namedScratchpadAction scratchpads "slack") ] specialCommands :: [(String, X ())] diff --git a/files/.xmonad/xmonad-x86_64-linux b/files/.xmonad/xmonad-x86_64-linux index 0d43dfb..6793957 100755 Binary files a/files/.xmonad/xmonad-x86_64-linux and b/files/.xmonad/xmonad-x86_64-linux differ diff --git a/files/scripts/bookmarkr/.gitignore b/files/scripts/bookmarkr/.gitignore new file mode 100644 index 0000000..c368d45 --- /dev/null +++ b/files/scripts/bookmarkr/.gitignore @@ -0,0 +1,2 @@ +.stack-work/ +*~ \ No newline at end of file diff --git a/files/scripts/bookmarkr/ChangeLog.md b/files/scripts/bookmarkr/ChangeLog.md new file mode 100644 index 0000000..4b4c4ee --- /dev/null +++ b/files/scripts/bookmarkr/ChangeLog.md @@ -0,0 +1,3 @@ +# Changelog for bookmarkr + +## Unreleased changes diff --git a/files/scripts/bookmarkr/LICENSE b/files/scripts/bookmarkr/LICENSE new file mode 100644 index 0000000..e637cde --- /dev/null +++ b/files/scripts/bookmarkr/LICENSE @@ -0,0 +1,30 @@ +Copyright Author name here (c) 2020 + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Author name here nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/files/scripts/bookmarkr/README.md b/files/scripts/bookmarkr/README.md new file mode 100644 index 0000000..741a2ef --- /dev/null +++ b/files/scripts/bookmarkr/README.md @@ -0,0 +1 @@ +# bookmarkr diff --git a/files/scripts/bookmarkr/Setup.hs b/files/scripts/bookmarkr/Setup.hs new file mode 100644 index 0000000..9a994af --- /dev/null +++ b/files/scripts/bookmarkr/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/files/scripts/bookmarkr/app/Main.hs b/files/scripts/bookmarkr/app/Main.hs new file mode 100644 index 0000000..de1c1ab --- /dev/null +++ b/files/scripts/bookmarkr/app/Main.hs @@ -0,0 +1,6 @@ +module Main where + +import Lib + +main :: IO () +main = someFunc diff --git a/files/scripts/bookmarkr/bookmarkr.cabal b/files/scripts/bookmarkr/bookmarkr.cabal new file mode 100644 index 0000000..6514381 --- /dev/null +++ b/files/scripts/bookmarkr/bookmarkr.cabal @@ -0,0 +1,62 @@ +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.31.2. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: 9bf57b99774591f4bea513e9e9dc9e0107d10cfffd15426effb823a9f4cf9f2c + +name: bookmarkr +version: 0.1.0.0 +description: Please see the README on GitHub at +homepage: https://github.com/githubuser/bookmarkr#readme +bug-reports: https://github.com/githubuser/bookmarkr/issues +author: Author name here +maintainer: example@example.com +copyright: 2020 Author name here +license: BSD3 +license-file: LICENSE +build-type: Simple +extra-source-files: + README.md + ChangeLog.md + +source-repository head + type: git + location: https://github.com/githubuser/bookmarkr + +library + exposed-modules: + Lib + other-modules: + Paths_bookmarkr + hs-source-dirs: + src + build-depends: + base >=4.7 && <5 + default-language: Haskell2010 + +executable bookmarkr-exe + main-is: Main.hs + other-modules: + Paths_bookmarkr + hs-source-dirs: + app + ghc-options: -threaded -rtsopts -with-rtsopts=-N + build-depends: + base >=4.7 && <5 + , bookmarkr + default-language: Haskell2010 + +test-suite bookmarkr-test + type: exitcode-stdio-1.0 + main-is: Spec.hs + other-modules: + Paths_bookmarkr + hs-source-dirs: + test + ghc-options: -threaded -rtsopts -with-rtsopts=-N + build-depends: + base >=4.7 && <5 + , bookmarkr + default-language: Haskell2010 diff --git a/files/scripts/bookmarkr/package.yaml b/files/scripts/bookmarkr/package.yaml new file mode 100644 index 0000000..f069fdd --- /dev/null +++ b/files/scripts/bookmarkr/package.yaml @@ -0,0 +1,48 @@ +name: bookmarkr +version: 0.1.0.0 +github: "githubuser/bookmarkr" +license: BSD3 +author: "Author name here" +maintainer: "example@example.com" +copyright: "2020 Author name here" + +extra-source-files: +- README.md +- ChangeLog.md + +# Metadata used when publishing your package +# synopsis: Short description of your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 + +library: + source-dirs: src + +executables: + bookmarkr-exe: + main: Main.hs + source-dirs: app + ghc-options: + - -threaded + - -rtsopts + - -with-rtsopts=-N + dependencies: + - bookmarkr + +tests: + bookmarkr-test: + main: Spec.hs + source-dirs: test + ghc-options: + - -threaded + - -rtsopts + - -with-rtsopts=-N + dependencies: + - bookmarkr diff --git a/files/scripts/bookmarkr/src/Lib.hs b/files/scripts/bookmarkr/src/Lib.hs new file mode 100644 index 0000000..d36ff27 --- /dev/null +++ b/files/scripts/bookmarkr/src/Lib.hs @@ -0,0 +1,6 @@ +module Lib + ( someFunc + ) where + +someFunc :: IO () +someFunc = putStrLn "someFunc" diff --git a/files/scripts/bookmarkr/stack.yaml b/files/scripts/bookmarkr/stack.yaml new file mode 100644 index 0000000..c4f0209 --- /dev/null +++ b/files/scripts/bookmarkr/stack.yaml @@ -0,0 +1,66 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# https://docs.haskellstack.org/en/stable/yaml_configuration/ + +# Resolver to choose a 'specific' stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# resolver: lts-3.5 +# resolver: nightly-2015-09-21 +# resolver: ghc-7.10.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: lts-15.3 + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# subdirs: +# - auto-update +# - wai +packages: +- . +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +# extra-deps: [] + +# Override default flag values for local packages and extra-deps +# flags: {} + +# Extra package databases containing global packages +# extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=2.1" +# +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor diff --git a/files/scripts/bookmarkr/stack.yaml.lock b/files/scripts/bookmarkr/stack.yaml.lock new file mode 100644 index 0000000..eeb93a9 --- /dev/null +++ b/files/scripts/bookmarkr/stack.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + size: 491373 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/3.yaml + sha256: 29e9ff61b8bf4b4fcff55cde3ac106ebb971f0d21331dccac9eee63374fa6ca8 + original: lts-15.3 diff --git a/files/scripts/bookmarkr/test/Spec.hs b/files/scripts/bookmarkr/test/Spec.hs new file mode 100644 index 0000000..cd4753f --- /dev/null +++ b/files/scripts/bookmarkr/test/Spec.hs @@ -0,0 +1,2 @@ +main :: IO () +main = putStrLn "Test suite not yet implemented" diff --git a/files/scripts/bookmarks b/files/scripts/bookmarks index 3465742..3493c69 100644 --- a/files/scripts/bookmarks +++ b/files/scripts/bookmarks @@ -1,3 +1,6 @@ -d coding ~/coding -f xmonad ~/.xmonad/xmonad.hs -f polybar ~/.config/polybar/config.ini +google-chrome-stable ilias.hs-heilbronn.de +google-chrome-stable youtube.de +google-chrome-stable jira-student.it.hs-heilbronn.de/secure/RapidBoard.jspa?projectKey=RUNDUM +google-chrome-stable https://confluence-student.it.hs-heilbronn.de/display/AIB/AIB_LabSWP_2020_SS_Rundum_Studium+Home +google-chrome-stable https://bitbucket-student.it.hs-heilbronn.de/projects/LABAIB +xfce4-terminal --command "ssh -p 8888 docker@srv-fin.xware-gmbh.de"