diff --git a/devices/binto/default.nix b/devices/binto/default.nix index 182a95f..b541f6c 100644 --- a/devices/binto/default.nix +++ b/devices/binto/default.nix @@ -52,8 +52,6 @@ in { home-manager.users.${mainUser} = { imports = [ ../../home/firefox - - ./home/packages.nix ]; # No touchy diff --git a/devices/binto/home/packages.nix b/devices/binto/home/packages.nix deleted file mode 100644 index cddf0af..0000000 --- a/devices/binto/home/packages.nix +++ /dev/null @@ -1,33 +0,0 @@ -{...}: { - xdg.desktopEntries."com.github.iwalton3.jellyfin-media-player" = { - name = "Jellyfin Media Player"; - comment = "Desktop client for Jellyfin"; - exec = "jellyfinmediaplayer --platform xcb"; - icon = "com.github.iwalton3.jellyfin-media-player"; - terminal = false; - type = "Application"; - categories = ["AudioVideo" "Video" "Player" "TV"]; - settings = { - Version = "1.0"; - StartupWMClass = "jellyfin-media-player"; - }; - actions = { - "DesktopF" = { - name = "Desktop [Fullscreen]"; - exec = "jellyfinmediaplayer --fullscreen --desktop --platform xcb"; - }; - "DesktopW" = { - name = "Desktop [Windowed]"; - exec = "jellyfinmediaplayer --windowed --desktop --platform xcb"; - }; - "TVF" = { - name = "TV [Fullscreen]"; - exec = "jellyfinmediaplayer --fullscreen --tv --platform xcb"; - }; - "TVW" = { - name = "TV [Windowed]"; - exec = "jellyfinmediaplayer --windowed --tv --platform xcb"; - }; - }; - }; -} diff --git a/devices/wim/default.nix b/devices/wim/default.nix index 59d0948..e4ecdc0 100644 --- a/devices/wim/default.nix +++ b/devices/wim/default.nix @@ -51,8 +51,6 @@ in { home-manager.users.${mainUser} = { imports = [ ../../home/firefox - - ./home/packages.nix ]; # No touchy diff --git a/devices/wim/home/packages.nix b/devices/wim/home/packages.nix deleted file mode 100644 index 6c388a0..0000000 --- a/devices/wim/home/packages.nix +++ /dev/null @@ -1,41 +0,0 @@ -{pkgs, ...}: { - home.packages = - (with pkgs.python311Packages; [ - python - pyclip # For Waydroid? - ]) - ++ (with pkgs; [ - # Misc CLI - acpi - - (writeShellScriptBin "Gparted" '' - ( - sleep 1.5 - while killall -r -0 ksshaskpass > /dev/null 2>&1 - do - sleep 0.1 - if [[ $(hyprctl activewindow | grep Ksshaskpass) == "" ]]; then - killall -r ksshaskpass - fi - done - ) & - exec env SUDO_ASKPASS=${plasma5Packages.ksshaskpass}/bin/${plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@" - '') - ]); - - xdg.desktopEntries.gparted = { - name = "GParted"; - genericName = "Partition Editor"; - comment = "Create, reorganize, and delete partitions"; - exec = "Gparted"; - icon = "gparted"; - terminal = false; - type = "Application"; - categories = ["GNOME" "System" "Filesystem"]; - startupNotify = true; - settings = { - Keywords = "Partition"; - X-GNOME-FullName = "GParted Partition Editor"; - }; - }; -} diff --git a/flake.in.nix b/flake.in.nix index bd1f520..7b43c79 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -119,9 +119,10 @@ packages = with pkgs; [ alejandra git + nix-output-monitor (writeShellScriptBin "mkIso" (lib.concatStrings [ - "nix build $(realpath /etc/nixos)#nixosConfigurations." + "nom build $(realpath /etc/nixos)#nixosConfigurations." "live-image.config.system.build.isoImage" ])) ]; diff --git a/modules/desktop/desktop-environment/config/kdeglobals b/modules/desktop/desktop-environment/config/kdeglobals index b89e13d..719dada 100644 --- a/modules/desktop/desktop-environment/config/kdeglobals +++ b/modules/desktop/desktop-environment/config/kdeglobals @@ -4,7 +4,7 @@ TerminalApplication=foot [KFileDialog Settings] Allow Expansion=false Automatically select filename extension=true -Breadcrumb Navigation=true +Breadcrumb Navigation=false Decoration position=2 LocationCombo Completionmode=5 PathCombo Completionmode=5 diff --git a/modules/desktop/desktop-environment/packages.nix b/modules/desktop/desktop-environment/packages.nix index bb8d629..9ae9248 100644 --- a/modules/desktop/desktop-environment/packages.nix +++ b/modules/desktop/desktop-environment/packages.nix @@ -4,14 +4,14 @@ lib, pkgs, self, - Vencord-src, ... }: let - inherit (lib) makeLibraryPath optionalString; + inherit (lib) makeLibraryPath mkIf optionalString; inherit (pkgs.writers) writeTOML; flakeDir = config.environment.variables.FLAKE; cfg = config.roles.desktop; + nvidiaEnable = config.nvidia.enable; in { imports = [./dolphin.nix]; @@ -27,25 +27,79 @@ in { symlink = config.lib.file.mkOutOfStoreSymlink; configDir = "${flakeDir}/modules/desktop/desktop-environment/config"; in { - xdg.configFile = { - "dolphinrc".source = symlink "${configDir}/dolphinrc"; - "kdeglobals".source = symlink "${configDir}/kdeglobals"; - "kiorc".source = symlink "${configDir}/kiorc"; - "mimeapps.list".source = symlink "${configDir}/mimeapps.list"; - "neofetch".source = symlink "${configDir}/neofetch"; + xdg = { + configFile = { + "dolphinrc".source = symlink "${configDir}/dolphinrc"; + "kdeglobals".source = symlink "${configDir}/kdeglobals"; + "kiorc".source = symlink "${configDir}/kiorc"; + "mimeapps.list".source = symlink "${configDir}/mimeapps.list"; + "neofetch".source = symlink "${configDir}/neofetch"; - "satty/config.toml".source = writeTOML "satty.toml" { - general = { - early-exit = true; - copy-command = "wl-copy"; - initial-tool = "crop"; - output-filename = "${config.home.homeDirectory}/Pictures/Screenshots/screen-%d-%m-%Y_%H:%M:%S.png"; - }; + "satty/config.toml".source = writeTOML "satty.toml" { + general = { + early-exit = true; + copy-command = "wl-copy"; + initial-tool = "crop"; + output-filename = "${config.home.homeDirectory}/Pictures/Screenshots/screen-%d-%m-%Y_%H:%M:%S.png"; + }; - font = { - family = "Ubuntu Mono"; + font = { + family = "Ubuntu Mono"; + }; }; }; + + desktopEntries = + (mkIf nvidiaEnable { + "com.github.iwalton3.jellyfin-media-player" = { + name = "Jellyfin Media Player"; + comment = "Desktop client for Jellyfin"; + exec = "jellyfinmediaplayer --platform xcb"; + icon = "com.github.iwalton3.jellyfin-media-player"; + terminal = false; + type = "Application"; + categories = ["AudioVideo" "Video" "Player" "TV"]; + settings = { + Version = "1.0"; + StartupWMClass = "jellyfin-media-player"; + }; + actions = { + "DesktopF" = { + name = "Desktop [Fullscreen]"; + exec = "jellyfinmediaplayer --fullscreen --desktop --platform xcb"; + }; + "DesktopW" = { + name = "Desktop [Windowed]"; + exec = "jellyfinmediaplayer --windowed --desktop --platform xcb"; + }; + "TVF" = { + name = "TV [Fullscreen]"; + exec = "jellyfinmediaplayer --fullscreen --tv --platform xcb"; + }; + "TVW" = { + name = "TV [Windowed]"; + exec = "jellyfinmediaplayer --windowed --tv --platform xcb"; + }; + }; + }; + }) + // { + gparted = { + name = "GParted"; + genericName = "Partition Editor"; + comment = "Create, reorganize, and delete partitions"; + exec = "Gparted"; + icon = "gparted"; + terminal = false; + type = "Application"; + categories = ["GNOME" "System" "Filesystem"]; + startupNotify = true; + settings = { + Keywords = "Partition"; + X-GNOME-FullName = "GParted Partition Editor"; + }; + }; + }; }; }) ]; @@ -77,6 +131,20 @@ in { nextcloud-client prismlauncher + (writeShellScriptBin "Gparted" '' + ( + sleep 1.5 + while killall -r -0 ksshaskpass > /dev/null 2>&1 + do + sleep 0.1 + if [[ $(hyprctl activewindow | grep Ksshaskpass) == "" ]]; then + killall -r ksshaskpass + fi + done + ) & + exec env SUDO_ASKPASS=${plasma5Packages.ksshaskpass}/bin/${plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@" + '') + # tools wl-color-picker wl-clipboard