From 6b1b96f8849c2dadb901cff95b30ecf67be5fed3 Mon Sep 17 00:00:00 2001 From: Zonsopkomst Date: Sat, 25 Mar 2023 20:36:54 -0500 Subject: [PATCH] clean up --- reference/Packages/.Rhistory => .Rhistory | 0 desktop/gnome.nix | 6 +- hosts/local/frija/default.nix | 11 +- hosts/local/tyr/default.nix | 6 +- hosts/local/weda/default.nix | 6 +- hosts/remote/tuisto/default.nix | 11 +- ...{home-manager.nix => home-manager.nix.del} | 0 hosts/remote/tuisto/packages.nix | 1 + reference/{working.md => Packages/OpenBB.md} | 0 reference/Packages/VSCodium.md | 17 - reference/Packages/packages.nix | 367 +++++++++--------- reference/Packages/vscode.md | 32 -- 12 files changed, 201 insertions(+), 256 deletions(-) rename reference/Packages/.Rhistory => .Rhistory (100%) rename hosts/remote/tuisto/{home-manager.nix => home-manager.nix.del} (100%) rename reference/{working.md => Packages/OpenBB.md} (100%) delete mode 100644 reference/Packages/VSCodium.md delete mode 100644 reference/Packages/vscode.md diff --git a/reference/Packages/.Rhistory b/.Rhistory similarity index 100% rename from reference/Packages/.Rhistory rename to .Rhistory diff --git a/desktop/gnome.nix b/desktop/gnome.nix index 16f0a40..97fb221 100644 --- a/desktop/gnome.nix +++ b/desktop/gnome.nix @@ -7,8 +7,10 @@ services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; services.gnome.gnome-keyring.enable = true; - - #hardware.video.hidpi.enable = false; + + # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 + systemd.services."getty@tty1".enable = false; + systemd.services."autovt@tty1".enable = false; environment.systemPackages = with pkgs;[ gnomeExtensions.appindicator diff --git a/hosts/local/frija/default.nix b/hosts/local/frija/default.nix index 6f11d4a..f7a0d4e 100644 --- a/hosts/local/frija/default.nix +++ b/hosts/local/frija/default.nix @@ -1,9 +1,8 @@ { config, pkgs, ... }: { - imports = - [ - ]; + imports = [ + ]; # Bootloader. boot.loader.grub.enable = true; @@ -23,14 +22,14 @@ boot.initrd.luks.devices."luks-bfce34cb-65e4-4ba0-939d-e3f0ff903338".device = "/dev/disk/by-uuid/bfce34cb-65e4-4ba0-939d-e3f0ff903338"; boot.initrd.luks.devices."luks-bfce34cb-65e4-4ba0-939d-e3f0ff903338".keyFile = "/crypto_keyfile.bin"; - networking.hostName = "frija"; # Define your hostname. + networking.hostName = "frija"; users.users.aspire = { isNormalUser = true; description = "Aspire"; extraGroups = [ "docker" "networkmanager" "wheel" ]; - #packages = with pkgs; [ - # ]; + packages = with pkgs; [ + ]; }; # Enable automatic login for the user. diff --git a/hosts/local/tyr/default.nix b/hosts/local/tyr/default.nix index 330fb9a..e8a68e6 100644 --- a/hosts/local/tyr/default.nix +++ b/hosts/local/tyr/default.nix @@ -1,7 +1,8 @@ { config, pkgs, ... }: { - imports = [ ]; + imports = [ + ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -14,14 +15,13 @@ boot.initrd.luks.devices."luks-57e53b6e-eb27-4bdc-961e-069ecf677d6b".device = "/dev/disk/by-uuid/57e53b6e-eb27-4bdc-961e-069ecf677d6b"; boot.initrd.luks.devices."luks-57e53b6e-eb27-4bdc-961e-069ecf677d6b".keyFile = "/crypto_keyfile.bin"; - networking.hostName = "tyr"; # Define your hostname. + networking.hostName = "tyr"; users.users.leeuwarden = { isNormalUser = true; description = "leeuwarden"; extraGroups = [ "docker" "networkmanager" "wheel" ]; packages = with pkgs; [ - ]; }; diff --git a/hosts/local/weda/default.nix b/hosts/local/weda/default.nix index 4cd974b..b10743c 100644 --- a/hosts/local/weda/default.nix +++ b/hosts/local/weda/default.nix @@ -1,9 +1,8 @@ { config, pkgs, ... }: { - imports = - [ - ]; + imports = [ + ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -30,7 +29,6 @@ }; environment.systemPackages = with pkgs; [ - ]; system.stateVersion = "22.11"; diff --git a/hosts/remote/tuisto/default.nix b/hosts/remote/tuisto/default.nix index c8be3f3..e88b502 100644 --- a/hosts/remote/tuisto/default.nix +++ b/hosts/remote/tuisto/default.nix @@ -2,33 +2,26 @@ { imports = [ - - ]; + ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot/efi"; - networking.hostName = "tuisto"; # Define your hostname. + networking.hostName = "tuisto"; users.users.admin = { isNormalUser = true; description = "Admin"; extraGroups = [ "docker" "networkmanager" "wheel" ]; packages = with pkgs; [ - firefox ]; }; services.xserver.displayManager.autoLogin.enable = true; services.xserver.displayManager.autoLogin.user = "admin"; - # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 - systemd.services."getty@tty1".enable = false; - systemd.services."autovt@tty1".enable = false; - environment.systemPackages = with pkgs; [ - ]; system.stateVersion = "22.11"; diff --git a/hosts/remote/tuisto/home-manager.nix b/hosts/remote/tuisto/home-manager.nix.del similarity index 100% rename from hosts/remote/tuisto/home-manager.nix rename to hosts/remote/tuisto/home-manager.nix.del diff --git a/hosts/remote/tuisto/packages.nix b/hosts/remote/tuisto/packages.nix index edb0910..98c36d7 100644 --- a/hosts/remote/tuisto/packages.nix +++ b/hosts/remote/tuisto/packages.nix @@ -16,6 +16,7 @@ btop # Resource Monitor cpu-x # PC Information dconf # Gnome Configuration + firefox # Browser gnome.gnome-tweaks # Gnome Customization Tool git # Distributed Version Control System gsmartcontrol # Disk Health Inspection Tool diff --git a/reference/working.md b/reference/Packages/OpenBB.md similarity index 100% rename from reference/working.md rename to reference/Packages/OpenBB.md diff --git a/reference/Packages/VSCodium.md b/reference/Packages/VSCodium.md deleted file mode 100644 index b3ca4a4..0000000 --- a/reference/Packages/VSCodium.md +++ /dev/null @@ -1,17 +0,0 @@ -# VS Codium Extensions -1. color manager -1. dendron -1. dendron paste image -1. foam -1. markdown checkbox -1. markdown editor -1. markdown link updater -1. markdown pdf -1. markdown-link-expander -1. nim -1. nix -1. nix environment selector -1. nix extension pack -1. nix ide -1. pandoc markdown syntax -1. dendron markdown preview enhanced \ No newline at end of file diff --git a/reference/Packages/packages.nix b/reference/Packages/packages.nix index acb005b..d9d8c28 100644 --- a/reference/Packages/packages.nix +++ b/reference/Packages/packages.nix @@ -17,215 +17,216 @@ # GLOBAL & HOME-MANAGER PACKAGES # Cartography - josm # Extensible Editor for OpenStreetMap - qgis # Geographic Information System + josm # Extensible Editor for OpenStreetMap + qgis # Geographic Information System # Communication - armcord # Discord Client - dino # XMPP Client - discord # Discord Client - element-desktop # Matrix Client - jitsi-meet # Video Calls & Chat - mumble # Low-Latency, High Quality Voice Chat - zoom # Video Calls & Chat + armcord # Discord Client + dino # XMPP Client + discord # Discord Client + element-desktop # Matrix Client + jitsi-meet # Video Calls & Chat + mumble # Low-Latency, High Quality Voice Chat + zoom # Video Calls & Chat # Cursors - phinger-cursors # Cursor Theme + phinger-cursors # Cursor Theme # Games - airshipper # Veloren RPG Updater - assaultcube # First-Person Shooter - alienarena # First-Person Shooter - cataclysm-dda # Zombie Rogue-Like - factorio # Build & Maintain Factories - freeciv # Civilization Strategy Clone - freenukum # Duke Nukum 1 Clone - gamemode # Optimse Linux System Performance - gzdoom # Doom Clone based on ZDoom - hedgewars # Worms Clone - openttd # Transport Tycoon Deluxe Clone - redeclipse # First-Person Shooter - retroarchFull # Multi-Platform Emulator - rili # Children's Train Game - sauerbraten # First-Person Shooter, successor of Cube - scorched3d # Scorched Earth 3D Clone - shattered-pixel-dungeon # Roguelike Dungeon Crawl - supertux # Super Mario Clone - supertuxkart # Super Mario Kart Clone - tuxpaint # Drawing for Children - warzone2100 # Real-Time Strategy - warsow # First-Person Shooter - wesnoth # Fantasy Strategy - ufoai # X-Com Clone - unciv # Civilization Strategy Clone - xonotic # First-Person Shooter - zdoom # Doom Clone - zeroad # Ancient Warfare Strategy + airshipper # Veloren RPG Updater + assaultcube # First-Person Shooter + alienarena # First-Person Shooter + cataclysm-dda # Zombie Rogue-Like + factorio # Build & Maintain Factories + freeciv # Civilization Strategy Clone + freenukum # Duke Nukum 1 Clone + gamemode # Optimse Linux System Performance + gzdoom # Doom Clone based on ZDoom + hedgewars # Worms Clone + openttd # Transport Tycoon Deluxe Clone + redeclipse # First-Person Shooter + retroarchFull # Multi-Platform Emulator + rili # Children's Train Game + sauerbraten # First-Person Shooter, successor of Cube + scorched3d # Scorched Earth 3D Clone + shattered-pixel-dungeon # Roguelike Dungeon Crawl + supertux # Super Mario Clone + supertuxkart # Super Mario Kart Clone + tuxpaint # Drawing for Children + warzone2100 # Real-Time Strategy + warsow # First-Person Shooter + wesnoth # Fantasy Strategy + ufoai # X-Com Clone + unciv # Civilization Strategy Clone + xonotic # First-Person Shooter + zdoom # Doom Clone + zeroad # Ancient Warfare Strategy # Todo: - #zero ballistics # ?? - #the dark mod # ?? + #zero ballistics # ?? + #the dark mod # ?? # Gnome - adw-gtk3 # GTK3 libadwaita Theme ported to GTK-3 - dconf # Gnome Configuration - dconf2nix # Nixify Gnome Config File - gnome.gnome-tweaks # Gnome Customization Tool + adw-gtk3 # GTK3 libadwaita Theme ported to GTK-3 + dconf # Gnome Configuration + dconf2nix # Nixify Gnome Config File + gnome.gnome-tweaks # Gnome Customization Tool # Gaming - gzdoom # Doom Clone - heroic # GOG & Epic Games Launcher - # NOTE: Issues with authenticating, package out of date, using Flatpak - itch # itch.io Games Launcher - legendary-gl # Epic Games Launcher Alternative - lutris # Issues with Origin installation, - # using Flatpak - mumble # Low-latency, high quality voice chat software - steam # Steam Game Launcher, using xxx + gzdoom # Doom Clone + heroic # GOG & Epic Games Launcher + # NOTE: Issues with authenticating, package out of date, using Flatpak + itch # itch.io Games Launcher + legendary-gl # Epic Games Launcher Alternative + lutris # Issues with Origin installation, + # using Flatpak + mumble # Low-latency, high quality voice chat software + steam # Steam Game Launcher, using xxx # Hyperland - dunst # Notification Daemon - eww # ElKowars Wacky Widgets - grim # Wayland Image Grab - hyprpaper # Wallpaper Application for Wayland Compositors + dunst # Notification Daemon + eww # ElKowars Wacky Widgets + grim # Wayland Image Grab + hyprpaper # Wallpaper Application for Wayland Compositors # Internet - betterbird # Email Client, No pkg, - # using flatpak - brave # Thunderbird Fork, issues - # w/ BAT, using flatpak - librewolf # Firefox Web Browser Fork - thunderbird # Email Client - tigervnc # VNC Client - tor-browser-bundle-bin # Privacy Web Browser + betterbird # Email Client, No pkg, + # using flatpak + brave # Thunderbird Fork, issues + # w/ BAT, using flatpak + firefox # Web Browser + librewolf # Firefox Web Browser Fork + thunderbird # Email Client + tigervnc # VNC Client + tor-browser-bundle-bin # Privacy Web Browser # Media - ardour # DAW - bibletime # Bible Study Tool - blender # 3D Animation/Publishing - bookworm # eBook Reader - calibre # eBook Library - davinci-resolve # Professional Video Editing, Color, Effects and Audio Post - digikam # Photo Management Program - easytag # Music Tag Editor - foliate # eBook Reader - freetube # YouTube Front-End - ffmpeg_5-full # Record, Convert and Stream Audio and Video - gimp # GNU Image Manipulation Program - gpodder # Podcast Manager - handbrake # Video Conversion Tool - hypnotix # IPTV streaming application - inkscape # Vector Graphics Editor - libsForQt5.kolourpaint # Painting Application - jellyfin-media-player # Jellyfin Desktop Client based on Plex Media Player - krita # Painting Application - libsForQt5.k3b # Disk Burning Application - makemkv # Blu-Ray and DVD to MKV Converter - mpv # Media Player - noisetorch # Microphone Noise Supression for PulseAudio - nuclear # Music Player - # Package not updated - obs-studio # Recording/Streaming Application - libsForQt5.okular # Document Viewer - scrcpy # Display and control Android devices over USB or TCP/IP - shortwave # Internet Radio - shutter encoder # A/V Converter; Use appimage - smplayer # Media Player - strawberry # Media Player - stremio # Media Streaming Center - tenacity # Sound Editor - zotero # Research Sourcer + ardour # DAW + bibletime # Bible Study Tool + blender # 3D Animation/Publishing + bookworm # eBook Reader + calibre # eBook Library + davinci-resolve # Professional Video Editing, Color, Effects and Audio Post + digikam # Photo Management Program + easytag # Music Tag Editor + foliate # eBook Reader + freetube # YouTube Front-End + ffmpeg_5-full # Record, Convert and Stream Audio and Video + gimp # GNU Image Manipulation Program + gpodder # Podcast Manager + handbrake # Video Conversion Tool + hypnotix # IPTV streaming application + inkscape # Vector Graphics Editor + libsForQt5.kolourpaint # Painting Application + jellyfin-media-player # Jellyfin Desktop Client based on Plex Media Player + krita # Painting Application + libsForQt5.k3b # Disk Burning Application + makemkv # Blu-Ray and DVD to MKV Converter + mpv # Media Player + noisetorch # Microphone Noise Supression for PulseAudio + nuclear # Music Player + # Package not updated + obs-studio # Recording/Streaming Application + libsForQt5.okular # Document Viewer + scrcpy # Display and control Android devices over USB or TCP/IP + shortwave # Internet Radio + shutter encoder # A/V Converter; Use appimage + smplayer # Media Player + strawberry # Media Player + stremio # Media Streaming Center + tenacity # Sound Editor + zotero # Research Sourcer # Office - adobe-reader # PDF Reader (for government forms mainly) - gImageReader # Tesseract-OCR Front-End - gnucash # Double Entry Accounting Software - # Gnucash requires dconf, see Gnome section above - libreoffice # Office Suite (Stable) - libreoffice-qt # Office Suite (for KDE) - libreoffice-fresh # Office Suite (Latest) - hunspell # Libreoffice Spell Check - hunspellDicts.en_US # hunspell English - obsidian # Markdown Editor - onlyoffice-bin # Office Suite - pdfarranger # PDF Arranger - qpdfview # Tabbed PDF Viewer + adobe-reader # PDF Reader (for government forms mainly) + gImageReader # Tesseract-OCR Front-End + gnucash # Double Entry Accounting Software + # Gnucash requires dconf, see Gnome section above + libreoffice # Office Suite (Stable) + libreoffice-qt # Office Suite (for KDE) + libreoffice-fresh # Office Suite (Latest) + hunspell # Libreoffice Spell Check + hunspellDicts.en_US # hunspell English + obsidian # Markdown Editor + onlyoffice-bin # Office Suite + pdfarranger # PDF Arranger + qpdfview # Tabbed PDF Viewer # Peripherals - hplip # HP Print Drivers + hplip # HP Print Drivers # Science - gretl # Econometric Analysis - rstudioWrapper # Integrated Tools for the R Language - speedcrunch # Calculator - stellarium # Free open-source planetarium + gretl # Econometric Analysis + rstudioWrapper # Integrated Tools for the R Language + speedcrunch # Calculator + stellarium # Free open-source planetarium # System - alacritty # Terminal Emulator - appimage-run # Appimage Runner - bleachbit # PC Cleaner - bottles # Wineprefix Manager - cmatrix # Matrix Movie Terminal Theme - btop # Resource Monitor - cpu-x # PC Information - crow-translate # Language Translator - etcher # Flash OS images to SD cards and USB drives, safely and easily - genymotion # NOTE: Issues with loading - git # Distributed Version Control System - gsmartcontrol # Disk Health Inspection Tool - htop # Process Viewer - i2c-tools # Network Utilities - inetutils # Network Utilities - keepassxc # GUI Password Manager with Cryptography - kitty # Terminal Emulator - kitty-themes # Kitty Themes - openrgb # RGB Manager - neofetch # System Information - nitch # Nim System Fetch - nix-software-center # Nix Software Center - nox # Nix Tools - ntfs3g # FUSE Client - p7zip # File Archiver - papirus-icon-theme # Icons - powertop # Power Manager - protonup # Proton Installer - qbittorrent # Torrent Application - qemu_full # Virtual Machine - rustdesk # Remote Desktop Software - solaar # Logitech Unifying Receiver - speedcrunch # Calculator - syncthing # File Synchronization - syncthing-tray # Tray for Syncthing - tixati # Torrent Application (removed from nixpks, unfree, no longer maintained) - tldr # Simplified man pages - waydroid # Android Emulator - # Only works on wayland - ventoy-bin # USB Boot App - veracrypt # Filesystem Encryption - virtualbox # Virtual Machine - # Only needed with genymotion - vscodium # Code Editor - xorg.xkill # Kill Windows w/ Mouse + alacritty # Terminal Emulator + appimage-run # Appimage Runner + bleachbit # PC Cleaner + bottles # Wineprefix Manager + cmatrix # Matrix Movie Terminal Theme + btop # Resource Monitor + cpu-x # PC Information + crow-translate # Language Translator + etcher # Flash OS images to SD cards and USB drives, safely and easily + genymotion # NOTE: Issues with loading + git # Distributed Version Control System + gsmartcontrol # Disk Health Inspection Tool + htop # Process Viewer + i2c-tools # Network Utilities + inetutils # Network Utilities + keepassxc # GUI Password Manager with Cryptography + kitty # Terminal Emulator + kitty-themes # Kitty Themes + openrgb # RGB Manager + neofetch # System Information + nitch # Nim System Fetch + nix-software-center # Nix Software Center + nox # Nix Tools + ntfs3g # FUSE Client + p7zip # File Archiver + papirus-icon-theme # Icons + powertop # Power Manager + protonup # Proton Installer + qbittorrent # Torrent Application + qemu_full # Virtual Machine + rustdesk # Remote Desktop Software + solaar # Logitech Unifying Receiver + speedcrunch # Calculator + syncthing # File Synchronization + syncthing-tray # Tray for Syncthing + tixati # Torrent Application (removed from nixpks, unfree, no longer maintained) + tldr # Simplified man pages + waydroid # Android Emulator + # Only works on wayland + ventoy-bin # USB Boot App + veracrypt # Filesystem Encryption + virtualbox # Virtual Machine + # Only needed with genymotion + vscodium # Code Editor + xorg.xkill # Kill Windows w/ Mouse # Terminal/CLI Related - asciiquarium # Terminal Aquarium - bash-completion # Bash Autocomplete - nix-bash-completions # Bash Autocomplete - cmatrix # Matrix Digital Rain - cbonsai # Terminal Bonsai Tree - genact # Nonsense Activity Generator - hollywood # Hollywood Melodrama Technobabble - 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 - rofi # Wayland Launcher/Menu - slurp # Terminal Locomotive - slurp # Select a Region on the Wayland Compositor - waybar # Wayland Bar for Wlroots Based Compositors - wbg # Wallpaper Application for Wayland Compositors - wofi # Wayland Launcher/Menu - xcowsay # Graphical Cowsay + asciiquarium # Terminal Aquarium + bash-completion # Bash Autocomplete + nix-bash-completions # Bash Autocomplete + cmatrix # Matrix Digital Rain + cbonsai # Terminal Bonsai Tree + genact # Nonsense Activity Generator + hollywood # Hollywood Melodrama Technobabble + 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 + rofi # Wayland Launcher/Menu + slurp # Terminal Locomotive + slurp # Select a Region on the Wayland Compositor + waybar # Wayland Bar for Wlroots Based Compositors + wbg # Wallpaper Application for Wayland Compositors + wofi # Wayland Launcher/Menu + xcowsay # Graphical Cowsay } \ No newline at end of file diff --git a/reference/Packages/vscode.md b/reference/Packages/vscode.md deleted file mode 100644 index 8412bda..0000000 --- a/reference/Packages/vscode.md +++ /dev/null @@ -1,32 +0,0 @@ - programs.vscode = { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - bbenoist.nix - bierner.markdown-checkbox - bierner.markdown-emoji - bierner.emojisense - bierner.markdown-mermaid - donjayamanne.githistory - file-icons.file-icons - foam.foam-vscode - jnoortheen.nix-ide - piousdeer.adwaita-theme - shd101wyy.markdown-preview-enhanced - svsool.markdown-memo - yzhang.markdown-all-in-one - ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "markdown-checkbox"; - publisher = "PKief"; - version = "1.8.1"; - sha256 = "sha256-GdSdJocRXqjMFZTOrGUCJHo33zaFWmeJHyssh8plS+w="; - } - { - name = "org-mode"; - publisher = "vscode-org-mode"; - version = "1.0.0"; - sha256 = "sha256-o9CIjMlYQQVRdtTlOp9BAVjqrfFIhhdvzlyhlcOv5rY="; - } - ]; - }; \ No newline at end of file