Merge pull request #19 from crystal-linux/development

Merge development into main

flake.nix

@@ -0,0 +1,47 @@
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs";
+    utils.url = "github:numtide/flake-utils";
+    naersk.url = "github:nix-community/naersk";
+  };
+
+  outputs = { self, nixpkgs, utils, naersk }:
+    utils.lib.eachDefaultSystem (system:
+    let
+      pkgs = nixpkgs.legacyPackages."${system}";
+      naersk-lib = naersk.lib."${system}";
+    in rec 
+    {
+      packages.amethyst = naersk-lib.buildPackage {
+        pname = "ame";
+        root = ./.;
+        nativeBuildInputs = with pkgs; [
+          openssl
+          sqlite
+          pkg-config
+        ];
+      };
+
+      packages.default = packages.amethyst;
+
+      apps.amethyst = utils.lib.mkApp {
+        drv = packages.amethyst;
+      };
+
+      apps.default = apps.amethyst;
+
+      devShells.default = pkgs.mkShell {
+        nativeBuildInputs = with pkgs; [
+          rustc
+          cargo
+          rustfmt
+          cargo-audit
+          clippy
+          openssl
+          sqlite
+          pkg-config
+        ];
+      };
+    });
+}
+

src/internal/config.rs

@@ -157,9 +157,9 @@ pub fn read_config(configpath: PathBuf) {
     /*if let Some(desktop) = &config.desktop {
         desktops::install_desktop_setup(*desktop);
     }*/
-    match config.desktop.as_str() {
+    match config.desktop.to_lowercase().as_str() {
         // "onyx" => desktops::install_desktop_setup(DesktopSetup::Onyx),
-        "plasma" => desktops::install_desktop_setup(DesktopSetup::Kde),
+        "kde" => desktops::install_desktop_setup(DesktopSetup::Kde),
         "mate" => desktops::install_desktop_setup(DesktopSetup::Mate),
         "gnome" => desktops::install_desktop_setup(DesktopSetup::Gnome),
         "cinnamon" => desktops::install_desktop_setup(DesktopSetup::Cinnamon),
@@ -172,7 +172,7 @@ pub fn read_config(configpath: PathBuf) {
         "herbstluftwm" => desktops::install_desktop_setup(DesktopSetup::Herbstluftwm),
         "awesome" => desktops::install_desktop_setup(DesktopSetup::Awesome),
         "bspwm" => desktops::install_desktop_setup(DesktopSetup::Bspwm),
-        "None/DIY" => desktops::install_desktop_setup(DesktopSetup::None),
+        "none/diy" => desktops::install_desktop_setup(DesktopSetup::None),
         _ => log::info!("No desktop setup selected!"),
     }
     println!();