diff --git a/home.nix b/home.nix index c306b29a..6d2b67d1 100644 --- a/home.nix +++ b/home.nix @@ -18,17 +18,19 @@ # Packages to install: # GUI Apps - obsidian # Markdown Knowledge Base - signal-desktop # Signal Messages - fragments # Torrent Client - element-desktop # Matrix Messages - gnome-secrets # Password Manager - newsflash # RSS Reader [Nextcloud] - eyedropper # Color Picker - gnome-obfuscate # Image Editor - gnome-podcasts # Podcast Client - gnome.geary # Email Client [GNOME Online Accounts] - impression # Usb Flash Tool + obsidian # Markdown Knowledge Base + signal-desktop # Signal Messages + fragments # Torrent Client + element-desktop # Matrix Messages + gnome-secrets # Password Manager + newsflash # RSS Reader [Nextcloud] + eyedropper # Color Picker + gnome-obfuscate # Image Editor + gnome-podcasts # Podcast Client + gnome.geary # Email Client [GNOME Online Accounts] + impression # Usb Flash Tool + gnome.gnome-calendar # Calendar [Nextcloud] + gnome.nautilus # File Manager # CLI Apps dconf2nix # Dconf to Nix format. @@ -493,6 +495,7 @@ man = "batman"; diff = "batdiff"; neofetch = "fastfetch"; + sudo = "sudo -i"; }; initExtra = "set completion-ignore-case On"; bashrcExtra = '' diff --git a/install.sh b/install.sh index b44a53fb..10f3877e 100755 --- a/install.sh +++ b/install.sh @@ -2,32 +2,14 @@ export NIXPKGS_ALLOW_UNFREE=1 -detectDistro() { - if [ "$(uname -s)" = "Darwin" ]; then - echo "macOS" - else - if [ "$(grep -Ei 'debian|buntu|mint' /etc/*release)" ]; then - echo "Debian" - elif [ "$(grep -Ei 'arch|manjaro|artix' /etc/*release)" ]; then - echo "Arch" - elif [ "$(grep -Ei 'fedora' /etc/*release)" ]; then - echo "Fedora" - else - echo 1 - return 1 - fi - fi -} - -d=$(detectDistro) -if [[ $d == "Debian" ]]; then +if [ "$(grep -Ei 'debian|buntu|mint' /etc/*release)" ]; then sudo apt install -y curl git -elif [[ $d == "Arch" ]]; then +elif [ "$(grep -Ei 'arch|manjaro|artix' /etc/*release)" ]; then sudo pacman -Sy curl git sudo pacman -Sy gnome power-profiles-daemon fwupd gst-plugin-pipewire # Gnome and optional dependencies. sudo systemctl enable power-profiles-daemon sudo systemctl start power-profiles-daemon -elif [[ $d == "Fedora" ]]; then +elif [ "$(grep -Ei 'fedora' /etc/*release)" ]; then sudo dnf install curl git fi