From 0699aae4592927742cb84da75da1e1c556324bea Mon Sep 17 00:00:00 2001 From: Zonsopkomst Date: Thu, 14 Sep 2023 11:56:52 -0500 Subject: [PATCH] Maintenance & Clean-Up --- common/hyprland.nix | 14 ++++++++++++ common/terminal.nix | 35 ++++++++++++++++++++++++++++++ flake.nix | 16 ++++++++++---- hosts/local/frija/packages.nix | 4 ---- hosts/local/tyr/packages.nix | 5 ----- hosts/local/weda/packages.nix | 4 ---- hosts/remote/tuisto/packages.nix | 6 ----- reference/Packages/packages.nix | 14 +++++++++++- reference/TODO.org | 12 ++++++++-- users/admin/home-manager.nix | 7 ++---- users/aspire/home-manager.nix | 7 ++---- users/leeuwarden/home-manager.nix | 13 +---------- users/zonsopkomst/home-manager.nix | 32 +++++---------------------- 13 files changed, 94 insertions(+), 75 deletions(-) create mode 100644 common/hyprland.nix create mode 100644 common/terminal.nix diff --git a/common/hyprland.nix b/common/hyprland.nix new file mode 100644 index 0000000..ed6f912 --- /dev/null +++ b/common/hyprland.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + dunst # Notification Daemon + grim # Wayland Image Grab + hyprpaper # Wallpaper Application for Wayland Compositors + rofi # Wayland Launcher/Menu + slurp # screenshot + waybar # Wayland Bar for Wlroots Based Compositors + wbg # Wallpaper Application for Wayland Compositors + wofi # Wayland Launcher/Menu + ]; +} diff --git a/common/terminal.nix b/common/terminal.nix new file mode 100644 index 0000000..109cb66 --- /dev/null +++ b/common/terminal.nix @@ -0,0 +1,35 @@ +{ config, pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + appimage-run # Appimage Runner + asciiquarium # Terminal Aquarium + bash-completion # Bash Autocomplete + bat # cat like concatenate or display command + btop # Resource Monitor + cbonsai # Terminal Bonsai Tree + du-dust # du command replacement + eza # ls like list command + fd # find command + feh # Image Viewer + fzf # Fuzzy Finder in GO + git # Distributed Version Control System + genact # Nonsense Activity Generator + hollywood # Hollywood Melodrama Technobabble + jq # filter data command + neo # Matrix Digital Rain + neofetch # System Information + nitch # Nim System Fetch + nix-bash-completions # Bash Autocomplete + nms # Effect from 1992 Movie Sneakers + pipes # Animated Pipes Terminal Screensaver + ranger # File Manager + ripgrep-all # search command + sd # find & replace command + shell-genie # Natural Language Shell Command AI + tealdeer # tldr command + xcowsay # Graphical Cowsay + xorg.xkill # Kill Windows w/ Mouse + zoxide # fast cd directory command + ]; +} \ No newline at end of file diff --git a/flake.nix b/flake.nix index 447b158..a1ea038 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,11 @@ #./common/kernel.zen.nix #./commmon/swappiness - # Modules + # Common ./common/amd.nix #./common/bluetooth.nix ./common/CUPS.nix + #./common/hyprland.nix ./common/pipewire.nix ./common/time.nix #./common/docker.nix @@ -46,6 +47,7 @@ #./common/gaming.nix #./common/insecure.nix ./common/networking.nix + ./common/terminal.nix ./common/unfree.nix #./common/waydroid.nix ./common/x11.nix @@ -85,10 +87,11 @@ ./common/kernel.zen.nix #./commmon/swappiness - # Modules + # Common #./common/amd.nix #./common/bluetooth.nix ./common/CUPS.nix + #./common/hyprland.nix ./common/pipewire.nix ./common/time.nix ./common/docker.nix @@ -97,6 +100,7 @@ ./common/gaming.nix ./common/insecure.nix ./common/networking.nix + ./common/terminal.nix ./common/unfree.nix #./common/waydroid.nix ./common/x11.nix @@ -137,10 +141,11 @@ #./common/kernel.zen.nix #./commmon/swappiness - # Modules + # Common ./common/amd.nix #./common/bluetooth.nix ./common/CUPS.nix + #./common/hyprland.nix ./common/pipewire.nix ./common/time.nix ./common/docker.nix @@ -149,6 +154,7 @@ ./common/gaming.nix ./common/insecure.nix ./common/networking.nix + ./common/terminal.nix ./common/unfree.nix ./common/waydroid.nix ./common/x11.nix @@ -192,10 +198,11 @@ #./common/kernel.zen.nix #./commmon/swappiness - # Modules + # Common ./common/amd.nix ./common/bluetooth.nix ./common/CUPS.nix + #./common/hyprland.nix ./common/pipewire.nix ./common/time.nix ./common/docker.nix @@ -204,6 +211,7 @@ ./common/gaming.nix ./common/insecure.nix ./common/networking.nix + ./common/terminal.nix ./common/unfree.nix ./common/waydroid.nix ./common/x11.nix diff --git a/hosts/local/frija/packages.nix b/hosts/local/frija/packages.nix index acceb4d..cbe7ed8 100644 --- a/hosts/local/frija/packages.nix +++ b/hosts/local/frija/packages.nix @@ -4,19 +4,15 @@ imports = [ ../../../common/fonts.nix]; environment.systemPackages = with pkgs; [ - appimage-run # Appimage Runner adw-gtk3 # GTK3 libadwaita Theme ported to GTK-3 bleachbit # PC Cleaner - btop # Resource Monitor cpu-x # PC Information dconf # Gnome Configuration - git # Distributed Version Control System gnome.gnome-tweaks # Gnome Customization Tool ntfs3g # FUSE Client p7zip # File Archiver papirus-icon-theme # Icons phinger-cursors # Cursor Theme powertop # Power Manager - xorg.xkill # Kill Windows w/ Mouse ]; } \ No newline at end of file diff --git a/hosts/local/tyr/packages.nix b/hosts/local/tyr/packages.nix index a1f836f..8e809f5 100644 --- a/hosts/local/tyr/packages.nix +++ b/hosts/local/tyr/packages.nix @@ -6,13 +6,10 @@ environment.systemPackages = with pkgs; [ adw-gtk3 # GTK3 libadwaita Theme ported to GTK-3 - appimage-run # Appimage Runner - btop # Resource Monitor bleachbit # PC Cleaner cpu-x # PC Information dconf # Gnome Configuration gamemode # Optimse Linux System Performance - git # Distributed Version Control System gnome.gnome-tweaks # Gnome Customization Tool gsmartcontrol # Disk Health Inspection Tool i2c-tools # Network Utilities @@ -28,8 +25,6 @@ steam # Steam Game Launcher strawberry # Media Player syncthing # File Synchronization - tldr # Simplified man pages - xorg.xkill # Kill Windows w/ Mouse ]; } diff --git a/hosts/local/weda/packages.nix b/hosts/local/weda/packages.nix index 489cd27..a05cb13 100644 --- a/hosts/local/weda/packages.nix +++ b/hosts/local/weda/packages.nix @@ -5,11 +5,8 @@ environment.systemPackages = with pkgs; [ adw-gtk3 # GTK3 libadwaita Theme ported to GTK-3 - appimage-run # Appimage Runner - btop # Resource Monitor cpu-x # PC Information dconf # Gnome Configuration - git # Distributed Version Control System gnome.gnome-tweaks # Gnome Customization Tool gramps # Genealogy Software gsmartcontrol # Disk Health Inspection Tool @@ -24,7 +21,6 @@ protonup # Proton Installer steam # Steam Game Launcher syncthing # File Synchronization - tldr # Simplified man pages waydroid # Android Emulator ]; } diff --git a/hosts/remote/tuisto/packages.nix b/hosts/remote/tuisto/packages.nix index 1ed7919..f47f651 100644 --- a/hosts/remote/tuisto/packages.nix +++ b/hosts/remote/tuisto/packages.nix @@ -5,21 +5,16 @@ environment.systemPackages = with pkgs; [ adw-gtk3 # GTK3 libadwaita Theme ported to GTK-3 - appimage-run # Appimage Runner - btop # Resource Monitor cpu-x # PC Information dconf # Gnome Configuration firefox # Browser gamemode # Optimse Linux System Performance gnome.gnome-tweaks # Gnome Customization Tool - git # Distributed Version Control System gsmartcontrol # Disk Health Inspection Tool hplip # HP Print Drivers i2c-tools # Network Utilities inetutils # Network Utilities libsForQt5.kolourpaint # Painting Application - neofetch # System Information - nitch # Nim System Fetch ntfs3g # FUSE Client p7zip # File Archiver papirus-icon-theme # Icons @@ -28,7 +23,6 @@ protonup # Proton Installer steam # Steam Game Launcher syncthing # File Synchronization - tldr # Simplified man pages waydroid # Android Emulator ]; } diff --git a/reference/Packages/packages.nix b/reference/Packages/packages.nix index 62171ed..e02aa37 100644 --- a/reference/Packages/packages.nix +++ b/reference/Packages/packages.nix @@ -1,5 +1,7 @@ { config, pkgs, ... }: + # The following is a list of packages that I regularly use on different machines with brief discriptions of what function they serve + { # GLOBAL PACKAGES @@ -117,7 +119,7 @@ mumble # Low-latency, high quality voice chat software steam # Steam Game Launcher, using xxx - # Hyperland + # Hyprland dunst # Notification Daemon eww # ElKowars Wacky Widgets grim # Wayland Image Grab @@ -186,6 +188,7 @@ hunspellDicts.en_US # hunspell English obsidian # Markdown Editor onlyoffice-bin # Office Suite + #openbb # Investment Research Tool; NOTE: currently using through docker pdfarranger # PDF Arranger qpdfview # Tabbed PDF Viewer xournalpp # PDF Annotation @@ -256,24 +259,33 @@ # Terminal/CLI Related asciiquarium # Terminal Aquarium bash-completion # Bash Autocomplete + bat # cat like concatenate or display command + du-dust # du command replacement nix-bash-completions # Bash Autocomplete cmatrix # Matrix Digital Rain cbonsai # Terminal Bonsai Tree + eza # ls like list command + fd # find command fzf # Fuzzy Finder in GO genact # Nonsense Activity Generator hollywood # Hollywood Melodrama Technobabble + jq # filter data command kitty # Terminal kitty-themes # Kitty Terminal Themes neo # Matrix Digital Rain nms # Effect from 1992 Movie Sneakers pipes # Animated Pipes Terminal Screensaver ranger # File Manager + ripgrep-all # search command rofi # Wayland Launcher/Menu + sd # find & replace command shell-genie # Natural Language Shell Command AI sl # Terminal Locomotive slurp # Select a Region on the Wayland Compositor + tealdeer # tldr command waybar # Wayland Bar for Wlroots Based Compositors wbg # Wallpaper Application for Wayland Compositors wofi # Wayland Launcher/Menu xcowsay # Graphical Cowsay + zoxide # fast cd directory command } \ No newline at end of file diff --git a/reference/TODO.org b/reference/TODO.org index 9291d17..484284e 100644 --- a/reference/TODO.org +++ b/reference/TODO.org @@ -2,14 +2,19 @@ #+author: Zonsopkomst #+date: 2022-11-30 -* HOLD The Nix Fix +* HOLD optionsDocBook deprecated :issue: +[[Solution][https://discourse.nixos.org/t/warning-optionsdocbook-is-deprecated-since-23-11-and-will-be-removed-in-24-05/31353]] +Nothing to do at this time. Waiting for fix. + +Receive the following output upon rebuild: + + ``` unpacking channels... building the system configuration... trace: warning: optionsDocBook is deprecated since 23.11 and will be removed in 24.05 trace: warning: optionsDocBook is deprecated since 23.11 and will be removed in 24.05 trace: warning: optionsDocBook is deprecated since 23.11 and will be removed in 24.05 - - [[Solution][https://discourse.nixos.org/t/warning-optionsdocbook-is-deprecated-since-23-11-and-will-be-removed-in-24-05/31353]] trace: warning: The option `fonts.enableDefaultFonts' defined in `/nix/store/s4jqyj35hii03rs7j5n6vn7gpgp6ja81-source/flake.nix' has been renamed to `fonts.enableDefaultPackages'. trace: warning: The `waybar-hyprland` package is now in Nixpkgs activating the configuration... @@ -24,6 +29,7 @@ runtime/org.gtk.Gtk3theme.adw-gtk3-dark/x86_64/3.22 runtime/org.gtk.Gtk3theme.adw-gtk3/x86_64/3.22 Nothing unused to uninstall + ``` * HOLD Add Emacs & init.el @@ -192,6 +198,8 @@ Not sure if I want to go there, but maybe for a dedicated website? ** TODO Install on RPI4 [[RPI4][https://nix.dev/tutorials/installing-nixos-on-a-raspberry-pi]] +* DONE Clean up / maintenance on users and hosts + * DONE Declare Configuration Files for: ** DONE Xiphos on all PCs diff --git a/users/admin/home-manager.nix b/users/admin/home-manager.nix index ec03ffb..ea1ad05 100644 --- a/users/admin/home-manager.nix +++ b/users/admin/home-manager.nix @@ -3,7 +3,6 @@ { home-manager.users.admin = { pkgs, ... }: { home.packages = with pkgs; [ - bash-completion # Bash Autocomplete bleachbit # PC Cleaner calibre # eBook Library crow-translate # Language Translator @@ -16,7 +15,6 @@ kitty # Terminal Emulator mpv # Media Player mumble # Low-Latency, High Quality Voice Chat - nix-bash-completions # Bash Autocomplete nomachine-client # NoMachine remote desktop client (nxplayer) onlyoffice-bin # Office Suite pdfarranger # PDF Arranger @@ -30,14 +28,13 @@ veracrypt # Filesystem Encryption vscodium # Code Editor xiphos # Bible Study Tool - xorg.xkill # Kill Windows w/ Mouse xournalpp # PDF Annotation ]; imports = [ - ../../common/vscodium.nix - ../../common/git.nix ../../config/config.nix + ../../common/git.nix + ../../common/vscodium.nix ]; home.stateVersion = "22.11"; diff --git a/users/aspire/home-manager.nix b/users/aspire/home-manager.nix index c8d3eec..ad44efe 100644 --- a/users/aspire/home-manager.nix +++ b/users/aspire/home-manager.nix @@ -3,21 +3,18 @@ { home-manager.users.aspire = { pkgs, ... }: { home.packages = with pkgs; [ - bash-completion # Bash Autocomplete - feh # Image Viewer kitty # Terminal Emulator kitty-themes # Kitty Themes librewolf # Firefox Web Browser Fork tor-browser-bundle-bin # Privacy Web Browser - nix-bash-completions # Bash Autocomplete mpv # Media Player #veracrypt # Filesystem Encryption ]; imports = [ - ../../common/vscodium.nix - ../../common/git.nix ../../config/config.nix + ../../common/git.nix + ../../common/vscodium.nix ]; home.stateVersion = "22.11"; diff --git a/users/leeuwarden/home-manager.nix b/users/leeuwarden/home-manager.nix index 45c82c7..732f12f 100644 --- a/users/leeuwarden/home-manager.nix +++ b/users/leeuwarden/home-manager.nix @@ -5,9 +5,7 @@ home.packages = with pkgs; [ armcord # Discord Client ardour # DAW - bash-completion # Bash Autocomplete calibre # eBook Library - cbonsai # Terminal Bonsai Tree crow-translate # Language Translator dino # XMPP Client easytag # Music Tag Editor @@ -15,10 +13,8 @@ freetube # YouTube Front-End gImageReader # Tesseract-OCR Front-End gimp # GNU Image Manipulation Program - genact # Nonsense Activity Generator gnucash # Double Entry Accounting Software gpodder # Podcast Manager - hollywood # Hollywood Melodrama Technobabble inkscape # Vector Graphics Editor itch # itch.io Games Launcher keepassxc # GUI Password Manager with Cryptography @@ -30,11 +26,6 @@ makemkv # Blu-Ray and DVD to MKV Converter mpv # Media Player mumble # Low-Latency, High Quality Voice Chat - neo # Matrix Digital Rain - neofetch # System Information - nitch # Nim System Fetch - nix-bash-completions # Bash Autocomplete - nms # Effect from 1992 Movie Sneakers nomachine-client # NoMachine remote desktop client (nxplayer) obs-studio # Recording/Streaming Application onlyoffice-bin # Office Suite @@ -43,7 +34,6 @@ pdfarranger # PDF Arranger pipes # Animated Pipes Terminal Screensaver qbittorrent # Torrent Application - qbittorrent # Torrent Application rustdesk # Remote Desktop Software shattered-pixel-dungeon # Roguelike Dungeon Crawl smplayer # Media Player @@ -51,7 +41,6 @@ speedcrunch # Calculator tenacity # Sound Editor tor-browser-bundle-bin # Privacy Web Browser - veracrypt # Filesystem Encryption ventoy # USB Boot App veracrypt # Filesystem Encryption vscodium # Code Editor @@ -60,10 +49,10 @@ ]; imports = [ + ../../config/config.nix ../../common/emacs.nix ../../common/git.nix ../../common/vscodium.nix - ../../config/config.nix ]; home.stateVersion = "22.05"; diff --git a/users/zonsopkomst/home-manager.nix b/users/zonsopkomst/home-manager.nix index 4b8b810..828ddcb 100644 --- a/users/zonsopkomst/home-manager.nix +++ b/users/zonsopkomst/home-manager.nix @@ -3,31 +3,22 @@ { home-manager.users.zonsopkomst = { pkgs, ... }: { home.packages = with pkgs; [ - asciiquarium # Terminal Aquarium armcord # Discord Client - bash-completion # Bash Autocomplete bleachbit # PC Cleaner calibre # eBook Library - cbonsai # Terminal Bonsai Tree - xcowsay # Graphical Cowsay crow-translate # Language Translator dconf2nix # Nixify Gnome Config File - dunst # Notification Daemon dino # XMPP Client element-desktop # Matrix Client easytag # Music Tag Editor freetube # YouTube Front-End - fzf # Fuzzy Finder in GO gImageReader # Tesseract-OCR Front-End - genact # Nonsense Activity Generator gnucash # Double Entry Accounting Software gnome-frog # Text extraction tool (OCR) gpodder # Podcast Manager gretl # Econometric Analysis - grim - gzdoom + gzdoom # Doom Clone based on ZDoom hollywood # Hollywood Melodrama Technobabble - hyprpaper josm # Extensible editor for OpenStreetMap kitty # Terminal Emulator kitty-themes # Kitty Themes @@ -36,45 +27,32 @@ libsForQt5.kolourpaint # Painting Application libsForQt5.k3b # Disk Burning Application mpv # Media Player - neo # Matrix Digital Rain - nitch # Nim System Fetch - nix-bash-completions # Bash Autocomplete - nms # Effect from 1992 Movie Sneakers nomachine-client # NoMachine remote desktop client (nxplayer) onlyoffice-bin # Office Suite p7zip # File Archiver pdfarranger # PDF Arranger - pipes qbittorrent # Torrent Application qgis # A Free and Open Source Geographic Information System - ranger retroarchFull # Multi-Platform Emulator - shell-genie # Natural Language Shell Command AI smplayer # Media Player solaar # Logitech Unifying Receiver strawberry # Media Player rustdesk # Remote Desktop Software - rofi - rstudioWrapper - slurp # screenshot - speedcrunch + rstudioWrapper # Integrated Tools for the R Language + speedcrunch # Calculator tor-browser-bundle-bin # Privacy Web Browser ventoy # USB Boot App veracrypt # Filesystem Encryption - waybar - wbg - wofi xiphos # Bible Study Tool - xorg.xkill # Kill Windows w/ Mouse xournalpp # PDF Annotation ]; imports = [ + ../../config/config.nix ../../common/emacs.nix ../../common/git.nix - ../../common/vscodium.nix # TODO ../../common/starship.nix - ../../config/config.nix + ../../common/vscodium.nix ]; home.stateVersion = "22.11";