From b27c5cf38b5cef5731b5be8ba41e3fa7cb0df293 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Sat, 5 May 2018 16:29:07 +0200 Subject: Group applications by purpose --- gui/apps/dev.nix | 14 ++++++++ gui/apps/file.nix | 32 +++++++++++++++++ gui/apps/web.nix | 17 +++++++++ gui/default.nix | 46 +++---------------------- gui/kitty.nix | 41 ---------------------- gui/pcmanfm.nix | 17 --------- gui/terminal.nix | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ gui/urxvt.nix | 62 --------------------------------- gui/xmonad.nix | 5 +++ gui/zathura.nix | 26 -------------- 10 files changed, 174 insertions(+), 187 deletions(-) create mode 100644 gui/apps/dev.nix create mode 100644 gui/apps/file.nix create mode 100644 gui/apps/web.nix delete mode 100644 gui/kitty.nix delete mode 100644 gui/pcmanfm.nix create mode 100644 gui/terminal.nix delete mode 100644 gui/urxvt.nix delete mode 100644 gui/zathura.nix (limited to 'gui') diff --git a/gui/apps/dev.nix b/gui/apps/dev.nix new file mode 100644 index 0000000..2d7397c --- /dev/null +++ b/gui/apps/dev.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +{ + home = { + packages = with pkgs; [ + # UI dev utilities (language environments are maintained in project specific nix-shells) + zeal + hotspot + qcachegrind + gitg + paraview + ]; + }; +} diff --git a/gui/apps/file.nix b/gui/apps/file.nix new file mode 100644 index 0000000..d366621 --- /dev/null +++ b/gui/apps/file.nix @@ -0,0 +1,32 @@ +{ pkgs, ... }: + +{ + home = { + packages = with pkgs; [ + # browser + pcmanfm + # automounting + gvfs lxmenu-data shared_mime_info + # tools + veracrypt + # viewers + evince + sxiv + mpv + libreoffice + ]; + + sessionVariables = { + # required to enable auto-mounting in pcmanfm + GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; + # use GTK theme in libreoffice + SAL_USE_VCLPLUGIN = "gtk"; + }; + + file.".config/user-dirs.dirs".text = '' + XDG_TEMPLATES_DIR="$HOME/" + XDG_DESKTOP_DIR="$HOME/" + XDG_DOWNLOADS_DIR="$HOME/downloads/" + ''; + }; +} diff --git a/gui/apps/web.nix b/gui/apps/web.nix new file mode 100644 index 0000000..157fbeb --- /dev/null +++ b/gui/apps/web.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: + +{ + home = { + packages = with pkgs; [ + thunderbird + tdesktop + ]; + }; + + programs.firefox = { + enable = true; + enableAdobeFlash = true; + }; + + services.syncthing.enable = true; +} diff --git a/gui/default.nix b/gui/default.nix index d83b10f..72a1590 100644 --- a/gui/default.nix +++ b/gui/default.nix @@ -1,49 +1,13 @@ { pkgs, ... }: { - home = { - packages = with pkgs; [ - # file viewers - sxiv - mpv - paraview - libreoffice - # communication - thunderbird - tdesktop - # UI dev utilities (CLI utilities are added in project specific nix-shells) - zeal - hotspot - qcachegrind - gitg - ]; - - file.".config/user-dirs.dirs".text = '' - XDG_TEMPLATES_DIR="$HOME/" - XDG_DESKTOP_DIR="$HOME/" - XDG_DOWNLOADS_DIR="$HOME/downloads/" - ''; - }; - imports = [ - # desktop environment ./xmonad.nix - ./rofi.nix - ./gtk.nix - # terminals - ./kitty.nix - ./urxvt.nix - # tools + ./terminal.nix ./vim.nix - ./pcmanfm.nix - # file viewers - ./zathura.nix + # applications grouped by purpose + ./apps/file.nix + ./apps/web.nix + ./apps/dev.nix ]; - - services.syncthing.enable = true; - - programs.firefox = { - enable = true; - enableAdobeFlash = true; - }; } diff --git a/gui/kitty.nix b/gui/kitty.nix deleted file mode 100644 index 46abef2..0000000 --- a/gui/kitty.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ pkgs, ... }: - -{ - home = { - packages = [ pkgs.kitty ]; - - file.".config/kitty/kitty.conf".text = '' - font_family iosevka - font_size 10 - font_size_delta 1 - adjust_line_height 110% - - background #161616 - foreground #F2F2F2 - # black - color0 #161616 - color8 #F2F2F2 - # red - color1 #8C3346 - color9 #ff0000 - # green - color2 #aadb0f - color10 #909636 - # yellow - color3 #E4E093 - color11 #ffff00 - # blue - color4 #352F6A - color12 #0000ff - # magenta - color5 #ce5c00 - color13 #f57900 - # cyan - color6 #89b6e2 - color14 #46a4ff - # white - color7 #F2F2F2 - color15 #ffffff - ''; - }; -} diff --git a/gui/pcmanfm.nix b/gui/pcmanfm.nix deleted file mode 100644 index 00a1393..0000000 --- a/gui/pcmanfm.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: - -{ - home = { - packages = with pkgs; [ - pcmanfm gvfs lxmenu-data shared_mime_info - veracrypt - ]; - - sessionVariables = { - # required to enable auto-mounting in pcmanfm - GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; - # use GTK theme in libreoffice - SAL_USE_VCLPLUGIN = "gtk"; - }; - }; -} diff --git a/gui/terminal.nix b/gui/terminal.nix new file mode 100644 index 0000000..1213e97 --- /dev/null +++ b/gui/terminal.nix @@ -0,0 +1,101 @@ +{ pkgs, ... }: + +{ + home = { + packages = with pkgs; [ + kitty + rxvt_unicode + ]; + + file.".config/kitty/kitty.conf".text = '' + font_family iosevka + font_size 10 + font_size_delta 1 + adjust_line_height 110% + + background #161616 + foreground #F2F2F2 + # black + color0 #161616 + color8 #F2F2F2 + # red + color1 #8C3346 + color9 #ff0000 + # green + color2 #aadb0f + color10 #909636 + # yellow + color3 #E4E093 + color11 #ffff00 + # blue + color4 #352F6A + color12 #0000ff + # magenta + color5 #ce5c00 + color13 #f57900 + # cyan + color6 #89b6e2 + color14 #46a4ff + # white + color7 #F2F2F2 + color15 #ffffff + ''; + }; + + xresources.extraConfig = '' + URxvt.saveLines: 10000 + URxvt.scrollBar: false + URxvt.font: xft:Iosevka:pixelsize=12 + URxvt.letterSpace: 0 + URxvt.transparent: false + URxvt.inheritPixmap: false + URxvt.fading: 20 + URxvt.dynamicColors: on + + URxvt.perl-ext-common: default,matcher,clipboard,resize-font + URxvt.matcher.button: 1 + URxvt.matcher.pattern.1: \\bwww\\.[\\w-]\\.[\\w./?&@#-]*[\\w/-] + URxvt.url-launcher: firefox + + URxvt.keysym.Control-Up: \033[1;5A + URxvt.keysym.Control-Down: \033[1;5B + URxvt.keysym.Control-Left: \033[1;5D + URxvt.keysym.Control-Right: \033[1;5C + + URxvt.keysym.M-Down: \033[1;3B + URxvt.keysym.M-Up: \033[1;3A + URxvt.keysym.M-Left: \033[1;3D + URxvt.keysym.M-Right: \033[1;3C + + URxvt.keysym.M-c: perl:clipboard:copy + URxvt.keysym.M-v: perl:clipboard:paste + + URxvt.background: #161616 + URxvt.foreground: #F2F2F2 + + ! black + URxvt.color0: #161616 + URxvt.color8: #F2F2F2 + ! red + URxvt.color1: #8C3346 + URxvt.color9: #ff0000 + ! green + URxvt.color2: #aadb0f + URxvt.color10: #909636 + ! yellow + URxvt.color3: #E4E093 + URxvt.color11: #ffff00 + ! blue + URxvt.color4: #352F6A + URxvt.color12: #0000ff + ! magenta + URxvt.color5: #ce5c00 + URxvt.color13: #f57900 + ! cyan + URxvt.color6: #89b6e2 + URxvt.color14: #46a4ff + ! white + URxvt.color7: #F2F2F2 + URxvt.color15: #ffffff + ''; +} diff --git a/gui/urxvt.nix b/gui/urxvt.nix deleted file mode 100644 index 408d5d5..0000000 --- a/gui/urxvt.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = [ pkgs.rxvt_unicode ]; - - xresources.extraConfig = '' - URxvt.saveLines: 10000 - URxvt.scrollBar: false - URxvt.font: xft:Iosevka:pixelsize=12 - URxvt.letterSpace: 0 - URxvt.transparent: false - URxvt.inheritPixmap: false - URxvt.fading: 20 - URxvt.dynamicColors: on - - URxvt.perl-ext-common: default,matcher,clipboard,resize-font - URxvt.matcher.button: 1 - URxvt.matcher.pattern.1: \\bwww\\.[\\w-]\\.[\\w./?&@#-]*[\\w/-] - URxvt.url-launcher: firefox - - URxvt.keysym.Control-Up: \033[1;5A - URxvt.keysym.Control-Down: \033[1;5B - URxvt.keysym.Control-Left: \033[1;5D - URxvt.keysym.Control-Right: \033[1;5C - - URxvt.keysym.M-Down: \033[1;3B - URxvt.keysym.M-Up: \033[1;3A - URxvt.keysym.M-Left: \033[1;3D - URxvt.keysym.M-Right: \033[1;3C - - URxvt.keysym.M-c: perl:clipboard:copy - URxvt.keysym.M-v: perl:clipboard:paste - - URxvt.background: #161616 - URxvt.foreground: #F2F2F2 - - ! black - URxvt.color0: #161616 - URxvt.color8: #F2F2F2 - ! red - URxvt.color1: #8C3346 - URxvt.color9: #ff0000 - ! green - URxvt.color2: #aadb0f - URxvt.color10: #909636 - ! yellow - URxvt.color3: #E4E093 - URxvt.color11: #ffff00 - ! blue - URxvt.color4: #352F6A - URxvt.color12: #0000ff - ! magenta - URxvt.color5: #ce5c00 - URxvt.color13: #f57900 - ! cyan - URxvt.color6: #89b6e2 - URxvt.color14: #46a4ff - ! white - URxvt.color7: #F2F2F2 - URxvt.color15: #ffffff - ''; -} diff --git a/gui/xmonad.nix b/gui/xmonad.nix index da7d73a..c0c4647 100644 --- a/gui/xmonad.nix +++ b/gui/xmonad.nix @@ -1,6 +1,11 @@ { pkgs, ... }: { + imports = [ + ./gtk.nix + ./rofi.nix + ]; + xsession = { enable = true; diff --git a/gui/zathura.nix b/gui/zathura.nix deleted file mode 100644 index 41eefbc..0000000 --- a/gui/zathura.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, ... }: - -{ - home = { - packages = [ pkgs.zathura ]; - - file.".config/zathura/zathurarc".text = '' - set font "Iosevka 14px" - - set inputbar-bg "#161616" - set inputbar-fg "#909737" - - set statusbar-bg "#161616" - set statusbar-fg "#909737" - - set completion-bg "#161616" - set completion-fg "#909737" - - set completion-highlight-bg "#909737" - set completion-highlight-fg "#161616" - - set recolor-lightcolor "#161616" - set recolor-darkcolor "#ffffff" - ''; - }; -} -- cgit v1.2.3