From f7a1794dae4e9d3f5d583b3a2aefb35fa10927f6 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 6 Jan 2023 11:54:52 -0600 Subject: [PATCH] starting the modules system --- pkgs/base-packages.nix | 46 +++++++ pkgs/desktop-packages.nix | 127 ++++++++++++++++++++ system/kaladin/configuration.nix | 197 +----------------------------- system/syl/configuration.nix | 198 +------------------------------ user/home.nix | 139 +++++++++++----------- 5 files changed, 246 insertions(+), 461 deletions(-) create mode 100644 pkgs/base-packages.nix create mode 100644 pkgs/desktop-packages.nix diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix new file mode 100644 index 0000000..4e889b1 --- /dev/null +++ b/pkgs/base-packages.nix @@ -0,0 +1,46 @@ +{ pkgs, config, ... }: + +{ + environment.systemPackages = with pkgs; [ + vim + wget + killall + git + tmux + dutree + cachix + unzip + unrar + p7zip + zip + gzip + usbutils + binutils + podman-compose + exa + # img2pdf + yt-dlp + bat + rsync + jq + ripgrep + fd + socat + ffmpeg-full + imagemagick + libheif + trash-cli + htop + btop + bc + sysstat + procs + pandoc + samba + blesh + # OVMFFull + quickemu + macchina + neofetch + ]; +} diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix new file mode 100644 index 0000000..f543769 --- /dev/null +++ b/pkgs/desktop-packages.nix @@ -0,0 +1,127 @@ +{ pkgs, lib, config, ... }: + +with lib; +{ + environment.systemPackages = with pkgs; [ + discover + # kde-rounded-corners + lightly-qt + pinentry + pinentry-qt + hunspell + caffeine-ng + hunspellDicts.en_US + transmission + openssh + ark + ifuse + dash + brightnessctl + dunst + ttyper + kget + audacity + krename + kwallet-pam + plasma5Packages.kwallet + sierra-breeze-enhanced + libimobiledevice + bottles + # jitsi-meet-electron + imv + feh + tagutil + python310Packages.mutagen + python310Packages.audiotools + (mpv.override {scripts = with pkgs.mpvScripts; [ mpris youtube-quality sponsorblock ];}) + ani-cli + mov-cli + nerdfonts + # latte-dock + plasma-browser-integration + alacritty + libsForQt5.bismuth + libnotify + rofi-wayland + wf-recorder + wofi + waybar + tridactyl-native + eww-wayland + wlrctl + hyprpaper + swaylock-fancy + aha + glxinfo + vulkan-tools + wayland-utils + nextcloud-client + # mkchromecast + plocate + # librepresenter.libre-presenter + papirus-icon-theme + phinger-cursors + plasma-hud + kde-cli-tools + gzip + qrencode + brave + scribus + darktable + qutebrowser + virt-manager + virt-viewer + # firefox + kate + kdialog + plasma5Packages.khotkeys + # openlp + inkscape + libreoffice-fresh + vlc + neochat + haskellPackages.greenclip + pulsemixer + any-nix-shell + wtype + xdotool + # ydotool + wmctrl + xcape + xclip + maim + unclutter-xfixes + bluez-tools + networkmanager_dmenu + plasma5Packages.qt5ct + lxappearance + spotdl + kdenlive + minetest + # natron + digikam + rubberband + texlive.combined.scheme-full + wlroots + picom-next + pamixer + playerctl + jellyfin-mpv-shim + pfetch + macchina + gimp + powertop + element-desktop-wayland + scrcpy + python + python3 + airshipper + # hyprland + (import /home/chris/.dotfiles/ydotool { inherit lib stdenv util-linux cmake scdoc fetchFromGitHub; }) + # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # LightlyShaders + # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # librepresenter + nix-index + sqlite + fennel + ]; +} diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index 34c2802..f57dd37 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -4,6 +4,8 @@ imports = [ ./hardware-configuration.nix + ../../pkgs/base-packages.nix + ../../pkgs/desktop-packages.nix ]; nix = { @@ -237,201 +239,6 @@ dedicatedServer.openFirewall = true; }; - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - vim - wget - killall - git - tmux - dutree - cachix - unzip - unrar - p7zip - zip - gzip - usbutils - binutils - podman-compose - exa - # img2pdf - yt-dlp - bat - rsync - jq - ripgrep - fd - socat - ffmpeg-full - imagemagick - libheif - trash-cli - htop - btop - bc - sysstat - procs - pandoc - samba - blesh - # OVMFFull - quickemu - discover - # kde-rounded-corners - lightly-qt - pinentry - pinentry-qt - hunspell - caffeine-ng - hunspellDicts.en_US - transmission - openssh - ark - ifuse - dash - brightnessctl - dunst - ttyper - kget - audacity - krename - kwallet-pam - plasma5Packages.kwallet - sierra-breeze-enhanced - libimobiledevice - bottles - # jitsi-meet-electron - imv - feh - tagutil - python310Packages.mutagen - python310Packages.audiotools - (mpv.override {scripts = with pkgs.mpvScripts; [ mpris youtube-quality sponsorblock ];}) - ani-cli - mov-cli - nerdfonts - # latte-dock - plasma-browser-integration - alacritty - libsForQt5.bismuth - libnotify - rofi-wayland - wf-recorder - wofi - waybar - tridactyl-native - eww-wayland - wlrctl - hyprpaper - swaylock-fancy - aha - glxinfo - vulkan-tools - wayland-utils - nextcloud-client - # mkchromecast - plocate - # librepresenter.libre-presenter - papirus-icon-theme - phinger-cursors - plasma-hud - kde-cli-tools - gzip - qrencode - brave - scribus - darktable - qutebrowser - virt-manager - virt-viewer - # firefox - kate - kdialog - plasma5Packages.khotkeys - # openlp - inkscape - libreoffice-fresh - vlc - neochat - haskellPackages.greenclip - pulsemixer - any-nix-shell - wtype - xdotool - # ydotool - wmctrl - xcape - xclip - maim - unclutter-xfixes - bluez-tools - networkmanager_dmenu - plasma5Packages.qt5ct - lxappearance - spotdl - kdenlive - minetest - # natron - digikam - rubberband - texlive.combined.scheme-full - wlroots - picom-next - pamixer - playerctl - jellyfin-mpv-shim - pfetch - macchina - gimp - powertop - element-desktop-wayland - scrcpy - python - python3 - airshipper - # hyprland - - blender - neofetch - # ethminer - lutris - protonup - nvtop - # Dev tools - (import /home/chris/.dotfiles/ydotool { inherit lib stdenv util-linux cmake scdoc fetchFromGitHub; }) - # android-tools - nix-index - # meson - # ninja - # gnumake - # gcc - # gdb - # clang - # clang-tools - # cmake - # qtcreator - # extra-cmake-modules - # pkg-config - # libsForQt5.wrapQtAppsHook - # python310Packages.pyqt5 - # LIBRARIES FOR DEV - # qt5.qtbase - # qt5.qtquickcontrols2 - # qt5.qtx11extras - # libsForQt5.appstream-qt - # libsForQt5.kdelibs4support - # libsForQt5.kirigami2 - # libsForQt5.ki18n - # libsForQt5.kcoreaddons - # plasma5Packages.kirigami2 - sqlite - fennel - # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) - # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) - ]; - # nixpkgs.overlays = [ # (import (builtins.fetchTarball { diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index acafaa9..04fbf89 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -256,202 +256,8 @@ # nixpkgs.config.firefox.enableTridactyl = true; - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - vim - wget - killall - git - tmux - dutree - cachix - unzip - unrar - p7zip - zip - gzip - usbutils - binutils - podman-compose - exa - # img2pdf - yt-dlp - bat - rsync - jq - ripgrep - fd - socat - ffmpeg-full - imagemagick - libheif - trash-cli - htop - btop - bc - sysstat - procs - pandoc - samba - blesh - # OVMFFull - quickemu - discover - # kde-rounded-corners - lightly-qt - pinentry - pinentry-qt - hunspell - caffeine-ng - hunspellDicts.en_US - transmission - openssh - ark - ifuse - dash - brightnessctl - dunst - ttyper - kget - audacity - krename - kwallet-pam - plasma5Packages.kwallet - sierra-breeze-enhanced - libimobiledevice - bottles - # jitsi-meet-electron - imv - feh - tagutil - python310Packages.mutagen - python310Packages.audiotools - (mpv.override {scripts = with pkgs.mpvScripts; [ mpris youtube-quality sponsorblock ];}) - ani-cli - mov-cli - nerdfonts - # latte-dock - plasma-browser-integration - alacritty - libsForQt5.bismuth - libnotify - rofi-wayland - wf-recorder - wofi - waybar - tridactyl-native - eww-wayland - wlrctl - hyprpaper - swaylock-fancy - aha - glxinfo - vulkan-tools - wayland-utils - nextcloud-client - # mkchromecast - plocate - # librepresenter.libre-presenter - papirus-icon-theme - phinger-cursors - plasma-hud - kde-cli-tools - gzip - qrencode - brave - scribus - darktable - qutebrowser - virt-manager - virt-viewer - # firefox - kate - kdialog - plasma5Packages.khotkeys - # openlp - inkscape - libreoffice-fresh - vlc - neochat - haskellPackages.greenclip - pulsemixer - any-nix-shell - wtype - xdotool - # ydotool - wmctrl - xcape - xclip - maim - unclutter-xfixes - bluez-tools - networkmanager_dmenu - plasma5Packages.qt5ct - lxappearance - spotdl - kdenlive - minetest - # natron - digikam - rubberband - texlive.combined.scheme-full - wlroots - picom-next - pamixer - playerctl - jellyfin-mpv-shim - pfetch - macchina - gimp - powertop - element-desktop-wayland - scrcpy - python - python3 - airshipper - # hyprland - - neofetch - afetch - yafetch - freshfetch - disfetch - bunnyfetch - fet-sh - macchina - # Dev tools - (import /home/chris/.dotfiles/ydotool { inherit lib stdenv util-linux cmake scdoc fetchFromGitHub; }) - # android-tools - nix-index - # meson - # ninja - # gnumake - # gcc - # gdb - # clang - # clang-tools - # cmake - # qtcreator - # extra-cmake-modules - # pkg-config - # libsForQt5.wrapQtAppsHook - # python310Packages.pyqt5 - # LIBRARIES FOR DEV - # qt5.qtbase - # qt5.qtquickcontrols2 - # qt5.qtx11extras - # libsForQt5.appstream-qt - # libsForQt5.kdelibs4support - # libsForQt5.kirigami2 - # libsForQt5.ki18n - # libsForQt5.kcoreaddons - # plasma5Packages.kirigami2 - sqlite - fennel - # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) - # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) - ]; + import ../../pkgs/base-packges.nix; + import ../../pkgs/desktop-packges.nix; services.emacs = { enable = true; diff --git a/user/home.nix b/user/home.nix index 00aa1ff..4fdccde 100644 --- a/user/home.nix +++ b/user/home.nix @@ -243,7 +243,7 @@ }; home.file.".config/hypr/hyprpaper.conf" = { - source = if builtins.readFile "/etc/hostname" == "syl\n" then /home/chris/.dotfiles/hypr/hyprpaper.conf else /home/chris/.dotfiles/hyprpaper.conf; + source = if builtins.readFile "/etc/hostname" == "syl\n" then /home/chris/.dotfiles/hypr/hyprpaper.conf else /home/chris/.dotfiles/hypr/hyprpaper.conf; }; home.file.".config/hypr/hyprsome" = { source = if builtins.readFile "/etc/hostname" == "syl\n" then /home/chris/.dotfiles/hypr/hyprsome else /home/chris/.dotfiles/hypr/hyprsome; @@ -362,76 +362,75 @@ windowrule=size 80% 80%,presenter windowrule=center,presenter # example binds -bind=SUPER,RETURN,exec,alacritty -bind=SUPER,C,killactive, -bind=SUPERSHIFT,Q,exit, -bind=SUPERSHIFT,D,exec,dolphin -bind=SUPERSHIFT,F,togglefloating, -bindr=SUPER,Super_L,exec,/home/chris/bin/launcher.sh -bindr=ALT,Alt_L,exec,/home/chris/bin/window.sh -bind=SUPER,w,exec,/home/chris/bin/window.sh -bind=SUPER,E,exec,/home/chris/bin/emacslof -bind=SUPER,d,exec,emacsclient -c -e '(dired-jump)' -bind=SUPER,B,exec,/home/chris/bin/fflof -bind=SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer -bind=SUPERCTRL,i,exec,alacritty --class btop -e btop +bind = SUPER,RETURN,exec,alacritty +bind = SUPER,C,killactive, +bind = SUPERSHIFT,Q,exit, +bind = SUPERSHIFT,D,exec,dolphin +bind = SUPERSHIFT,F,togglefloating, +bindr = SUPER,Super_L,exec,/home/chris/bin/launcher.sh +bindr = ALT,Alt_L,exec,/home/chris/bin/window.sh +bind = SUPER,w,exec,/home/chris/bin/window.sh +bind = SUPER,E,exec,/home/chris/bin/emacslof +bind = SUPER,d,exec,emacsclient -c -e '(dired-jump)' +bind = SUPER,B,exec,/home/chris/bin/fflof +bind = SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer +bind = SUPERCTRL,i,exec,alacritty --class btop -e btop -bind=SUPER,P,exec,/home/chris/bin/rbw.sh -bind=SUPER,M,fullscreen,1 -bind=SUPER,F,fullscreen,0 +bind = SUPER,P,exec,/home/chris/bin/rbw.sh +bind = SUPER,M,fullscreen,1 +bind = SUPER,F,fullscreen,0 -bind=SUPER,h,movefocus,l -bind=SUPER,l,movefocus,r -bind=SUPER,k,cyclenext,prev -bind=SUPER,j,cyclenext -bind=SUPERSHIFT,h,movewindow,l -bind=SUPERSHIFT,l,movewindow,r -bind=SUPERSHIFT,k,movewindow,u -bind=SUPERSHIFT,j,movewindow,d -bind=SUPERCTRL,l,splitratio,+0.05 -bind=SUPERCTRL,h,splitratio,-0.05 -bind=SUPERCTRL,c,centerwindow +bind = SUPER,h,movefocus,l +bind = SUPER,l,movefocus,r +bind = SUPER,k,cyclenext,prev +bind = SUPER,j,cyclenext +bind = SUPERSHIFT,h,movewindow,l +bind = SUPERSHIFT,l,movewindow,r +bind = SUPERSHIFT,k,movewindow,u +bind = SUPERSHIFT,j,movewindow,d +bind = SUPERCTRL,l,splitratio,+0.05 +bind = SUPERCTRL,h,splitratio,-0.05 +bind = SUPERCTRL,c,centerwindow -bind=SUPER,1,workspace,1 -bind=SUPER,2,workspace,2 -bind=SUPER,3,workspace,3 -bind=SUPER,4,workspace,4 -bind=SUPER,5,workspace,5 -bind=SUPER,6,workspace,6 -bind=SUPER,7,workspace,7 -bind=SUPER,8,workspace,8 -bind=SUPER,9,workspace,9 -bind=SUPER,0,workspace,10 +bind = SUPER,1,workspace,1 +bind = SUPER,2,workspace,2 +bind = SUPER,3,workspace,3 +bind = SUPER,4,workspace,4 +bind = SUPER,5,workspace,5 +bind = SUPER,6,workspace,6 +bind = SUPER,7,workspace,7 +bind = SUPER,8,workspace,8 +bind = SUPER,9,workspace,9 +bind = SUPER,0,workspace,10 -bind=SUPERALT,l,workspace,m+1 -bind=SUPERALT,h,workspace,m-1 +bind = SUPERALT,l,workspace,m+1 +bind = SUPERALT,h,workspace,m-1 -bind=SUPERSHIFT,1,movetoworkspace,1 -bind=SUPERSHIFT,2,movetoworkspace,2 -bind=SUPERSHIFT,3,movetoworkspace,3 -bind=SUPERSHIFT,4,movetoworkspace,4 -bind=SUPERSHIFT,5,movetoworkspace,5 -bind=SUPERSHIFT,6,movetoworkspace,6 -bind=SUPERSHIFT,7,movetoworkspace,7 -bind=SUPERSHIFT,8,movetoworkspace,8 -bind=SUPERSHIFT,9,movetoworkspace,9 -bind=SUPERSHIFT,0,movetoworkspace,10 +bind = SUPERSHIFT,1,movetoworkspace,1 +bind = SUPERSHIFT,2,movetoworkspace,2 +bind = SUPERSHIFT,3,movetoworkspace,3 +bind = SUPERSHIFT,4,movetoworkspace,4 +bind = SUPERSHIFT,5,movetoworkspace,5 +bind = SUPERSHIFT,6,movetoworkspace,6 +bind = SUPERSHIFT,7,movetoworkspace,7 +bind = SUPERSHIFT,8,movetoworkspace,8 +bind = SUPERSHIFT,9,movetoworkspace,9 +bind = SUPERSHIFT,0,movetoworkspace,10 -bind=SUPER,o,movewindow,mon: next -bind=SUPER,y,togglespecialworkspace -bind=SUPER,i,movewindow,left -bind=SUPERSHIFT,p,pin -bind=SUPER,n,movetoworkspace,special +bind = SUPER,o,movewindow,mon: next +bind = SUPER,y,togglespecialworkspace +bind = SUPER,i,movewindow,left +bind = SUPERSHIFT,p,pin +bind = SUPER,n,movetoworkspace,special -binde=, XF86AudioMute, exec, pamixer -t -binde=, XF86AudioRaiseVolume, exec, /home/chris/bin/volup -binde=, XF86AudioLowerVolume, exec, /home/chris/bin/voldown -binde=,F1, exec, pamixer -t -binde=,F3, exec, /home/chris/bin/volup -binde=,F2, exec, /home/chris/bin/voldown - -binde=, XF86MonBrightnessUp, exec, brightnessctl s +10% -binde=, XF86MonBrightnessDown, exec, brightnessctl s 10%- +binde = , XF86AudioMute, exec, pamixer -t +binde = , XF86AudioRaiseVolume, exec, /home/chris/bin/volup +binde = , XF86AudioLowerVolume, exec, /home/chris/bin/voldown +binde = ,F1, exec, pamixer -t +binde = ,F3, exec, /home/chris/bin/volup +binde = ,F2, exec, /home/chris/bin/voldown +binde = , XF86MonBrightnessUp, exec, brightnessctl s +10% +binde = , XF86MonBrightnessDown, exec, brightnessctl s 10%- bind=SUPERCTRL,b,exec,eww.sh bind=SUPERALT,n,exec,eww update rightside=true @@ -443,12 +442,12 @@ bindm=SUPER,mouse:273,resizewindow # blurls=gtk-layer-shell # blurls=notifications -exec-once=/home/chris/bin/startup.sh -exec-once=hyprpaper -exec-once=dunst -exec-once=hyprctl dispatch --batch "splitratio 1; splitration -0.35" -exec-once=dbus-update-activation-environment --systemd --all -exec-once=jellyfin-mpv-shim +exec-once = /home/chris/bin/startup.sh +exec-once = hyprpaper +exec-once = dunst +exec-once = hyprctl dispatch --batch "splitratio 1; splitration -0.35" +exec-once = dbus-update-activation-environment --systemd --all +exec-once = jellyfin-mpv-shim exec-once = hyprctl setcursor phinger-cursors-light ''; };