diff --git a/home/home.nix b/home/home.nix index 765b3b4..9e65afd 100644 --- a/home/home.nix +++ b/home/home.nix @@ -86,6 +86,8 @@ in "audio/opus" = "mpv-slow.desktop"; "audio/x-opus" = "mpv-slow.desktop"; "audio/x-opus+ogg" = "mpv-slow.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; }; defaultApplications = { "video/mp4" = "mpv.desktop"; @@ -113,6 +115,8 @@ in "audio/flac" = "mpv-slow.desktop"; "audio/wav" = "mpv-slow.desktop"; "audio/opus" = "mpv-slow.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; }; }; diff --git a/modules/desktop.nix b/modules/desktop.nix index bbf02e0..632fb00 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -28,18 +28,11 @@ with lib; networking.useDHCP = false; boot.supportedFilesystems = [ "ntfs" ]; - services.xserver = { - enable = true; - autorun = false; - windowManager.awesome = { + services = { + desktopManager.plasma6 = { enable = true; - package = pkgs.awesome; + # runUsingSystemd = true; }; - desktopManager.plasma5 = { - enable = true; - runUsingSystemd = true; - }; - # desktopManager.gnome.enable = true; }; programs.ssh.startAgent = true; @@ -98,6 +91,12 @@ with lib; swaylock = {}; }; + # services.displayManager.sddm = { + # enable = false; + # theme = "${pkgs.elegant-sddm}"; + # wayland.enable = true; + # }; + services.greetd = { enable = true; settings = rec { @@ -219,7 +218,7 @@ with lib; # Enable CUPS to print documents. services.printing.enable = true; - services.printing.drivers = [ pkgs.gutenprint pkgs.gutenprintBin ]; + services.printing.drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.cnijfilter2 ]; services.usbmuxd.enable = true; services.fstrim.enable = true; diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 7ade926..a257af4 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -43,7 +43,7 @@ with lib; aria2 sassc # pantalaimon - plasma5Packages.kwallet + kdePackages.kwallet # sierra-breeze-enhanced libimobiledevice # textgen-amd @@ -106,11 +106,12 @@ with lib; # firefox # kate kdialog - plasma5Packages.khotkeys + # kdePackages.khotkeys # openlp inkscape libreoffice-fresh vlc + elegant-sddm # neochat haskellPackages.greenclip pulsemixer @@ -171,7 +172,7 @@ with lib; sqlite fennel blesh - plasma5Packages.plasma-sdk + kdePackages.plasma-sdk ardour qpwgraph zam-plugins diff --git a/scripts/empv b/scripts/empv index ff91dbe..d9af0ee 100755 --- a/scripts/empv +++ b/scripts/empv @@ -1,6 +1,6 @@ #!/usr/bin/env fish -set arg "(empv-enqueue-last \""$argv[1]"\")" +set arg "(empv-enqueue \""$argv[1]"\")" echo $arg set title (yt-dlp --get-title $argv[1]) echo $title added