From c744349bca0c4a5e7706ea389b39a5f34b6ad8c1 Mon Sep 17 00:00:00 2001 From: Leon Kowarschick Date: Thu, 2 Jul 2020 15:40:06 +0200 Subject: [PATCH] Add stuff --- files/.config/fish/fish/config.fish | 1 + files/.config/fish/fish/fish_variables | 34 ++++++++++++ files/.config/nitrogen/bg-saved.cfg | 4 +- files/.config/nitrogen/nitrogen.cfg | 4 +- files/.config/polybar/config.ini | 3 +- files/.xmonad/lib/Config.hs | 4 +- files/nix-stuff/nixpkgs/config/alacritty.nix | 57 ++++++++++++++++++++ files/nix-stuff/nixpkgs/config/feh.nix | 4 ++ files/nix-stuff/nixpkgs/config/firefox.nix | 18 +++++++ files/nix-stuff/nixpkgs/home.nix | 50 ++++++++++++++++- files/nix-stuff/nixpkgs/toys.nix | 4 ++ 11 files changed, 174 insertions(+), 9 deletions(-) create mode 120000 files/.config/fish/fish/config.fish create mode 100644 files/.config/fish/fish/fish_variables create mode 100644 files/nix-stuff/nixpkgs/config/alacritty.nix create mode 100644 files/nix-stuff/nixpkgs/config/feh.nix create mode 100644 files/nix-stuff/nixpkgs/config/firefox.nix create mode 100644 files/nix-stuff/nixpkgs/toys.nix diff --git a/files/.config/fish/fish/config.fish b/files/.config/fish/fish/config.fish new file mode 120000 index 0000000..9a1ae26 --- /dev/null +++ b/files/.config/fish/fish/config.fish @@ -0,0 +1 @@ +/nix/store/6y0vwjy4bp38zlq8dwhallp7325cm8vi-home-manager-files/.config/fish/config.fish \ No newline at end of file diff --git a/files/.config/fish/fish/fish_variables b/files/.config/fish/fish/fish_variables new file mode 100644 index 0000000..1428cb7 --- /dev/null +++ b/files/.config/fish/fish/fish_variables @@ -0,0 +1,34 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR FZF_DEFAULT_COMMANDS:\x2d\x2dfilepath\x2dword\x20\x2d\x2dcycle +SETUVAR FZF_PREVIEW_FILE_CMD:head\x20\x2dn\x2010\x20\x7c\x20bat\x20\x2d\x2dcolor\x3dalways\x20\x2d\x2ddecorations\x3dnever +SETUVAR __fish_initialized:3100 +SETUVAR fish_color_autosuggestion:555\x1ebrblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:005fd7 +SETUVAR fish_color_comment:990000 +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:009900 +SETUVAR fish_color_error:ff0000 +SETUVAR fish_color_escape:00a6b2 +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:00a6b2 +SETUVAR fish_color_param:00afff +SETUVAR fish_color_quote:999900 +SETUVAR fish_color_redirection:00afff +SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_greeting:\x1d +SETUVAR fish_key_bindings:fish_vi_key_bindings +SETUVAR fish_pager_color_completion:\x1d +SETUVAR fish_pager_color_description:B3A06D\x1eyellow +SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/files/.config/nitrogen/bg-saved.cfg b/files/.config/nitrogen/bg-saved.cfg index 88943f7..35b4180 100644 --- a/files/.config/nitrogen/bg-saved.cfg +++ b/files/.config/nitrogen/bg-saved.cfg @@ -4,11 +4,11 @@ mode=5 bgcolor=#000000 [xin_0] -file=/home/leon/Bilder/wallpapers/green_leaves.jpg +file=/home/leon/Bilder/wallpapers/1583955891537.jpg mode=5 bgcolor=#000000 [xin_1] -file=/home/leon/Bilder/wallpapers/green_leaves.jpg +file=/home/leon/Bilder/wallpapers/1583955891537.jpg mode=5 bgcolor=#000000 diff --git a/files/.config/nitrogen/nitrogen.cfg b/files/.config/nitrogen/nitrogen.cfg index 72c30c0..e95a450 100644 --- a/files/.config/nitrogen/nitrogen.cfg +++ b/files/.config/nitrogen/nitrogen.cfg @@ -1,8 +1,8 @@ [geometry] posx=20 posy=50 -sizex=1297 -sizey=696 +sizex=2518 +sizey=1008 [nitrogen] view=icon diff --git a/files/.config/polybar/config.ini b/files/.config/polybar/config.ini index 8b63a12..70ab154 100644 --- a/files/.config/polybar/config.ini +++ b/files/.config/polybar/config.ini @@ -29,8 +29,9 @@ background = #ff282828 ;background = #222 background-alt = #444 ;foreground = ${xrdb:color7:#222} -foreground = #fbf1c7 +;foreground = #fbf1c7 foreground-alt = #ebdbb2 +foreground = #ebdbb2 primary = #ffb52a secondary = #e60053 alert = #bd2c40 diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs index 2694da4..3680931 100644 --- a/files/.xmonad/lib/Config.hs +++ b/files/.xmonad/lib/Config.hs @@ -205,7 +205,7 @@ myLayout = avoidStruts ||| (rename "Horizon" $ spacingAndGaps $ mouseResizableTileMirrored {draggerType = BordersDragger})) rename n = renamed [Replace n] - spacingAndGaps = let gap = 10 + spacingAndGaps = let gap = 20 border = Border gap gap gap gap in spacingRaw False border True border True @@ -470,7 +470,7 @@ myManageHook :: Query (Data.Monoid.Endo WindowSet) myManageHook = composeAll [ resource =? "Dialog" --> ManageHelpers.doCenterFloat , appName =? "pavucontrol" --> ManageHelpers.doCenterFloat - , className =? "mpv" --> ManageHelpers.doRectFloat (W.RationalRect 0.9 0.9 0.1 0.1) + --, className =? "mpv" --> ManageHelpers.doRectFloat (W.RationalRect 0.9 0.9 0.1 0.1) , title =? "Something" --> doFloat , className =? "termite_floating" --> ManageHelpers.doRectFloat(W.RationalRect 0.2 0.2 0.6 0.6) , className =? "bar_system_status_indicator" --> ManageHelpers.doRectFloat (W.RationalRect 0.7 0.05 0.29 0.26) diff --git a/files/nix-stuff/nixpkgs/config/alacritty.nix b/files/nix-stuff/nixpkgs/config/alacritty.nix new file mode 100644 index 0000000..03c018f --- /dev/null +++ b/files/nix-stuff/nixpkgs/config/alacritty.nix @@ -0,0 +1,57 @@ +{ + enable = true; + settings = { + window = { + padding.x = 20; + padding.y = 20; + dynamic_padding = true; + }; + dynamic_title = true; + cursor = { + style = "Block"; + unfocused_hollow = true; + }; + shell = "/bin/fish"; + mouse = { + double_click.threshold = 300; + triple_click.threshold = 300; + hide_when_typing = true; + url.launcher.program = "xdg-open"; + }; + + background_opacity = 1; + fonts = { + size = 12; + normal.family = "Terminus (TTF)"; + offset.x = 0; + offset.y = 0; + }; + + colors = { + primary = { + background = "#282828"; + foreground = "#ebdbb2"; + }; + normal = { + black = "#282828"; + red = "#cc241d"; + green = "#98971a"; + yellow = "#d79921"; + blue = "#458588"; + magenta = "#b16286"; + cyan = "#689d6a"; + white = "#a89984"; + }; + bright = { + black = "#928374"; + red = "#fb4934"; + green = "#b8bb26"; + yellow = "#fabd2f"; + blue = "#83a598"; + magenta = "#d3869b"; + cyan = "#8ec07c"; + white = "#ebdbb2"; + }; + }; + }; +} diff --git a/files/nix-stuff/nixpkgs/config/feh.nix b/files/nix-stuff/nixpkgs/config/feh.nix new file mode 100644 index 0000000..4aae164 --- /dev/null +++ b/files/nix-stuff/nixpkgs/config/feh.nix @@ -0,0 +1,4 @@ +{ + enable = true; + keybindings = { zoom_in = "plus"; zoom_out = "minus"; }; +} diff --git a/files/nix-stuff/nixpkgs/config/firefox.nix b/files/nix-stuff/nixpkgs/config/firefox.nix new file mode 100644 index 0000000..814c1a4 --- /dev/null +++ b/files/nix-stuff/nixpkgs/config/firefox.nix @@ -0,0 +1,18 @@ +{ + enable = true; + profiles.leon = { + isDefault = true; + name = "Main profile"; + extraConfig = builtins.readFile /home/leon/desktop-dotfiles/files/firefoxChrome/chrome/userChrome.js; + userChrome = builtins.readFile /home/leon/desktop-dotfiles/files/firefoxChrome/chrome/userChrome.css; + userContent = builtins.readFile /home/leon/desktop-dotfiles/files/firefoxChrome/chrome/userContent.css; + settings = { + "browser.startup.homepage" = "file:///home/leon/.config/my_startpage/index.html"; + "browser.search.region" = "DE"; + "browser.search.isUS" = false; + "distribution.searchplugins.defaultLocale" = "de-DE"; + "general.useragent.locale" = "de-DE"; + "browser.bookmarks.showMobileBookmarks" = true; + }; + }; +} diff --git a/files/nix-stuff/nixpkgs/home.nix b/files/nix-stuff/nixpkgs/home.nix index b26fcc7..a0926d8 100644 --- a/files/nix-stuff/nixpkgs/home.nix +++ b/files/nix-stuff/nixpkgs/home.nix @@ -3,16 +3,62 @@ let elkowar_local = import ./local/default.nix {}; in { - home.packages = [ elkowar_local.bashtop pkgs.htop pkgs.direnv pkgs.rnix-lsp pkgs.nix-prefetch-git + pkgs.gtop + pkgs.simplescreenrecorder + pkgs.bat + pkgs.websocat + #pkgs.timg ]; - programs.home-manager.enable = true; + + programs = { + home-manager.enable = true; + #alacritty = import ./config/alacritty.nix; # <- https://github.com/guibou/nixGL + #firefox = import ./config/firefox.nix; + feh = import ./config/feh.nix; + lsd = { + enable = true; + enableAliases = true; + }; + + mpv = { + enable = true; + bindings = { + WHEEL_UP = "add volume 5"; + WHEEL_DOWN = "add volume -5"; + WHEEL_LEFT = "seek -3"; + WHEEL_RIGHT = "seek 3"; + h = "seek -3"; + l = "seek 3"; + }; + }; + + fzf = { + enable = true; + enableFishIntegration = true; + defaultCommand = "rg --files"; + fileWidgetCommand = "fd --type f"; + changeDirWidgetCommand = "rg --files --null | xargs -0 dirname | sort -u"; + }; + + direnv = { + enable = true; + enableFishIntegration = true; + #enableNixDirenvIntegration = true; + }; + }; + + services = { + kdeconnect.enable = true; + }; + + home.username = "leon"; home.homeDirectory = "/home/leon"; diff --git a/files/nix-stuff/nixpkgs/toys.nix b/files/nix-stuff/nixpkgs/toys.nix new file mode 100644 index 0000000..df20444 --- /dev/null +++ b/files/nix-stuff/nixpkgs/toys.nix @@ -0,0 +1,4 @@ +{ pkgs ? import {} }: +pkgs.mkShell { + buildInputs = [pkgs.ytop pkgs.pscircle pkgs.asciiquarium pkgs.cmatrix ]; +}