diff --git a/core/packages.nix b/core/packages.nix index 4398960..2e33d2e 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -185,6 +185,7 @@ #nixos-conf-editor ## Temporary desktop/user-level + steam #waybar udiskie gparted @@ -197,16 +198,16 @@ xorg.xhost ## Jellyfin for home media share - jellyfin - jellyfin-web - jellyfin-ffmpeg + #jellyfin + #jellyfin-web + #jellyfin-ffmpeg ## Nix specific tools - #nix-tree - #nix-init - #nix-index - #nixpkgs-review - #nix-output-monitor + nix-tree + #nix-init + #nix-index + #nixpkgs-review + nix-output-monitor ## Filsesystem utilities xfsprogs @@ -214,7 +215,7 @@ exfatprogs btrfs-progs ntfs3g - ntfs2btrfs + #ntfs2btrfs scrounge-ntfs ## CLI tools & utilities @@ -232,7 +233,6 @@ unzip gnupg s-tui - steam blueman busybox ripgrep diff --git a/home/common/default.nix b/home/common/default.nix index ba68cd8..82b3c06 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -21,31 +21,31 @@ ## Desktop Environment opentabletdriver # Driver for art tablets - gnome-calculator # Quick maths + #gnome-calculator # Quick maths syncthing-tray # File synchronisation - gnome-calendar # GTK Calendar + #gnome-calendar # GTK Calendar gnome-secrets # GTK password vault manager gnome-keyring # GTK login keyring appimage-run # Runs appimages #thunderbird # Email client - commented out due to network issues trying to build it ? #qt5-wayland # Unsure #qt6-wayland # Unsure - pavucontrol # Pulse audio volume contrl - image-roll # Image viewer + #pavucontrol # Pulse audio volume contrl + #image-roll # Image viewer obsidian # Note-taking nautilus # GTK file manager - peaclock # Clock but terminal + #peaclock # Clock but terminal ydotool # Click/Keypress emulator cmatrix # For r/unixporn hyfetch # Fetch, but queer zathura # PDF viewer swayimg # Image viewer kitty # Terminal emulator - micro # Text editor + #micro # Text editor piper # mouse configuration fish # Apparently I broke it lol ? btop # System resources - eog # Image viewer + #eog # Image viewer ## Games osu-lazer-bin # Rhythm is just a click away! @@ -54,37 +54,37 @@ #steam # What ??? ## Chat & Web - lagrange # Browser for the gemini protocol + #lagrange # Browser for the gemini protocol vesktop # Modded discord wrapper #fractal # GTK matrix client - need to fix gnome-keyring - tor # The Onion Router + #tor # The Onion Router ## Media - lollypop # GTK music player + #lollypop # GTK music player spotify # Corpo music streaming - pragha # Music player - tauon # Music player + #pragha # Music player + #tauon # Music player transmission_4-gtk # Torrent client nicotine-plus # P2P Media sharing - jellyfin # Self-Hosted media streaming - syncplay # Synchronise local playback with friends + #jellyfin # Self-Hosted media streaming + #syncplay # Synchronise local playback with friends vlc # Multimedia player ## Media Creation - neural-amp-modeler-lv2 # Guitar amp emulator + #neural-amp-modeler-lv2 # Guitar amp emulator bespokesynth # Modular synthesiser and sequencer easyeffects # EQ and audio effects metronome # A metronome - vcv-rack # Analogue-Synth emulator - cardinal # VCV Rack but open source and as a plugin + #vcv-rack # Analogue-Synth emulator + #cardinal # VCV Rack but open source and as a plugin audacity # Audio editing helvum # GTK patchbay ardour # Digital Audio Workstation obs-studio # Screen sharing - inkscape # Vector image editing - shotcut # Video editing + #inkscape # Vector image editing + #shotcut # Video editing #blender # 3D modelling gimp # Digital image editing diff --git a/home/common/programs/default.nix b/home/common/programs/default.nix index 7510bb8..6821d5d 100644 --- a/home/common/programs/default.nix +++ b/home/common/programs/default.nix @@ -12,11 +12,12 @@ imports = [ + ./programs ./git.nix ./yazi.nix ./kitty.nix - ./neofetch.nix - + ./neofetch + ]; } diff --git a/home/hypr/default.nix b/home/hypr/default.nix index 41128fb..26c371c 100644 --- a/home/hypr/default.nix +++ b/home/hypr/default.nix @@ -26,6 +26,7 @@ ]; home.packages = with pkgs; [ + ## desktop environment waybar swww @@ -36,16 +37,16 @@ hypridle hyprlock hyprshot - hyprpaper + #hyprpaper hyprpicker hyprcursor brightnessctl + ## gnome stuff - sushi + #sushi seahorse networkmanagerapplet gnome-themes-extra - gnome-control-center ## lib and compat xwayland diff --git a/home/hypr/hyprland.nix b/home/hypr/hyprland.nix index f15b4b5..82d847e 100644 --- a/home/hypr/hyprland.nix +++ b/home/hypr/hyprland.nix @@ -33,18 +33,17 @@ exec-once = [ "startup" - "${pkgs.udiskie}/bin/udiskie" - "${pkgs.hypridle}/bin/hypridle" - "${pkgs.hyprpaper}/bin/hyprpaper" - "${pkgs.swww}/bin/swww swww-daemon" + #"${pkgs.udiskie}/bin/udiskie" + #"${pkgs.hypridle}/bin/hypridle" + "${pkgs.swww}/bin/swww swww init" #"${pkgs.opentabletdriver}/bin/opentabletdriver otd-daemon" - "${pkgs.opentabletdriver}/bin/opentabletdriver otd-gui" + #"${pkgs.opentabletdriver}/bin/opentabletdriver otd-gui" "${pkgs.kitty}/bin/kitty" "${pkgs.kitty}/bin/kitty --class btop btop" - "${pkgs.kitty}/bin/kitty --class yazi yazi" + #"${pkgs.kitty}/bin/kitty --class yazi yazi" "${pkgs.steam}/bin/steam" #"${pkgs.helvum}/bin/helvum" - "${pkgs.spotify}/bin/spotify" + #"${pkgs.spotify}/bin/spotify" "${pkgs.vesktop}/bin/vesktop" #"${pkgs.easyeffects}/bin/easyeffects" ];