Compare commits
11 commits
793937d34d
...
907352965d
| Author | SHA1 | Date | |
|---|---|---|---|
| 907352965d | |||
| 1d91fccf1e | |||
| 46b2ec76cf | |||
| b426d0dd2a | |||
| b2a7025251 | |||
| 936e0cd7f8 | |||
| 74efa6e748 | |||
| 0c890b201a | |||
| 1b4d7303b5 | |||
| 36b8414891 | |||
| 8ff40790f2 |
11
install.sh
|
|
@ -22,8 +22,7 @@ confirm() {
|
||||||
echo -en "[${GREEN}y${NORMAL}/${RED}n${NORMAL}]: "
|
echo -en "[${GREEN}y${NORMAL}/${RED}n${NORMAL}]: "
|
||||||
read -n 1 -r
|
read -n 1 -r
|
||||||
echo
|
echo
|
||||||
if [[ ! $REPLY =~ ^[Yy]$ ]]
|
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||||
then
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
@ -97,14 +96,6 @@ install() {
|
||||||
mkdir -p ~/Pictures/wallpapers/others
|
mkdir -p ~/Pictures/wallpapers/others
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
|
|
||||||
# Copy the wallpapers
|
|
||||||
echo -e "Copying all ${MAGENTA}wallpapers${NORMAL}"
|
|
||||||
cp -r wallpapers/wallpaper.png ~/Pictures/wallpapers
|
|
||||||
cp -r wallpapers/otherWallpaper/catppuccin/* ~/Pictures/wallpapers/others/
|
|
||||||
cp -r wallpapers/otherWallpaper/nixos/* ~/Pictures/wallpapers/others/
|
|
||||||
cp -r wallpapers/otherWallpaper/others/* ~/Pictures/wallpapers/others/
|
|
||||||
sleep 0.2
|
|
||||||
|
|
||||||
# Get the hardware configuration
|
# Get the hardware configuration
|
||||||
echo -e "Copying ${MAGENTA}/etc/nixos/hardware-configuration.nix${NORMAL} to ${MAGENTA}./hosts/${HOST}/${NORMAL}\n"
|
echo -e "Copying ${MAGENTA}/etc/nixos/hardware-configuration.nix${NORMAL} to ${MAGENTA}./hosts/${HOST}/${NORMAL}\n"
|
||||||
cp /etc/nixos/hardware-configuration.nix hosts/${HOST}/hardware-configuration.nix
|
cp /etc/nixos/hardware-configuration.nix hosts/${HOST}/hardware-configuration.nix
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,8 @@
|
||||||
"waybar &"
|
"waybar &"
|
||||||
"swaync &"
|
"swaync &"
|
||||||
"wl-paste --watch cliphist store &"
|
"wl-paste --watch cliphist store &"
|
||||||
"yubikey-touch-detector --libnotify"
|
"yubikey-touch-detector --libnotify &"
|
||||||
|
"mpDris2 &"
|
||||||
];
|
];
|
||||||
|
|
||||||
input = {
|
input = {
|
||||||
|
|
@ -171,7 +172,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
animations = {
|
animations = {
|
||||||
enabled = true;
|
enabled = false;
|
||||||
|
|
||||||
bezier = [
|
bezier = [
|
||||||
"fluent_decel, 0, 0.2, 0.4, 1"
|
"fluent_decel, 0, 0.2, 0.4, 1"
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
vimv
|
vimv
|
||||||
iamb
|
iamb
|
||||||
pass
|
pass
|
||||||
pixcat
|
|
||||||
lm_sensors
|
lm_sensors
|
||||||
neofetch
|
neofetch
|
||||||
hyfetch
|
hyfetch
|
||||||
|
|
@ -56,6 +55,11 @@
|
||||||
rustc
|
rustc
|
||||||
wikit
|
wikit
|
||||||
reader
|
reader
|
||||||
|
nmap
|
||||||
|
speedtest-go
|
||||||
|
delta
|
||||||
|
powertop
|
||||||
|
android-tools
|
||||||
|
|
||||||
# GUI shit
|
# GUI shit
|
||||||
element-desktop
|
element-desktop
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,10 @@ unfuck_wallpaper() {
|
||||||
swww img ~/.local/share/bg.png
|
swww img ~/.local/share/bg.png
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unfuck_fingerprint() {
|
||||||
|
systemctl restart fprintd.service
|
||||||
|
}
|
||||||
|
|
||||||
unfuck_bar() {
|
unfuck_bar() {
|
||||||
pkill waybar
|
pkill waybar
|
||||||
setsid waybar &
|
setsid waybar &
|
||||||
|
|
@ -81,6 +85,7 @@ everything)
|
||||||
unfuck_bar
|
unfuck_bar
|
||||||
unfuck_spotify
|
unfuck_spotify
|
||||||
unfuck_wallpaper
|
unfuck_wallpaper
|
||||||
|
unfuck_fingerprint
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
eval "unfuck_$1"
|
eval "unfuck_$1"
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
localVariables = {
|
localVariables = {
|
||||||
# Looks like this: '~/some/path > '
|
# Looks like this: '~/some/path > '
|
||||||
PS1 = "%F{magenta} > %~%f < ";
|
PS1 = "> %F{magenta}%~%f < ";
|
||||||
RPROMPT = "%F{magenta}%m";
|
RPROMPT = "%F{magenta}%m";
|
||||||
# Gets pushed to the home directory otherwise
|
# Gets pushed to the home directory otherwise
|
||||||
LESSHISTFILE = "/dev/null";
|
LESSHISTFILE = "/dev/null";
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,21 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
mpc
|
||||||
|
mpdris2
|
||||||
|
ncmpcpp
|
||||||
|
rmpc
|
||||||
|
];
|
||||||
|
|
||||||
services.mpd = {
|
services.mpd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
musicDirectory = "/home/liv/Music";
|
musicDirectory = "/home/${username}/Music";
|
||||||
|
playlistDirectory = "/home/${username}/Music/.playlists";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
restore_paused "yes"
|
||||||
|
auto_update "yes"
|
||||||
|
|
||||||
audio_output {
|
audio_output {
|
||||||
type "pipewire"
|
type "pipewire"
|
||||||
name "pipewire"
|
name "pipewire"
|
||||||
|
|
@ -21,11 +32,6 @@
|
||||||
};
|
};
|
||||||
systemd.services.mpd.environment = {
|
systemd.services.mpd.environment = {
|
||||||
# see: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609
|
# see: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609
|
||||||
XDG_RUNTIME_DIR = "/run/user/${toString config.users.users.${username}.uid}"; # User-id must match above user. MPD will look inside this directory for the PipeWire socket.
|
XDG_RUNTIME_DIR = "/run/user/1000"; # User-id must match above user. MPD will look inside this directory for the PipeWire socket.
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
mpdris2
|
|
||||||
ncmpcpp
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
81
pkgs/onthespot/default.nix
Normal file
|
|
@ -0,0 +1,81 @@
|
||||||
|
{
|
||||||
|
makeDesktopItem,
|
||||||
|
copyDesktopItems,
|
||||||
|
fetchFromGitHub,
|
||||||
|
makeWrapper,
|
||||||
|
python3Packages,
|
||||||
|
qt6,
|
||||||
|
ffmpeg,
|
||||||
|
}:
|
||||||
|
python3Packages.buildPythonApplication rec {
|
||||||
|
pname = "onthespot";
|
||||||
|
version = "0.7.1";
|
||||||
|
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "justin025";
|
||||||
|
repo = "onthespot";
|
||||||
|
rev = "refs/tags/v${version}";
|
||||||
|
hash = "sha256-G4c1u7HvTap6iZ2ttGBxhRpYrdICIGXwfgo7Jbmq/R4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
pythonRelaxDeps = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
makeWrapper
|
||||||
|
copyDesktopItems
|
||||||
|
qt6.wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
qt6.qtbase
|
||||||
|
ffmpeg
|
||||||
|
mutagen
|
||||||
|
googletrans
|
||||||
|
/*
|
||||||
|
(googletrans.overrideAttrs {
|
||||||
|
version = "4.0.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "ssut";
|
||||||
|
repo = "py-googletrans";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0wzzinn0k9rfv9z1gmfk9l4kljyd4n6kizsjw4wjxv91kfhj92hz";
|
||||||
|
};
|
||||||
|
})
|
||||||
|
*/
|
||||||
|
librespot
|
||||||
|
pillow
|
||||||
|
pyperclip
|
||||||
|
pyqt6
|
||||||
|
pyqt6-sip
|
||||||
|
requests
|
||||||
|
setuptools
|
||||||
|
urllib3
|
||||||
|
wheel
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram $out/bin/onthespot \
|
||||||
|
--set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION "python"
|
||||||
|
install -Dm444 $src/src/onthespot/resources/icons/onthespot.png $out/share/icons/hicolor/256x256/apps/onthespot.png
|
||||||
|
'';
|
||||||
|
|
||||||
|
/*
|
||||||
|
preFixup = ''
|
||||||
|
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||||
|
'';
|
||||||
|
*/
|
||||||
|
|
||||||
|
desktopItems = [
|
||||||
|
(makeDesktopItem {
|
||||||
|
name = "Onthespot";
|
||||||
|
exec = "onthespot";
|
||||||
|
icon = "onthespot";
|
||||||
|
desktopName = "Onthespot";
|
||||||
|
comment = " QT based Spotify music downloader written in Python";
|
||||||
|
categories = [ "Audio" ];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
}
|
||||||
|
Before Width: | Height: | Size: 823 KiB |
|
Before Width: | Height: | Size: 823 KiB |
|
Before Width: | Height: | Size: 1.3 MiB |
|
Before Width: | Height: | Size: 229 KiB |
|
Before Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 239 KiB |
|
Before Width: | Height: | Size: 190 KiB |
|
Before Width: | Height: | Size: 585 KiB |
|
Before Width: | Height: | Size: 7 MiB |
|
Before Width: | Height: | Size: 477 KiB |
|
Before Width: | Height: | Size: 3.4 MiB |
|
Before Width: | Height: | Size: 1 MiB |
|
Before Width: | Height: | Size: 4.3 MiB |
|
Before Width: | Height: | Size: 3.5 MiB |
|
Before Width: | Height: | Size: 3.9 MiB |
|
Before Width: | Height: | Size: 259 KiB |
|
Before Width: | Height: | Size: 6.3 MiB |
|
Before Width: | Height: | Size: 1 MiB |