From 2612346f24e2181f4864336e5155bbbad2d81621 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 12 Jul 2021 18:12:20 -0600 Subject: [PATCH 1/9] [Linux] Switch back to alacritty --- .gitignore | 1 + dotfiles/config/xmonad/xmonad.hs | 2 +- dotfiles/lib/shellpath.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1b1a3663..25f9ccba 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ gotools /dotfiles/config/xmonad/result /dotfiles/config/taffybar/result /dotfiles/emacs.d/*.sqlite +/dotfiles/config/gtk-3.0/colors.css diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs index b40e3297..5c475ff6 100644 --- a/dotfiles/config/xmonad/xmonad.hs +++ b/dotfiles/config/xmonad/xmonad.hs @@ -80,7 +80,7 @@ import XMonad.Util.WorkspaceCompare myConfig = def { modMask = mod4Mask - , terminal = "konsole" + , terminal = "alacritty" , manageHook = myManageHook <+> manageHook def , layoutHook = myLayoutHook , borderWidth = 0 diff --git a/dotfiles/lib/shellpath.sh b/dotfiles/lib/shellpath.sh index ab6a39d5..8b2ece78 100644 --- a/dotfiles/lib/shellpath.sh +++ b/dotfiles/lib/shellpath.sh @@ -23,7 +23,7 @@ function _setup_path { add_to_path "$HOME/.lib/bin" --before # This makes systemd aware of change to $PATH - run_if_exists systemctl --user import-environment PATH DISPLAY XAUTHORITY HOME + run_if_exists systemctl --user import-environment PATH DISPLAY XAUTHORITY HOME 2> /dev/null } function _linux_path_setup { From f42372687b81a386432ace95d4a69eb41535a406 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 12 Jul 2021 18:13:46 -0600 Subject: [PATCH 2/9] [alacritty] Add config --- dotfiles/config/alacritty/alacritty.yml | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 dotfiles/config/alacritty/alacritty.yml diff --git a/dotfiles/config/alacritty/alacritty.yml b/dotfiles/config/alacritty/alacritty.yml new file mode 100644 index 00000000..fd251e1c --- /dev/null +++ b/dotfiles/config/alacritty/alacritty.yml @@ -0,0 +1,56 @@ +scrolling: + # How many lines of scrollback to keep, + # '0' will disable scrolling. + history: 10000 + + # Number of lines the viewport will move for every line + # scrolled when scrollback is enabled (history > 0). + multiplier: 3 + + # Faux Scrolling + # + # The `faux_multiplier` setting controls the number + # of lines the terminal should scroll when the alternate + # screen buffer is active. This is used to allow mouse + # scrolling for applications like `man`. + # + # To disable this completely, set `faux_multiplier` to 0. + faux_multiplier: 3 + + # Automatically scroll to the bottom when new text is written + # to the terminal. + auto_scroll: false + +# Colors (Solarized Light) +colors: + # Default colors + primary: + background: '#fdf6e3' # base3 + foreground: '#657b83' # base00 + + # Cursor colors + cursor: + text: '#fdf6e3' # base3 + cursor: '#657b83' # base00 + + # Normal colors + normal: + black: '#073642' # base02 + red: '#dc322f' # red + green: '#859900' # green + yellow: '#b58900' # yellow + blue: '#268bd2' # blue + magenta: '#d33682' # magenta + cyan: '#2aa198' # cyan + white: '#eee8d5' # base2 + + # Bright colors + bright: + black: '#002b36' # base03 + red: '#cb4b16' # orange + green: '#586e75' # base01 + yellow: '#657b83' # base00 + blue: '#839496' # base0 + magenta: '#6c71c4' # violet + cyan: '#93a1a1' # base1 + white: '#fdf6e3' # base3 From 11cb9c0c12df5190e6190577dab5d2912ec02130 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 12 Jul 2021 19:56:40 -0600 Subject: [PATCH 3/9] [rofi] Use colorful theme --- .gitignore | 1 + dotfiles/config/rofi/colorful/colors.rasi | 9 ++ dotfiles/config/rofi/colorful/launcher.sh | 51 ++++++++ dotfiles/config/rofi/colorful/style_1.rasi | 115 +++++++++++++++++ dotfiles/config/rofi/colorful/style_10.rasi | 114 +++++++++++++++++ dotfiles/config/rofi/colorful/style_11.rasi | 125 +++++++++++++++++++ dotfiles/config/rofi/colorful/style_12.rasi | 128 +++++++++++++++++++ dotfiles/config/rofi/colorful/style_2.rasi | 115 +++++++++++++++++ dotfiles/config/rofi/colorful/style_3.rasi | 116 ++++++++++++++++++ dotfiles/config/rofi/colorful/style_4.rasi | 115 +++++++++++++++++ dotfiles/config/rofi/colorful/style_5.rasi | 115 +++++++++++++++++ dotfiles/config/rofi/colorful/style_6.rasi | 110 +++++++++++++++++ dotfiles/config/rofi/colorful/style_7.rasi | 115 +++++++++++++++++ dotfiles/config/rofi/colorful/style_8.rasi | 121 ++++++++++++++++++ dotfiles/config/rofi/colorful/style_9.rasi | 122 ++++++++++++++++++ dotfiles/config/rofi/config.rasi | 10 ++ dotfiles/config/rofi/sidestyle.rasi | 127 ------------------- dotfiles/config/rofi/white.rasi | 129 -------------------- nixos/flake.lock | 10 +- nixos/fonts.nix | 2 +- 20 files changed, 1488 insertions(+), 262 deletions(-) create mode 100644 dotfiles/config/rofi/colorful/colors.rasi create mode 100755 dotfiles/config/rofi/colorful/launcher.sh create mode 100644 dotfiles/config/rofi/colorful/style_1.rasi create mode 100644 dotfiles/config/rofi/colorful/style_10.rasi create mode 100644 dotfiles/config/rofi/colorful/style_11.rasi create mode 100644 dotfiles/config/rofi/colorful/style_12.rasi create mode 100644 dotfiles/config/rofi/colorful/style_2.rasi create mode 100644 dotfiles/config/rofi/colorful/style_3.rasi create mode 100644 dotfiles/config/rofi/colorful/style_4.rasi create mode 100644 dotfiles/config/rofi/colorful/style_5.rasi create mode 100644 dotfiles/config/rofi/colorful/style_6.rasi create mode 100644 dotfiles/config/rofi/colorful/style_7.rasi create mode 100644 dotfiles/config/rofi/colorful/style_8.rasi create mode 100644 dotfiles/config/rofi/colorful/style_9.rasi create mode 100644 dotfiles/config/rofi/config.rasi delete mode 100644 dotfiles/config/rofi/sidestyle.rasi diff --git a/.gitignore b/.gitignore index 25f9ccba..e0b35c95 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ gotools /dotfiles/config/taffybar/result /dotfiles/emacs.d/*.sqlite /dotfiles/config/gtk-3.0/colors.css +/dotfiles/emacs.d/.cache/ diff --git a/dotfiles/config/rofi/colorful/colors.rasi b/dotfiles/config/rofi/colorful/colors.rasi new file mode 100644 index 00000000..ae459fc4 --- /dev/null +++ b/dotfiles/config/rofi/colorful/colors.rasi @@ -0,0 +1,9 @@ +/* colors */ + +* { + al: #00000000; + bg: #000000ff; + se: #101010ff; + fg: #FFFFFFff; + ac: #42A5F5ff; +} diff --git a/dotfiles/config/rofi/colorful/launcher.sh b/dotfiles/config/rofi/colorful/launcher.sh new file mode 100755 index 00000000..705b7249 --- /dev/null +++ b/dotfiles/config/rofi/colorful/launcher.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +## Author : Aditya Shakya +## Mail : adi1090x@gmail.com +## Github : @adi1090x +## Twitter : @adi1090x + +# Available Styles +# >> Created and tested on : rofi 1.6.0-1 +# +# style_1 style_2 style_3 style_4 style_5 style_6 +# style_7 style_8 style_9 style_10 style_11 style_12 + +theme="style_1" +dir="$HOME/.config/rofi/colorful" + +# dark +ALPHA="#00000000" +BG="#000000ff" +FG="#FFFFFFff" +SELECT="#101010ff" + +# light +#ALPHA="#00000000" +#BG="#FFFFFFff" +#FG="#000000ff" +#SELECT="#f3f3f3ff" + +# accent colors +COLORS=('#EC7875' '#61C766' '#FDD835' '#42A5F5' '#BA68C8' '#4DD0E1' '#00B19F' \ + '#FBC02D' '#E57C46' '#AC8476' '#6D8895' '#EC407A' '#B9C244' '#6C77BB') +ACCENT="${COLORS[$(( $RANDOM % 14 ))]}ff" + +# overwrite colors file +cat > $dir/colors.rasi <<- EOF + /* colors */ + + * { + al: $ALPHA; + bg: $BG; + se: $SELECT; + fg: $FG; + ac: $ACCENT; + } +EOF + +# comment these lines to disable random style +themes=($(ls -p --hide="launcher.sh" --hide="colors.rasi" $dir)) +theme="${themes[$(( $RANDOM % 12 ))]}" + +rofi -no-lazy-grab -show drun -modi drun -theme $dir/"$theme" diff --git a/dotfiles/config/rofi/colorful/style_1.rasi b/dotfiles/config/rofi/colorful/style_1.rasi new file mode 100644 index 00000000..60ab3ee0 --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_1.rasi @@ -0,0 +1,115 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: ""; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 12px; + width: 35%; + location: center; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 0.30% 1% 0% -0.5%; + background-color: @al; + text-color: @bg; + font: "FantasqueSansMono Nerd Font 12"; +} + +entry { + background-color: @al; + text-color: @bg; + placeholder-color: @bg; + expand: true; + horizontal-align: 0; + placeholder: "Search"; + padding: 0.10% 0% 0% 0%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @ac; + text-color: @bg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @ac; + margin: 0% 0% 0% 0%; + padding: 1.5%; +} + +listview { + background-color: @al; + padding: 10px; + columns: 5; + lines: 3; + spacing: 0%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 0%; + padding: 0%; +} + +element { + background-color: @al; + text-color: @fg; + orientation: vertical; + border-radius: 0%; + padding: 2% 0% 2% 0%; +} + +element-icon { + size: 64px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0.5; + vertical-align: 0.5; + margin: 0.5% 0.5% -0.5% 0.5%; +} + +element selected { + background-color: @se; + text-color: @fg; + border: 0% 0% 0% 0%; + border-radius: 12px; + border-color: @bg; +} diff --git a/dotfiles/config/rofi/colorful/style_10.rasi b/dotfiles/config/rofi/colorful/style_10.rasi new file mode 100644 index 00000000..b59039f6 --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_10.rasi @@ -0,0 +1,114 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + show-icons: true; + icon-theme: "Papirus"; + display-drun: "Applications"; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: true; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 0px; +} + +prompt { + enabled: true; + padding: 1% 0.75% 1% 0.75%; + background-color: @ac; + text-color: @fg; + border-radius: 100%; +} + +textbox-prompt-colon { + padding: 1% 0% 1% 0%; + background-color: @se; + text-color: @fg; + expand: false; + str: " :: "; +} + +entry { + background-color: @al; + text-color: @fg; + placeholder-color: @fg; + expand: true; + horizontal-align: 0; + placeholder: "Search..."; + padding: 1.15% 0.5% 1% 0.5%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @se; + text-color: @fg; + expand: false; + border: 0% 0.2% 0.3% 0%; + border-radius: 100%; + border-color: @ac; +} + +listview { + background-color: @al; + padding: 0px; + columns: 3; + spacing: 1%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 2%; + padding: 20% 15% 20% 15%; +} + +element { + background-color: @se; + text-color: @fg; + orientation: horizontal; + border-radius: 100%; + padding: 1% 0.5% 1% 0.75%; +} + +element-icon { + size: 24px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0; + vertical-align: 0.5; + margin: 0% 0.25% 0% 0.25%; +} + +element selected { + background-color: @se; + text-color: @ac; + border: 0% 0% 0.3% 0.2%; + border-radius: 100%; + border-color: @ac; +} diff --git a/dotfiles/config/rofi/colorful/style_11.rasi b/dotfiles/config/rofi/colorful/style_11.rasi new file mode 100644 index 00000000..4a6792f8 --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_11.rasi @@ -0,0 +1,125 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: "Applications"; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 25px; + width: 50%; + location: center; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 1.25% 0.75% 1.25% 0.75%; + background-color: @ac; + text-color: @fg; + font: "Iosevka Nerd Font 12"; + border-radius: 100%; +} + +textbox-prompt-colon { + padding: 1.40% 0% 1% 0%; + background-color: @se; + text-color: @fg; + expand: false; + str: " :: "; +} + +entry { + background-color: @al; + text-color: @fg; + placeholder-color: @fg; + expand: true; + horizontal-align: 0; + placeholder: "Search"; + padding: 1.5% 0.5% 1% 0%; + blink: true; +} + +inputbar { + children: [ prompt, textbox-prompt-colon, entry ]; + background-color: @se; + text-color: @fg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 100px; + border-color: @ac; +} + +listview { + background-color: @al; + padding: 0px; + columns: 3; + lines: 8; + spacing: 1%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 2%; + padding: 4% 2% 4% 2%; +} + +element { + background-color: @bg; + text-color: @fg; + orientation: horizontal; + border-radius: 0%; + padding: 0%; +} + +element-icon { + size: 24px; + border: 1%; + border-color: @ac; + border-radius: 15px; + background-color: @ac; +} + +element-text { + expand: true; + horizontal-align: 0; + vertical-align: 0.5; + margin: 0% 0.25% 0% 0.25%; +} + +element selected { + background-color: @se; + text-color: @ac; + border: 0% 0% 0% 0%; + border-radius: 15px; + border-color: @ac; +} diff --git a/dotfiles/config/rofi/colorful/style_12.rasi b/dotfiles/config/rofi/colorful/style_12.rasi new file mode 100644 index 00000000..713d569d --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_12.rasi @@ -0,0 +1,128 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: " Applications"; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 50px; + width: 50%; + location: center; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 1.25% 0.75% 1.25% 0.75%; + background-color: @ac; + text-color: @fg; + font: "Iosevka Nerd Font 12"; + border-radius: 100%; +} + +textbox-prompt-colon { + padding: 1.40% 0% 1% 0%; + background-color: @se; + text-color: @fg; + expand: false; + str: " :: "; +} + +entry { + background-color: @al; + text-color: @fg; + placeholder-color: @fg; + expand: true; + horizontal-align: 0; + placeholder: "Search"; + padding: 1.5% 0.5% 1% 0%; + blink: true; +} + +inputbar { + children: [ prompt, textbox-prompt-colon, entry ]; + background-color: @se; + text-color: @fg; + expand: false; + border: 0%; + border-radius: 100%; + border-color: @ac; +} + +listview { + background-color: @al; + padding: 0px; + columns: 6; + lines: 3; + spacing: 1%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 10px 0px 10px 0px; + border-radius: 50px; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 2%; + padding: 4% 2% 2% 2%; +} + +element { + background-color: @bg; + text-color: @fg; + orientation: vertical; + border-radius: 0%; + padding: 0%; +} + +element-icon { + size: 64px; + border: 1%; + border-color: @se; + border-radius: 15px; + background-color: @se; + padding: 2% 1% 2% 1%; +} + +element-text { + expand: true; + horizontal-align: 0.5; + vertical-align: 0.5; + margin: 0.5% 0.25% 0.5% 0.25%; + padding: 1% 0.5% 1% 0.5%; +} + +element-text selected { + expand: true; + horizontal-align: 0.5; + vertical-align: 0.5; + background-color: @ac; + text-color: @bg; + border-radius: 100%; +} diff --git a/dotfiles/config/rofi/colorful/style_2.rasi b/dotfiles/config/rofi/colorful/style_2.rasi new file mode 100644 index 00000000..12368cfd --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_2.rasi @@ -0,0 +1,115 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: ""; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 12px; + width: 18%; + location: center; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 0.30% 1% 0% -0.5%; + background-color: @al; + text-color: @bg; + font: "FantasqueSansMono Nerd Font 12"; +} + +entry { + background-color: @al; + text-color: @bg; + placeholder-color: @bg; + expand: true; + horizontal-align: 0; + placeholder: "Search"; + padding: 0.10% 0% 0% 0%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @ac; + text-color: @bg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @ac; + margin: 0% 0% 0% 0%; + padding: 1.5%; +} + +listview { + background-color: @al; + padding: 0px; + columns: 1; + lines: 5; + spacing: 0%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 0%; + padding: 0%; +} + +element { + background-color: @al; + text-color: @fg; + orientation: horizontal; + border-radius: 0%; + padding: 1% 0.5% 1% 0.5%; +} + +element-icon { + size: 32px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0; + vertical-align: 0.5; + margin: 0% 0.25% 0% 0.25%; +} + +element selected { + background-color: @se; + text-color: @fg; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @bg; +} diff --git a/dotfiles/config/rofi/colorful/style_3.rasi b/dotfiles/config/rofi/colorful/style_3.rasi new file mode 100644 index 00000000..fe0e6ad1 --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_3.rasi @@ -0,0 +1,116 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: ""; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 0px; + height: 100%; + width: 18%; + location: west; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 0.30% 1% 0% -0.5%; + background-color: @al; + text-color: @bg; + font: "FantasqueSansMono Nerd Font 12"; +} + +entry { + background-color: @al; + text-color: @bg; + placeholder-color: @bg; + expand: true; + horizontal-align: 0; + placeholder: "Search"; + padding: 0.10% 0% 0% 0%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @ac; + text-color: @bg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @ac; + margin: 0% 0% 0% 0%; + padding: 1.5%; +} + +listview { + background-color: @al; + padding: 0px; + columns: 1; + lines: 5; + spacing: 0%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 0%; + padding: 0%; +} + +element { + background-color: @al; + text-color: @fg; + orientation: horizontal; + border-radius: 0%; + padding: 1% 0.5% 1% 0.5%; +} + +element-icon { + size: 32px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0; + vertical-align: 0.5; + margin: 0% 0.25% 0% 0.25%; +} + +element selected { + background-color: @se; + text-color: @fg; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @bg; +} diff --git a/dotfiles/config/rofi/colorful/style_4.rasi b/dotfiles/config/rofi/colorful/style_4.rasi new file mode 100644 index 00000000..2e34f337 --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_4.rasi @@ -0,0 +1,115 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: ""; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 0px; + height: 100%; + width: 19%; + location: east; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 0.30% 1% 0% -0.5%; + background-color: @al; + text-color: @bg; + font: "FantasqueSansMono Nerd Font 12"; +} + +entry { + background-color: @al; + text-color: @bg; + placeholder-color: @bg; + expand: true; + horizontal-align: 0; + placeholder: "Search"; + padding: 0.10% 0% 0% 0%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @ac; + text-color: @bg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @ac; + margin: 0% 0% 0% 0%; + padding: 1.5%; +} + +listview { + background-color: @al; + padding: 10px 10px 0px 10px; + columns: 3; + spacing: 0%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 0%; + padding: 0%; +} + +element { + background-color: @al; + text-color: @fg; + orientation: vertical; + border-radius: 0%; + padding: 2% 0% 2% 0%; +} + +element-icon { + size: 48px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0.5; + vertical-align: 0.5; + margin: 0.5% 0.5% -0.5% 0.5%; +} + +element selected { + background-color: @se; + text-color: @fg; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @bg; +} diff --git a/dotfiles/config/rofi/colorful/style_5.rasi b/dotfiles/config/rofi/colorful/style_5.rasi new file mode 100644 index 00000000..10739d7c --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_5.rasi @@ -0,0 +1,115 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: ""; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 0px; + width: 35%; + location: center; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 0.30% 1% 0% -0.5%; + background-color: @al; + text-color: @bg; + font: "FantasqueSansMono Nerd Font 12"; +} + +entry { + background-color: @al; + text-color: @bg; + placeholder-color: @bg; + expand: true; + horizontal-align: 0; + placeholder: "Search"; + padding: 0.10% 0% 0% 0%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @fg; + text-color: @bg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @ac; + margin: 0% 0% 0% 0%; + padding: 1.5%; +} + +listview { + background-color: @al; + padding: 10px; + columns: 2; + lines: 10; + spacing: 0%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 0%; + padding: 0%; +} + +element { + background-color: @al; + text-color: @fg; + orientation: horizontal; + border-radius: 0%; + padding: 1% 0.5% 1% 0.5%; +} + +element-icon { + size: 24px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0; + vertical-align: 0.5; + margin: 0% 0.25% 0% 0.25%; +} + +element selected { + background-color: @ac; + text-color: @bg; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @bg; +} diff --git a/dotfiles/config/rofi/colorful/style_6.rasi b/dotfiles/config/rofi/colorful/style_6.rasi new file mode 100644 index 00000000..e2bd1c3b --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_6.rasi @@ -0,0 +1,110 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: ""; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: true; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 0px; +} + +prompt { + enabled: true; + padding: 0.30% 1% 0% -0.5%; + background-color: @al; + text-color: @bg; + font: "FantasqueSansMono Nerd Font 12"; +} + +entry { + background-color: @al; + text-color: @bg; + placeholder-color: @bg; + expand: true; + horizontal-align: 0; + placeholder: "Search"; + padding: 0.10% 0% 0% 0%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @ac; + text-color: @bg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 100%; + border-color: @ac; + margin: 0% 54.5% 0% 0%; + padding: 1.5%; +} + +listview { + background-color: @al; + padding: 0px; + columns: 10; + spacing: 0%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 2.5%; + padding: 20% 5% 20% 5%; +} + +element { + background-color: @al; + text-color: @fg; + orientation: vertical; + border-radius: 0%; + padding: 4% 0% 4% 0%; +} + +element-icon { + size: 80px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0.5; + vertical-align: 0.5; + margin: 0.5% 0.5% -0.5% 0.5%; +} + +element selected { + background-color: @se; + text-color: @fg; + border: 0% 0% 0.5% 0%; + border-radius: 25px; + border-color: @ac; +} diff --git a/dotfiles/config/rofi/colorful/style_7.rasi b/dotfiles/config/rofi/colorful/style_7.rasi new file mode 100644 index 00000000..e66e1269 --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_7.rasi @@ -0,0 +1,115 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: ""; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 12px; + width: 30%; + location: center; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 0.30% 1% 0% -0.5%; + background-color: @al; + text-color: @fg; + font: "FantasqueSansMono Nerd Font 12"; +} + +entry { + background-color: @al; + text-color: @fg; + placeholder-color: @fg; + expand: true; + horizontal-align: 0; + placeholder: "Search"; + padding: 0.10% 0% 0% 0%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @bg; + text-color: @fg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @ac; + margin: 0% 0% 0% 0%; + padding: 1.5%; +} + +listview { + background-color: @al; + padding: 10px; + columns: 2; + lines: 7; + spacing: 1%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 0%; + padding: 0%; +} + +element { + background-color: @al; + text-color: @fg; + orientation: horizontal; + border-radius: 0%; + padding: 0.5% 0.5% 0.5% 0.5%; +} + +element-icon { + size: 24px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0; + vertical-align: 0.5; + margin: 0% 0.25% 0% 0.25%; +} + +element selected { + background-color: @ac; + text-color: @bg; + border: 0% 0% 0% 0%; + border-radius: 12px; + border-color: @bg; +} diff --git a/dotfiles/config/rofi/colorful/style_8.rasi b/dotfiles/config/rofi/colorful/style_8.rasi new file mode 100644 index 00000000..78f8fd3c --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_8.rasi @@ -0,0 +1,121 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: "Applications"; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 0px; + width: 35%; + location: center; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 1% 0.75% 1% 0.75%; + background-color: @ac; + text-color: @fg; + font: "Iosevka Nerd Font 12"; +} + +textbox-prompt-colon { + padding: 1% 0% 1% 0%; + background-color: @se; + text-color: @fg; + expand: false; + str: " :: "; +} + +entry { + background-color: @al; + text-color: @fg; + placeholder-color: @fg; + expand: true; + horizontal-align: 0; + placeholder: "Search..."; + padding: 1.15% 0.5% 1% 0.5%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @se; + text-color: @fg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 0px; + border-color: @ac; +} + +listview { + background-color: @al; + padding: 0px; + columns: 2; + lines: 7; + spacing: 1%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 2%; + padding: 4% 2% 4% 2%; +} + +element { + background-color: @se; + text-color: @fg; + orientation: horizontal; + border-radius: 0%; + padding: 1% 0.5% 1% 0.75%; +} + +element-icon { + size: 24px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0; + vertical-align: 0.5; + margin: 0% 0.25% 0% 0.25%; +} + +element selected { + background-color: @se; + text-color: @ac; + border: 0% 0% 0% 0.3%; + border-radius: 0px; + border-color: @ac; +} diff --git a/dotfiles/config/rofi/colorful/style_9.rasi b/dotfiles/config/rofi/colorful/style_9.rasi new file mode 100644 index 00000000..8c98050b --- /dev/null +++ b/dotfiles/config/rofi/colorful/style_9.rasi @@ -0,0 +1,122 @@ +/* + * + * Author : Aditya Shakya + * Mail : adi1090x@gmail.com + * Github : @adi1090x + * Twitter : @adi1090x + * + */ + +configuration { + font: "Iosevka Nerd Font 10"; + show-icons: true; + icon-theme: "Papirus"; + display-drun: "Applications"; + drun-display-format: "{name}"; + disable-history: false; + fullscreen: false; + hide-scrollbar: true; + sidebar-mode: false; +} + +@import "colors.rasi" + +window { + transparency: "real"; + background-color: @bg; + text-color: @fg; + border: 0px; + border-color: @ac; + border-radius: 15px; + width: 35%; + location: center; + x-offset: 0; + y-offset: 0; +} + +prompt { + enabled: true; + padding: 1% 0.75% 1% 0.75%; + background-color: @ac; + text-color: @fg; + border-radius: 10px; + font: "Iosevka Nerd Font 12"; +} + +textbox-prompt-colon { + padding: 1% 0% 1% 0%; + background-color: @se; + text-color: @fg; + expand: false; + str: " :: "; +} + +entry { + background-color: @al; + text-color: @fg; + placeholder-color: @fg; + expand: true; + horizontal-align: 0; + placeholder: "Search..."; + padding: 1.15% 0.5% 1% 0.5%; + blink: true; +} + +inputbar { + children: [ prompt, entry ]; + background-color: @se; + text-color: @fg; + expand: false; + border: 0% 0% 0% 0%; + border-radius: 10px; + border-color: @ac; +} + +listview { + background-color: @al; + padding: 0px; + columns: 2; + lines: 7; + spacing: 1%; + cycle: false; + dynamic: true; + layout: vertical; +} + +mainbox { + background-color: @al; + border: 0% 0% 0% 0%; + border-radius: 0% 0% 0% 0%; + border-color: @ac; + children: [ inputbar, listview ]; + spacing: 2%; + padding: 4% 2% 4% 2%; +} + +element { + background-color: @se; + text-color: @fg; + orientation: horizontal; + border-radius: 12px; + padding: 1% 0.5% 1% 0.75%; +} + +element-icon { + size: 24px; + border: 0px; +} + +element-text { + expand: true; + horizontal-align: 0; + vertical-align: 0.5; + margin: 0% 0.25% 0% 0.25%; +} + +element selected { + background-color: @se; + text-color: @ac; + border: 0% 0.3% 0% 0.3%; + border-radius: 12px; + border-color: @ac; +} diff --git a/dotfiles/config/rofi/config.rasi b/dotfiles/config/rofi/config.rasi new file mode 100644 index 00000000..5d3f74e0 --- /dev/null +++ b/dotfiles/config/rofi/config.rasi @@ -0,0 +1,10 @@ +configuration { + bw: 0; + padding: 50; + show-icons: true; + terminal: "alacritty"; + sidebar-mode: false; + fullscreen: true; + theme: "colorful/style_10.rasi"; + dpi: 100; +} diff --git a/dotfiles/config/rofi/sidestyle.rasi b/dotfiles/config/rofi/sidestyle.rasi deleted file mode 100644 index e4091fee..00000000 --- a/dotfiles/config/rofi/sidestyle.rasi +++ /dev/null @@ -1,127 +0,0 @@ -/* ================================================= */ -/* Rofi config by lans9831 */ -/* Suggested icon pack: Papirus */ -/* ================================================= */ - -* { - /* Make text color white and background fully transparent */ - text-color: White; - background-color: rgba(0,0,0,0); - - /* This variables change other elements color - * Change here and it will change over all the - * theme (for an unified experience) */ - fc-color: #39393A; - bg-color: #262626; - fc-color-trans: #39393AC5; - bg-color-trans: #262626F0; - - font: "Source Code Pro 11"; -} - -/* ================================================= */ -/* Main container */ -/* ================================================= */ -#window { - fullscreen: true; - location: west; - anchor: west; - border: 0px 0px 0px 0px; - transparency: "real"; - - orientation: horizontal; - children: [mainbox]; -} - -/* First container */ -#mainbox { - expand: true; - background-color: @bg-color-trans; - spacing: 0.8em; -} - -/* Dummy container */ -#dummy { - expand: true; -} -/* ================================================= */ - -/* ================================================= */ -/* Sidebar and its elements */ -/* ================================================= */ -#sidebar { - border: 0px 0px 0px 0px; -} - -#button { - padding: 10px; -} - -#button selected { - font: "Open Sans SemiBold 11"; - background-color: @fc-color-trans; -} -/* ================================================= */ - -/* ================================================= */ -/* Input bar */ -/* ================================================= */ -#inputbar { - background-color: @bg-color; - padding: 5px; - spacing: 5px; -} - -#prompt { - font: "Open Sans SemiBold Italic 11"; -} - -#entry { - font: "Open Sans Italic 11"; - width: 15em; -} -/* ================================================= */ - - -/* ================================================= */ -/* List view */ -/* ================================================= */ -#listview { - /*spacing: 0.5em;*/ -} - -#element { - font: "Source Code Pro 13"; - padding: 12px 1.5em 12px 14px; -} - -#element selected normal { - background-color: @fc-color-trans; -} - -#element normal active { - background-color: @fc-color-trans; -} - -#element normal urgent { - background-color: Orange; -} - -#element alternate normal { -} - -#element alternate active { - text-color: @focus-col; -} - -#element alternate urgent { - background-color: OrangeRed; -} - -#element selected active { - background-color: @fc-color-trans; -} - -#element selected urgent { - background-color: DarkOrange; -} diff --git a/dotfiles/config/rofi/white.rasi b/dotfiles/config/rofi/white.rasi index e5c172a6..e69de29b 100644 --- a/dotfiles/config/rofi/white.rasi +++ b/dotfiles/config/rofi/white.rasi @@ -1,129 +0,0 @@ -/* ================================================= */ -/* Rofi config by lans9831 */ -/* Suggested icon pack: Papirus */ -/* ================================================= */ - -* { - /* Make text color white and background fully transparent */ - text-color: #45373c; - background-color: rgba(0,0,0,0); - - /* This variables change other elements color - * Change here and it will change over all the - * theme (for an unified experience) */ - fc-color: #45373c; - bg-color: #e9e9e9; - fc-color-trans: #45373c; - bg-color-trans: #e9e9e9; - - font: "Open Sans 11"; -} - -/* ================================================= */ -/* Main container */ -/* ================================================= */ -#window { - fullscreen: true; - location: west; - anchor: west; - border: 0px 0px 0px 0px; - transparency: "real"; - - orientation: horizontal; - children: [mainbox, dummy]; -} - -/* First container */ -#mainbox { - expand: false; - background-color: @bg-color-trans; - spacing: 0.8em; -} - -/* Dummy container */ -#dummy { - expand: true; -} -/* ================================================= */ - -/* ================================================= */ -/* Sidebar and its elements */ -/* ================================================= */ -#sidebar { - border: 0px 0px 0px 0px; -} - -#button { - padding: 10px; -} - -#button selected { - font: "Open Sans SemiBold 11"; - background-color: @fc-color-trans; -} -/* ================================================= */ - -/* ================================================= */ -/* Input bar */ -/* ================================================= */ -#inputbar { - background-color: @bg-color; - padding: 5px; - spacing: 5px; -} - -#prompt { - font: "Open Sans SemiBold Italic 11"; -} - -#entry { - font: "Open Sans Italic 11"; - width: 15em; -} -/* ================================================= */ - - -/* ================================================= */ -/* List view */ -/* ================================================= */ -#listview { - /*spacing: 0.5em;*/ -} - -#element { - font: "Open Sans 13"; - padding: 12px 1.5em 12px 14px; -} - -#element selected normal { - background-color: #a6a6a6; -} - -#element normal active { - background-color: #a6a6a6; -} - -#element normal urgent { - background-color: Orange; -} - -#element alternate normal { -} - -#element alternate active { - text-color: @focus-col; -} - -#element alternate urgent { - background-color: OrangeRed; -} - -#element selected active { - background-color: #a6a6a6; -} - -#element selected urgent { - background-color: DarkOrange; -} - -/* vim:ft=css */ diff --git a/nixos/flake.lock b/nixos/flake.lock index 8451a055..8d9ac2ff 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -36,11 +36,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1625977875, - "narHash": "sha256-rI9IhR2aKTQoknUXAa13/OlVzmthN3Ai7YNYzVvslO4=", + "lastModified": 1626063113, + "narHash": "sha256-a05n5l8lqUF/Jlr66SKf01WXtmNPaQGLur3dTVhu/PI=", "owner": "IvanMalison", "repo": "nixpkgs", - "rev": "b6eeca1e7322e74520eb518cebda8c9596dd55b9", + "rev": "61f1957543827cf21b8c1ee999495289518e9361", "type": "github" }, "original": { @@ -74,7 +74,7 @@ }, "nixpkgs_4": { "locked": { - "narHash": "sha256-gwxwBk2lHoNEXXh/318n57jVLIGjrXxAhMrYaPkIdsM=", + "narHash": "sha256-vAvfFQe4KHWheJHI4cEc2CYTzXnuRAvPu/bTH4GXhcc=", "path": "/home/imalison/Projects/nixpkgs", "type": "path" }, @@ -85,7 +85,7 @@ }, "nixpkgs_5": { "locked": { - "narHash": "sha256-gwxwBk2lHoNEXXh/318n57jVLIGjrXxAhMrYaPkIdsM=", + "narHash": "sha256-vAvfFQe4KHWheJHI4cEc2CYTzXnuRAvPu/bTH4GXhcc=", "path": "/home/imalison/Projects/nixpkgs", "type": "path" }, diff --git a/nixos/fonts.nix b/nixos/fonts.nix index c5b3a892..a094b5ac 100644 --- a/nixos/fonts.nix +++ b/nixos/fonts.nix @@ -21,7 +21,7 @@ allowBitmaps = true; useEmbeddedBitmaps = true; defaultFonts = { - monospace = [ "Source Code Pro" ]; + monospace = [ "Fira Code" ]; sansSerif = [ "Roboto" ]; serif = [ "Source Serif Pro" ]; }; From 32871ac2b1dfff69565ba765f5d4b7e0d3368bc0 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 12 Jul 2021 20:00:44 -0600 Subject: [PATCH 4/9] [rofi] Yellow fg --- dotfiles/config/rofi/colorful/colors.rasi | 2 +- dotfiles/config/rofi/colorful/style_10.rasi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dotfiles/config/rofi/colorful/colors.rasi b/dotfiles/config/rofi/colorful/colors.rasi index ae459fc4..9c8280e7 100644 --- a/dotfiles/config/rofi/colorful/colors.rasi +++ b/dotfiles/config/rofi/colorful/colors.rasi @@ -5,5 +5,5 @@ bg: #000000ff; se: #101010ff; fg: #FFFFFFff; - ac: #42A5F5ff; + ac: #FFFF00ff; } diff --git a/dotfiles/config/rofi/colorful/style_10.rasi b/dotfiles/config/rofi/colorful/style_10.rasi index b59039f6..e92ee764 100644 --- a/dotfiles/config/rofi/colorful/style_10.rasi +++ b/dotfiles/config/rofi/colorful/style_10.rasi @@ -32,7 +32,7 @@ prompt { enabled: true; padding: 1% 0.75% 1% 0.75%; background-color: @ac; - text-color: @fg; + text-color: @bg; border-radius: 100%; } From beacddbe25e921f3df815d44749e3f4dbe7b5d84 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 12 Jul 2021 20:05:55 -0600 Subject: [PATCH 5/9] [NixOS] Fonts is not needed in nixos --- nixos/raspberry-pi.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix index fe949127..00640ba3 100644 --- a/nixos/raspberry-pi.nix +++ b/nixos/raspberry-pi.nix @@ -3,7 +3,6 @@ { imports = [ ./base.nix - ./fonts.nix ]; hardware.raspberry-pi."4".fkms-3d.enable = true; From 91b76c517596072e2cc3b36833dd4d2495ab53c0 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 12 Jul 2021 20:12:07 -0600 Subject: [PATCH 6/9] [NixOS] Fixing file structure --- nixos/fonts.nix | 1 + nixos/full.nix | 1 + nixos/minimal.nix | 255 ---------------------------------------------- 3 files changed, 2 insertions(+), 255 deletions(-) delete mode 100644 nixos/minimal.nix diff --git a/nixos/fonts.nix b/nixos/fonts.nix index a094b5ac..b3e28868 100644 --- a/nixos/fonts.nix +++ b/nixos/fonts.nix @@ -7,6 +7,7 @@ fonts = with pkgs; [ dejavu_fonts emojione + fira-code fira-mono font-awesome-ttf noto-fonts-emoji diff --git a/nixos/full.nix b/nixos/full.nix index 4cefbab7..9a60cba2 100644 --- a/nixos/full.nix +++ b/nixos/full.nix @@ -6,6 +6,7 @@ ./base.nix ./code.nix ./essential-no-arm.nix + ./extra.nix ./internet-computer.nix ]; } diff --git a/nixos/minimal.nix b/nixos/minimal.nix deleted file mode 100644 index ead98539..00000000 --- a/nixos/minimal.nix +++ /dev/null @@ -1,255 +0,0 @@ -{ config, pkgs, options, ... }: -{ - - nixpkgs.overlays = [ - (import ./overlays.nix) - (import ../dotfiles/config/taffybar/taffybar/overlay.nix) - (import ../dotfiles/config/xmonad/overlay.nix) - (import ../dotfiles/config/taffybar/overlay.nix) - ]; - - # Allow all the things - nixpkgs.config.allowUnfree = true; - - # Disabling these waits disables the stuck on boot up issue - systemd.services.systemd-udev-settle.enable = false; - systemd.services.NetworkManager-wait-online.enable = false; - networking.firewall.enable = false; - - # Security - security.sudo.wheelNeedsPassword = false; - programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; - services.pcscd.enable = true; - - # Networking - environment.etc."ipsec.secrets".text = '' - include ipsec.d/ipsec.nm-l2tp.secrets - ''; - networking.networkmanager = { - enable = true; - }; - - # Audio - sound.enable = true; - hardware.pulseaudio.enable = true; - - # Video - hardware.opengl.driSupport32Bit = true; - - # Bluetooth - hardware.bluetooth.enable = true; - services.blueman.enable = true; - - # Keyboard - console.keyMap = "us"; - - fonts = { - fonts = with pkgs; [ - dejavu_fonts - emojione - fira-mono - font-awesome-ttf - noto-fonts-emoji - roboto - source-code-pro - source-sans-pro - source-serif-pro - # twemoji-color-font - ]; - fontconfig = { - allowBitmaps = true; - useEmbeddedBitmaps = true; - defaultFonts = { - monospace = [ "Source Code Pro" ]; - sansSerif = [ "Roboto" ]; - serif = [ "Source Serif Pro" ]; - }; - }; - }; - - environment.systemPackages = with pkgs; [ - - # Applications - alacritty - emacs - firefox - google-chrome - yubikey-manager - - - # Haskell Desktop - haskellPackages.imalison-xmonad - haskellPackages.imalison-taffybar - # notifications-tray-icon - haskellPackages.status-notifier-item - haskellPackages.xmonad - haskellPackages.dbus-hslogger - - # Desktop - autorandr - libnotify - lxqt.lxqt-powermanagement - networkmanagerapplet - notify-osd-customizable - pasystray - picom - pinentry - pommed_light - rofi - rofi-pass - rofi-systemd - udiskie - volnoti - - # xorg - wmctrl - xclip - xdotool - xorg.xev - xorg.xkbcomp - xorg.xwininfo - xsettingsd - - - # Haskell - cabal-install - cabal2nix - ghc - # stack - haskellPackages.hpack - haskellPackages.hasktags - haskellPackages.hoogle - - # Rust - cargo - rustc - rustfmt - - # Tools - automake - bind - binutils - cmake - dex - direnv - dpkg - fd - file - gcc - gdb - gitAndTools.git-crypt - gitAndTools.git-extras - gitAndTools.hub - gitFull - glxinfo - gnumake - gnupg - gparted - htop - inetutils - inotify-tools - ispell - jq - libtool - lsof - ncdu - openvpn - parallel - pass - patchelf - pciutils - prometheus - pscircle - pstree - rcm - scrot - silver-searcher - swig - tmux - tzupdate - unzip - usbutils - wget - yubikey-manager - - # Nix - nix-prefetch-git - cachix - - # Miscellaneous - android-udev-rules - librsvg - - ic-keysmith - quill - ]; - - programs.zsh.enable = true; - - # TODO: Add a comment explaining what this does. - services.gnome.at-spi2-core.enable = true; - - services.xserver = { - exportConfiguration = true; - enable = true; - layout = "us"; - desktopManager = { - plasma5.enable = true; - }; - windowManager = { - session = [ - { - name = "xmonad"; - start = '' - /usr/bin/env imalison-xmonad & - waitPID=$! - ''; - } - ]; - }; - displayManager = { - sddm = { - enable = true; - }; - sessionCommands = '' - systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH - ''; - }; - }; - - users.extraUsers = let - extraGroups = [ - "audio" - "adbusers" - "disk" - "docker" - "networkmanager" - "plugdev" - "systemd-journal" - "video" - "wheel" - ]; - userDefaults = { - inherit extraGroups; - group = "users"; - isNormalUser = true; - createHome = true; - shell = pkgs.zsh; - }; - in { - imalison = userDefaults // { - name = "imalison"; - uid = 1000; - home = "/home/imalison"; - shell = pkgs.zsh; - }; - kat = userDefaults // { - name = "kat"; - uid = 1001; - home = "/home/kat"; - shell = pkgs.zsh; - }; - }; - - nix.trustedUsers = ["imalison" "kat"]; -} From 417524f92ad2b434ec35342d9f5999d42f869305 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 12 Jul 2021 23:18:11 -0600 Subject: [PATCH 7/9] [Emacs] Try to fix gh-pages build --- dotfiles/emacs.d/README.org | 5 +++++ gen-gh-pages/compile.sh | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 11cf976f..509ed29b 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -3002,6 +3002,11 @@ Intero seems to be causing hangs, so it has been disabled (("C-e" . end-of-visual-line))) :preface (progn + (require 'cl-lib) + (defun imalison:maybe-symbol-name (arg) + (if (symbolp arg) + (symbol-name arg) + arg)) ;; XXX: These should probably be moved to config, right? (setq org-startup-indented nil org-startup-folded t diff --git a/gen-gh-pages/compile.sh b/gen-gh-pages/compile.sh index f82d7659..37eda32a 100755 --- a/gen-gh-pages/compile.sh +++ b/gen-gh-pages/compile.sh @@ -10,7 +10,8 @@ evm config path /tmp evm install emacs-25.1-travis --use --skip export EMACS="$(evm bin)" -curl -fsSkL https://raw.github.com/cask/cask/master/go | python +git clone https://github.com/cask/cask +export PATH=$(pwd)/cask/bin:$PATH cask install cask exec "$EMACS" --script generate-html.el From ff6d984d4c943cd5bfe7b6736686fd88465da84c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 13 Jul 2021 03:37:03 -0600 Subject: [PATCH 8/9] [NixOS] Move to home-manager --- dotfiles/config/rofi/colorful/colors.rasi | 2 +- .../config/systemd/user/alarm-clock.service | 12 ---- .../config/systemd/user/chromix-too.service | 12 ---- dotfiles/config/systemd/user/clipit.service | 12 ---- dotfiles/config/systemd/user/discord.service | 11 ---- .../config/systemd/user/git-sync@.service | 12 ---- .../systemd/user/github-notifications.service | 12 ---- dotfiles/config/systemd/user/gitter.service | 11 ---- .../config/systemd/user/kdeconnect.service | 12 ---- .../systemd/user/lxqt-powermanagement.service | 12 ---- dotfiles/config/systemd/user/mopidy.service | 10 --- .../config/systemd/user/nm-applet.service | 12 ---- .../config/systemd/user/notify-osd.service | 10 --- .../config/systemd/user/pasystray.service | 12 ---- dotfiles/config/systemd/user/picom.service | 10 --- .../config/systemd/user/skippy-xd.service | 12 ---- .../user/status-notifier-watcher.service | 10 --- dotfiles/config/systemd/user/taffybar.service | 15 ----- dotfiles/config/systemd/user/udiskie.service | 11 ---- dotfiles/config/systemd/user/volnoti.service | 10 --- .../config/systemd/user/wallpaper.service | 9 --- dotfiles/config/systemd/user/wallpaper.timer | 9 --- dotfiles/config/systemd/user/wm.target | 3 - .../config/systemd/user/xsettingsd.service | 9 --- .../config/taffybar/imalison-taffybar.cabal | 2 +- dotfiles/config/taffybar/taffybar.hs | 3 +- dotfiles/config/xmonad/build | 10 --- dotfiles/config/xmonad/xmonad.hs | 14 ++-- dotfiles/xsession | 1 + nixos/essential.nix | 2 +- nixos/flake.lock | 25 ++++++- nixos/flake.nix | 17 +++-- nixos/home-manager.nix | 66 +++++++++++++++++++ nixos/users.nix | 7 ++ 34 files changed, 119 insertions(+), 278 deletions(-) delete mode 100644 dotfiles/config/systemd/user/alarm-clock.service delete mode 100644 dotfiles/config/systemd/user/chromix-too.service delete mode 100644 dotfiles/config/systemd/user/clipit.service delete mode 100644 dotfiles/config/systemd/user/discord.service delete mode 100644 dotfiles/config/systemd/user/git-sync@.service delete mode 100644 dotfiles/config/systemd/user/github-notifications.service delete mode 100644 dotfiles/config/systemd/user/gitter.service delete mode 100644 dotfiles/config/systemd/user/kdeconnect.service delete mode 100644 dotfiles/config/systemd/user/lxqt-powermanagement.service delete mode 100644 dotfiles/config/systemd/user/mopidy.service delete mode 100644 dotfiles/config/systemd/user/nm-applet.service delete mode 100644 dotfiles/config/systemd/user/notify-osd.service delete mode 100644 dotfiles/config/systemd/user/pasystray.service delete mode 100644 dotfiles/config/systemd/user/picom.service delete mode 100644 dotfiles/config/systemd/user/skippy-xd.service delete mode 100644 dotfiles/config/systemd/user/status-notifier-watcher.service delete mode 100644 dotfiles/config/systemd/user/taffybar.service delete mode 100644 dotfiles/config/systemd/user/udiskie.service delete mode 100644 dotfiles/config/systemd/user/volnoti.service delete mode 100644 dotfiles/config/systemd/user/wallpaper.service delete mode 100644 dotfiles/config/systemd/user/wallpaper.timer delete mode 100644 dotfiles/config/systemd/user/wm.target delete mode 100644 dotfiles/config/systemd/user/xsettingsd.service delete mode 100755 dotfiles/config/xmonad/build create mode 100644 nixos/home-manager.nix diff --git a/dotfiles/config/rofi/colorful/colors.rasi b/dotfiles/config/rofi/colorful/colors.rasi index 9c8280e7..89a18f02 100644 --- a/dotfiles/config/rofi/colorful/colors.rasi +++ b/dotfiles/config/rofi/colorful/colors.rasi @@ -2,7 +2,7 @@ * { al: #00000000; - bg: #000000ff; + bg: #00000099; se: #101010ff; fg: #FFFFFFff; ac: #FFFF00ff; diff --git a/dotfiles/config/systemd/user/alarm-clock.service b/dotfiles/config/systemd/user/alarm-clock.service deleted file mode 100644 index d7868bd6..00000000 --- a/dotfiles/config/systemd/user/alarm-clock.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Alarm Clock -Wants=taffybar.service -After=status-notifier-watcher.service - -[Service] -Type=simple -ExecStart=/usr/bin/env alarm-clock-applet -ExecStop=/usr/bin/env pkill alarm-clock-applet - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/chromix-too.service b/dotfiles/config/systemd/user/chromix-too.service deleted file mode 100644 index a38380b7..00000000 --- a/dotfiles/config/systemd/user/chromix-too.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=chromix-too -Wants=taffybar.service -After=taffybar.service - -[Service] -Type=simple -ExecStart=/usr/bin/env chromix-too-server -ExecStop=/usr/bin/env pkill chromix-too - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/clipit.service b/dotfiles/config/systemd/user/clipit.service deleted file mode 100644 index 3180da1f..00000000 --- a/dotfiles/config/systemd/user/clipit.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=clipit -Wants=taffybar.service -After=taffybar.service - -[Service] -Type=simple -ExecStart=/usr/bin/env clipit -ExecStop=/usr/bin/env pkill clipit - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/discord.service b/dotfiles/config/systemd/user/discord.service deleted file mode 100644 index 1290ea85..00000000 --- a/dotfiles/config/systemd/user/discord.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=discord -Wants=taffybar.service -After=taffybar.service - -[Service] -ExecStart=/usr/bin/env run_unity.sh discord -Restart=always - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/git-sync@.service b/dotfiles/config/systemd/user/git-sync@.service deleted file mode 100644 index 0ce1a70d..00000000 --- a/dotfiles/config/systemd/user/git-sync@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=git-sync %f %I %i - -[Service] -Type=simple -ExecStart=/usr/bin/env git_sync_directory.sh %f -ExecStop=/usr/bin/env pkill git_sync_directory.sh -Restart=always -RestartSec=3 - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/github-notifications.service b/dotfiles/config/systemd/user/github-notifications.service deleted file mode 100644 index bbf3da89..00000000 --- a/dotfiles/config/systemd/user/github-notifications.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=github-notifications -Wants=taffybar.service -After=taffybar.service - -[Service] -Type=simple -ExecStart=/usr/bin/env notifications-tray-icon --github-token-pass github-token -ExecStop=/usr/bin/env pkill 'notifications-tray-icon --github-token-pass github-token' - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/gitter.service b/dotfiles/config/systemd/user/gitter.service deleted file mode 100644 index e193e1b2..00000000 --- a/dotfiles/config/systemd/user/gitter.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=gitter -Wants=taffybar.service -After=taffybar.service - -[Service] -ExecStart=/usr/bin/env Gitter -Restart=always - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/kdeconnect.service b/dotfiles/config/systemd/user/kdeconnect.service deleted file mode 100644 index 4f84894e..00000000 --- a/dotfiles/config/systemd/user/kdeconnect.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=KDE Connect -Wants=taffybar.service -After=taffybar.service - -[Service] -Type=simple -ExecStart=/usr/bin/env kdeconnect-indicator -ExecStop=/usr/bin/env pkill kdeconnect-indicator - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/lxqt-powermanagement.service b/dotfiles/config/systemd/user/lxqt-powermanagement.service deleted file mode 100644 index b6c533ef..00000000 --- a/dotfiles/config/systemd/user/lxqt-powermanagement.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=lxqt-powermanagement -Wants=taffybar.service -After=taffybar.service - -[Service] -Type=simple -ExecStart=/usr/bin/env lxqt-powermanagement -ExecStop=/usr/bin/env pkill lxqt-powermanagement - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/mopidy.service b/dotfiles/config/systemd/user/mopidy.service deleted file mode 100644 index fddfda4d..00000000 --- a/dotfiles/config/systemd/user/mopidy.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=mopidy - -[Service] -Type=simple -ExecStart=/usr/bin/env mopidy -ExecStop=/usr/bin/env pkill mopidy - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/nm-applet.service b/dotfiles/config/systemd/user/nm-applet.service deleted file mode 100644 index 243415f3..00000000 --- a/dotfiles/config/systemd/user/nm-applet.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NM Applet -Wants=taffybar.service -After=taffybar.service - -[Service] -Type=simple -ExecStart=/usr/bin/env nm-applet --sm-disable --indicator -ExecStop=/usr/bin/env pkill nm-applet - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/notify-osd.service b/dotfiles/config/systemd/user/notify-osd.service deleted file mode 100644 index 53364055..00000000 --- a/dotfiles/config/systemd/user/notify-osd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=notify-osd - -[Service] -Type=simple -ExecStart=/usr/bin/env notify-osd -ExecStop=/usr/bin/env pkill notify-osd - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/pasystray.service b/dotfiles/config/systemd/user/pasystray.service deleted file mode 100644 index 3997b938..00000000 --- a/dotfiles/config/systemd/user/pasystray.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Pulse Audio System Tray -Wants=taffybar.service -After=taffybar.service - -[Service] -Type=simple -ExecStart=/usr/bin/env pasystray -ExecStop=/usr/bin/env pkill pasystray - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/picom.service b/dotfiles/config/systemd/user/picom.service deleted file mode 100644 index 8ad2b630..00000000 --- a/dotfiles/config/systemd/user/picom.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=picom - -[Service] -Type=simple -ExecStart=/usr/bin/env picom -cC -ExecStop=/usr/bin/env pkill picom - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/skippy-xd.service b/dotfiles/config/systemd/user/skippy-xd.service deleted file mode 100644 index 0c7c6cb5..00000000 --- a/dotfiles/config/systemd/user/skippy-xd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=skippy-xd -Wants=taffybar.service -After=taffybar.service - -[Service] -Type=simple -ExecStart=/usr/bin/env skippy-xd --start-daemon -ExecStop=/usr/bin/env pkill skippy-xd - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/status-notifier-watcher.service b/dotfiles/config/systemd/user/status-notifier-watcher.service deleted file mode 100644 index 7a6d6d8f..00000000 --- a/dotfiles/config/systemd/user/status-notifier-watcher.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=status-notifier-watcher - -[Service] -Type=simple -ExecStart=/usr/bin/env status-notifier-watcher -ExecStop=/usr/bin/env pkill status-notifier-watcher - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/taffybar.service b/dotfiles/config/systemd/user/taffybar.service deleted file mode 100644 index 7fd218ff..00000000 --- a/dotfiles/config/systemd/user/taffybar.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=taffybar -Wants=status-notifier-watcher.service -After=status-notifier-watcher.service - -[Service] -Type=notify -ExecStart=/usr/bin/env imalison-taffybar -ExecStop=/usr/bin/env pkill imalison-taffybar -Restart=always -RestartSec=3 -NotifyAccess=all - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/udiskie.service b/dotfiles/config/systemd/user/udiskie.service deleted file mode 100644 index 7bb9d699..00000000 --- a/dotfiles/config/systemd/user/udiskie.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=udiskie -Wants=taffybar.service -After=taffybar.service - -[Service] -ExecStart=/usr/bin/env udiskie --tray --appindicator -Restart=always - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/volnoti.service b/dotfiles/config/systemd/user/volnoti.service deleted file mode 100644 index 99fa49e4..00000000 --- a/dotfiles/config/systemd/user/volnoti.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=volnoti - -[Service] -Type=simple -ExecStart=/usr/bin/env volnoti -n -v -ExecStop=/usr/bin/env pkill volnoti - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/wallpaper.service b/dotfiles/config/systemd/user/wallpaper.service deleted file mode 100644 index 967bc768..00000000 --- a/dotfiles/config/systemd/user/wallpaper.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=wallpaper - -[Service] -Type=oneshot -ExecStart=/usr/bin/env wallpaper.sh - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/wallpaper.timer b/dotfiles/config/systemd/user/wallpaper.timer deleted file mode 100644 index 26865d9b..00000000 --- a/dotfiles/config/systemd/user/wallpaper.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Switch Wallpapers Every 15 minutes - -[Timer] -OnUnitActiveSec=5min -OnBootSec=0min - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/systemd/user/wm.target b/dotfiles/config/systemd/user/wm.target deleted file mode 100644 index 4a4ab2e4..00000000 --- a/dotfiles/config/systemd/user/wm.target +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Description=Window Manager -AllowIsolate=yes diff --git a/dotfiles/config/systemd/user/xsettingsd.service b/dotfiles/config/systemd/user/xsettingsd.service deleted file mode 100644 index edb48588..00000000 --- a/dotfiles/config/systemd/user/xsettingsd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=X Settings Daemon - -[Service] -ExecStart=/usr/bin/env xsettingsd-setup -ExecStop=/usr/bin/env pkill xsettingsd - -[Install] -WantedBy=wm.target diff --git a/dotfiles/config/taffybar/imalison-taffybar.cabal b/dotfiles/config/taffybar/imalison-taffybar.cabal index ad64687b..ad57320f 100644 --- a/dotfiles/config/taffybar/imalison-taffybar.cabal +++ b/dotfiles/config/taffybar/imalison-taffybar.cabal @@ -10,7 +10,7 @@ build-type: Simple extra-source-files: README.org cabal-version: >=1.10 -executable imalison-taffybar +executable taffybar hs-source-dirs: . main-is: taffybar.hs ghc-options: -threaded -rtsopts -with-rtsopts=-N diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index 2f66469f..60f75185 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -145,7 +145,7 @@ main = do (\size _ -> lift $ loadPixbufByName size "application-default-icon") layout = layoutNew defaultLayoutConfig windows = windowsNew defaultWindowsConfig - notifySystemD = void $ runCommandFromPath ["systemd-notify", "--ready"] + myWorkspacesConfig = defaultWorkspacesConfig { underlineHeight = 3 @@ -229,7 +229,6 @@ main = do -- , startWidgets = [] } startTaffybar $ - appendHook notifySystemD $ appendHook (void $ getHost False) $ withLogServer $ withToggleServer $ diff --git a/dotfiles/config/xmonad/build b/dotfiles/config/xmonad/build deleted file mode 100755 index a0f68d10..00000000 --- a/dotfiles/config/xmonad/build +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -SRC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -output_file=$1; shift - -cd "$SRC_DIR" -exe_location="$SRC_DIR/result/bin/imalison-xmonad" -nix-build -cp -f "$exe_location" "$output_file" diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs index 5c475ff6..160358a8 100644 --- a/dotfiles/config/xmonad/xmonad.hs +++ b/dotfiles/config/xmonad/xmonad.hs @@ -34,6 +34,8 @@ import System.IO.Unsafe import System.Process import Text.Printf import Unsafe.Coerce +import XMonad.Main (launch) +import XMonad.Core (getDirectories) import XMonad hiding ( (|||) ) import XMonad.Actions.CycleWS hiding (nextScreen) import XMonad.Actions.CycleWorkspaceByScreen @@ -100,14 +102,10 @@ myConfig = def myNavigation2DConfig = def { defaultTiledNavigation = centerNavigation } -main = - xmonad . - docks . - pagerHints . - ewmh . - withNavigation2DConfig myNavigation2DConfig $ - myConfig - +main = do + dirs <- getDirectories + (flip launch dirs) . docks . pagerHints . ewmh . withNavigation2DConfig myNavigation2DConfig $ myConfig + -- Utility functions -- Log to a file from anywhere diff --git a/dotfiles/xsession b/dotfiles/xsession index e69de29b..5b690c17 100644 --- a/dotfiles/xsession +++ b/dotfiles/xsession @@ -0,0 +1 @@ +ROFI_SYSTEMD_TERM=alacritty diff --git a/nixos/essential.nix b/nixos/essential.nix index 41d2dbe9..a0bd80ac 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -70,7 +70,7 @@ in # Tools binutils - # direnv + gawk gitFull htop ncdu diff --git a/nixos/flake.lock b/nixos/flake.lock index 8d9ac2ff..06c56a46 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -19,6 +19,26 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1626168714, + "narHash": "sha256-LivElv4aPfojh8HxJy6VAmDAf7zA40S7jGGSV7+wLvg=", + "owner": "IvanMalison", + "repo": "home-manager", + "rev": "557c159dfaf17eff3bd55ad6e8433bf59f40fab0", + "type": "github" + }, + "original": { + "owner": "IvanMalison", + "repo": "home-manager", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1625333638, @@ -74,7 +94,7 @@ }, "nixpkgs_4": { "locked": { - "narHash": "sha256-vAvfFQe4KHWheJHI4cEc2CYTzXnuRAvPu/bTH4GXhcc=", + "narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=", "path": "/home/imalison/Projects/nixpkgs", "type": "path" }, @@ -85,7 +105,7 @@ }, "nixpkgs_5": { "locked": { - "narHash": "sha256-vAvfFQe4KHWheJHI4cEc2CYTzXnuRAvPu/bTH4GXhcc=", + "narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=", "path": "/home/imalison/Projects/nixpkgs", "type": "path" }, @@ -96,6 +116,7 @@ }, "root": { "inputs": { + "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "taffybar": "taffybar", diff --git a/nixos/flake.nix b/nixos/flake.nix index e6948a88..c4306227 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -13,11 +13,18 @@ url = path:../dotfiles/config/xmonad/xmonad; }; nixos-hardware.url = github:nixos/nixos-hardware; + home-manager = { + url = github:IvanMalison/home-manager; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, nixos-hardware, taffybar, xmonad, xmonad-contrib }: - let tweaks = ({...}: { + outputs = { self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad, xmonad-contrib }: + let forAll = ({...}: { nix.registry.nixpkgs.flake = nixpkgs; nixpkgs.overlays = [ taffybar.overlay xmonad.overlay xmonad-contrib.overlay ]; + imports = [ + home-manager.nixosModule + ]; }); piHardware = ({ ... }: { imports = [ @@ -29,15 +36,15 @@ nixosConfigurations = { ivanm-dfinity-razer = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ tweaks ./machines/ivanm-dfinity-razer.nix ]; + modules = [ forAll ./machines/ivanm-dfinity-razer.nix ]; }; ryzen-shine = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ tweaks ./machines/ryzen-shine.nix ]; + modules = [ forAll ./machines/ryzen-shine.nix ]; }; biskcomp = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; - modules = [ tweaks piHardware ./machines/biskcomp.nix ]; + modules = [ forAll piHardware ./machines/biskcomp.nix ]; }; }; }; diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix new file mode 100644 index 00000000..8dc3a1be --- /dev/null +++ b/nixos/home-manager.nix @@ -0,0 +1,66 @@ +{ pkgs, ... }: { + home.sessionVariablesExtra = '' + ROFI_SYSTEMD_TERM="alacritty" + ''; + + xsession = { + preferStatusNotifierItems = true; + }; + home.emptyActivationPath = false; + programs.home-manager.enable = true; + + programs.ssh = { + forwardAgent = true; + }; + + # programs.zsh = { + # enable = true; + # }; + + services.gpg-agent = { + enable = true; + defaultCacheTtl = 8 * 60 * 60; + maxCacheTtl = 8 * 60 * 60; + enableSshSupport = true; + }; + + services.picom = { + enable = true; + }; + + services.blueman-applet = { + enable = true; + }; + + services.taffybar = { + enable = true; + package = pkgs.haskellPackages.imalison-taffybar; + }; + + # notifyosd + # skippyxd + # volnoti + + services.kdeconnect = { + enable = true; + indicator = true; + }; + + services.network-manager-applet.enable = true; + + services.udiskie = { + enable = true; + tray = "always"; + }; + + services.status-notifier-watcher.enable = true; + + services.random-background = { + enable = true; + display = "center"; + interval = "1h"; + imageDirectory = "%h/Pictures/wallpaper/use"; + }; + + services.xsettingsd.enable = true; +} diff --git a/nixos/users.nix b/nixos/users.nix index e62f25da..3537e9a4 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -24,6 +24,9 @@ imalison = userDefaults // { name = "imalison"; shell = pkgs.zsh; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICzGkqGJm+nrMvsrfuWOLVxXHvi0UL1ULJmyfzS9sKpy imalison@biskcomp.local" + ]; }; kat = userDefaults // { name = "kat"; @@ -31,5 +34,9 @@ }; }; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.imalison = import ./home-manager.nix; + nix.trustedUsers = ["imalison" "kat"]; } From 02528907eba0686ef49689e3d2cd14e194d9e030 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 13 Jul 2021 10:47:09 -0600 Subject: [PATCH 9/9] [NixOS] Fix rofi-systemd term --- dotfiles/xprofile | 11 ----------- dotfiles/xsession | 1 - nixos/home-manager.nix | 10 ++++++---- 3 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 dotfiles/xprofile delete mode 100644 dotfiles/xsession diff --git a/dotfiles/xprofile b/dotfiles/xprofile deleted file mode 100644 index 82bcdf19..00000000 --- a/dotfiles/xprofile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- mode: sh; -*- - -# If there are issues with path, check /etc/profile for hard overrides of PATH. -. "$HOME/.lib/login.sh" -# XXX: prevents https://github.com/xmonad/xmonad/issues/86 from affecting startup -rm -f ~/.xmonad - -load_xkb_map.sh - -run_if_exists systemctl --user import-environment XDG_DATA_DIRS -run_if_exists systemctl --user start wm.target diff --git a/dotfiles/xsession b/dotfiles/xsession deleted file mode 100644 index 5b690c17..00000000 --- a/dotfiles/xsession +++ /dev/null @@ -1 +0,0 @@ -ROFI_SYSTEMD_TERM=alacritty diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index 8dc3a1be..457b34e9 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -1,11 +1,13 @@ { pkgs, ... }: { - home.sessionVariablesExtra = '' - ROFI_SYSTEMD_TERM="alacritty" - ''; - xsession = { + enable = true; preferStatusNotifierItems = true; + windowManager.command = "${pkgs.haskellPackages.imalison-xmonad}/bin/imalison-xmonad"; + profileExtra = '' + export ROFI_SYSTEMD_TERM="alacritty -e" + ''; }; + home.emptyActivationPath = false; programs.home-manager.enable = true;