more cleanup
This commit is contained in:
parent
6cf86a3827
commit
88f9bd9dd7
SSH key fingerprint:
SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
36 changed files with 59 additions and 627 deletions
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
imports = [
|
||||
./nix.nix
|
||||
./docs.nix
|
||||
./lsps.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
clang-tools # clangd
|
||||
];
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
exts = inputs.nix-vscode-extensions.extensions.${pkgs.system};
|
||||
vsce = exts.vscode-marketplace;
|
||||
ovsx = exts.open-vsx;
|
||||
in {
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
enableUpdateCheck = false;
|
||||
enableExtensionUpdateCheck = false;
|
||||
package = pkgs.vscodium;
|
||||
|
||||
mutableExtensionsDir = true;
|
||||
extensions = with vsce; [
|
||||
vadimcn.vscode-lldb
|
||||
mkhl.direnv
|
||||
editorconfig.editorconfig
|
||||
pkief.material-icon-theme
|
||||
eamodio.gitlens
|
||||
hediet.debug-visualizer
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
stylix.targets = {
|
||||
firefox.profileNames = ["xun"];
|
||||
};
|
||||
gtk = {
|
||||
# theme = lib.mkForce {
|
||||
# package = pkgs.whitesur-gtk-theme;
|
||||
# name = "WhiteSur-Dark";
|
||||
# };
|
||||
iconTheme = {
|
||||
name = "WhiteSur-dark";
|
||||
package = pkgs.whitesur-icon-theme;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
../../editors/emacs.nix
|
||||
../../editors/nvim.nix
|
||||
../../editors/vscode.nix
|
||||
../../editors/jetbrains
|
||||
../../editors/jetbrains/android-studio.nix
|
||||
|
||||
|
|
@ -57,36 +56,28 @@
|
|||
../../programs/misc/discord.nix
|
||||
../../programs/misc/obs.nix
|
||||
../../programs/misc/krita.nix
|
||||
#../../programs/misc/ardour.nix
|
||||
../../programs/misc/foliate.nix
|
||||
../../programs/misc/blender.nix
|
||||
../../programs/misc/obsidian.nix
|
||||
../../programs/misc/pwvucontrol.nix
|
||||
../../programs/misc/qpwgraph.nix
|
||||
../../programs/misc/libreoffice.nix
|
||||
# ../../programs/misc/thunderbird.nix
|
||||
#../../programs/music
|
||||
#../../programs/music/yams.nix
|
||||
# ../../programs/music/spotify.nix
|
||||
../../programs/music/puddletag.nix
|
||||
../../programs/music/picard.nix
|
||||
../../programs/music/cmus.nix
|
||||
../../programs/media
|
||||
../../programs/media/mpv.nix
|
||||
../../programs/media/jellyfin.nix
|
||||
|
||||
# gaming
|
||||
../../programs/games
|
||||
../../programs/games/lutris.nix
|
||||
../../programs/games/heroic.nix
|
||||
../../programs/games/minecraft.nix
|
||||
../../programs/games/roblox.nix
|
||||
../../programs/games/krunker.nix
|
||||
#../../programs/games/ludusavi.nix
|
||||
|
||||
# ./dark.nix
|
||||
|
||||
# media services
|
||||
../../services/media/playerctl.nix
|
||||
# system services
|
||||
../../services/system/polkit-agent.nix
|
||||
../../services/system/udiskie.nix # although i dont need this for usb memory, it is quite convenient for flashing qmk
|
||||
../../services/playerctl.nix
|
||||
../../services/polkit-agent.nix
|
||||
../../services/udiskie.nix # although i dont need this for usb memory, it is quite convenient for flashing qmk
|
||||
];
|
||||
|
||||
qt = {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
../common/wob.nix
|
||||
../common/wl-clipboard.nix
|
||||
./waybar.nix
|
||||
./headless-remote.nix
|
||||
];
|
||||
|
||||
services.cliphist = {
|
||||
|
|
@ -99,7 +98,6 @@
|
|||
in
|
||||
lib.mkOptionDefault (
|
||||
{
|
||||
"${mod}+m" = "exec ${pkgs.nwg-launchers}/bin/nwggrid";
|
||||
"${mod}+n" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t";
|
||||
"${mod}+Shift+v" = "exec ${lib.getExe pkgs.cliphist} list | ${lib.getExe pkgs.wofi} --dmenu | ${lib.getExe pkgs.cliphist} decode | ${pkgs.wl-clipboard}/bin/wl-copy";
|
||||
"${mod}+Ctrl+${dir.left}" = "focus output left";
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
## TODO MAKE THIS REMOVE ALL PREV HEADLESS MONITORS
|
||||
home.packages = [
|
||||
(pkgs.writeShellApplication {
|
||||
name = "xun-start-headless";
|
||||
runtimeInputs = [pkgs.sway pkgs.wayvnc pkgs.jq];
|
||||
text = ''
|
||||
headless_numbers() {
|
||||
swaymsg -t get_outputs | jq -r '.[].name | select (. | startswith("HEADLESS-")) | ltrimstr("HEADLESS-")'
|
||||
}
|
||||
|
||||
new_lines() {
|
||||
diff <(echo "$1") <(echo "$2") | grep -E "^>" | cut -c3- || true
|
||||
}
|
||||
|
||||
create_output() {
|
||||
outputs1=$(headless_numbers)
|
||||
swaymsg create_output >/dev/null
|
||||
outputs2=$(headless_numbers)
|
||||
new_lines "$outputs1" "$outputs2"
|
||||
}
|
||||
|
||||
remove_outputs() {
|
||||
for n in $(headless_numbers); do
|
||||
swaymsg output "HEADLESS-$n" unplug
|
||||
done
|
||||
}
|
||||
|
||||
remove_outputs
|
||||
|
||||
outputid=$(create_output)
|
||||
|
||||
swaymsg output "HEADLESS-$outputid" scale 2
|
||||
swaymsg output "HEADLESS-$outputid" mode "2400x1080@30Hz"
|
||||
swaymsg output "HEADLESS-$outputid" position "0 1080" # below primary monitor
|
||||
|
||||
wayvnc --gpu -o "HEADLESS-$outputid" 0.0.0.0
|
||||
'';
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
@ -3,11 +3,6 @@
|
|||
self,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
heroic
|
||||
lutris
|
||||
prismlauncher
|
||||
self.packages.${pkgs.system}.gamesand
|
||||
];
|
||||
home.packages = [self.packages.${pkgs.system}.gamesand];
|
||||
programs.mangohud.enable = true;
|
||||
}
|
||||
|
|
|
|||
3
home/programs/games/heroic.nix
Normal file
3
home/programs/games/heroic.nix
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [heroic];
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
ludusavi
|
||||
rclone
|
||||
];
|
||||
}
|
||||
3
home/programs/games/lutris.nix
Normal file
3
home/programs/games/lutris.nix
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [lutris];
|
||||
}
|
||||
3
home/programs/games/minecraft.nix
Normal file
3
home/programs/games/minecraft.nix
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [prismlauncher];
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
imports = [
|
||||
./mpv.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
ardour
|
||||
lsp-plugins
|
||||
sunvox
|
||||
];
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
programs.thunderbird = {
|
||||
enable = true;
|
||||
profiles.xun = {
|
||||
isDefault = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
imports = [
|
||||
./mpd.nix
|
||||
./ncmpcpp.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
services.mpd = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
audio_output {
|
||||
type "pipewire"
|
||||
name "PipeWire Sound Server"
|
||||
}
|
||||
|
||||
audio_output {
|
||||
type "fifo"
|
||||
name "Visualizer feed"
|
||||
path "/tmp/mpd.fifo"
|
||||
format "44100:16:2"
|
||||
}
|
||||
|
||||
replaygain "track"
|
||||
'';
|
||||
musicDirectory = config.xdg.userDirs.music;
|
||||
};
|
||||
home.packages = [pkgs.mpc-cli];
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
programs.ncmpcpp = {
|
||||
enable = true;
|
||||
package = pkgs.ncmpcpp.override {
|
||||
visualizerSupport = true;
|
||||
clockSupport = true;
|
||||
};
|
||||
bindings = [
|
||||
{
|
||||
key = "j";
|
||||
command = "scroll_down";
|
||||
}
|
||||
{
|
||||
key = "k";
|
||||
command = "scroll_up";
|
||||
}
|
||||
{
|
||||
key = "J";
|
||||
command = ["select_item" "scroll_down"];
|
||||
}
|
||||
{
|
||||
key = "K";
|
||||
command = ["select_item" "scroll_up"];
|
||||
}
|
||||
];
|
||||
settings = {
|
||||
## Visualizer
|
||||
visualizer_data_source = "/tmp/mpd.fifo";
|
||||
visualizer_output_name = "Visualizer feed";
|
||||
visualizer_in_stereo = "yes";
|
||||
visualizer_type = "spectrum";
|
||||
visualizer_look = "●▮";
|
||||
|
||||
## Lyrics
|
||||
lyrics_fetchers = builtins.concatStringsSep "," [
|
||||
"musixmatch"
|
||||
"sing365"
|
||||
"metrolyrics"
|
||||
"justsomelyrics"
|
||||
"jahlyrics"
|
||||
"plyrics"
|
||||
"tekstowo"
|
||||
"zeneszoveg"
|
||||
"internet"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = [pkgs.spotify];
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
# authentication needs to be done manually once
|
||||
# TODO automatic authentication thing
|
||||
home.packages = with pkgs; [yams];
|
||||
systemd.user.services.yams = {
|
||||
Unit = {
|
||||
Description = "yams";
|
||||
Requires = ["mpd.service"];
|
||||
After = ["mpd.service"];
|
||||
};
|
||||
Install = {
|
||||
WantedBy = ["default.target"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
Environment = "NON_INTERACTIVE=1";
|
||||
ExecStart = "${pkgs.yams}/bin/yams -N";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./programs
|
||||
./shell/zsh.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
let
|
||||
musicDir = "/home/xun/music/library";
|
||||
in {
|
||||
programs.beets = {
|
||||
enable = true;
|
||||
settings = {
|
||||
directory = "${musicDir}/data";
|
||||
library = "${musicDir}/beets/beets.db";
|
||||
import = {
|
||||
log = "${musicDir}/beets/import.log";
|
||||
incremental = true;
|
||||
};
|
||||
plugins = [
|
||||
"embedart"
|
||||
"fetchart"
|
||||
"discogs"
|
||||
#"advancedrewrite"
|
||||
#"lyrics"
|
||||
"spotify"
|
||||
"scrub"
|
||||
"duplicates"
|
||||
"unimported"
|
||||
];
|
||||
|
||||
genres = true;
|
||||
|
||||
spotify.source_weight = 0.7;
|
||||
|
||||
embedart = {
|
||||
auto = true;
|
||||
ifempty = false;
|
||||
remove_art_file = false;
|
||||
};
|
||||
|
||||
unimported = {
|
||||
ignore_extensions = ["jpg" "png"];
|
||||
ignore_subdirectories = [];
|
||||
};
|
||||
|
||||
fetchart = {
|
||||
auto = true;
|
||||
cautious = true;
|
||||
minwidth = 500;
|
||||
maxwidth = 1200;
|
||||
cover_format = "jpeg";
|
||||
sources = [
|
||||
{"coverart" = "release";}
|
||||
{"coverart" = "releasegroup";}
|
||||
"albumart"
|
||||
"amazon"
|
||||
"google"
|
||||
"itunes"
|
||||
"fanarttv"
|
||||
"lastfm"
|
||||
"wikipedia"
|
||||
];
|
||||
|
||||
#lyrics = {
|
||||
# fallback = "''";
|
||||
# sources = ["musicmatch" "google"];
|
||||
#};
|
||||
|
||||
replace = {
|
||||
"[\\\\]" = "'";
|
||||
"[_]" = "-";
|
||||
"[\\]" = "-";
|
||||
"^\\." = "'";
|
||||
"[\\x00-\\x1f]" = "'";
|
||||
"[<>:\"\\?\\*\\|]" = "'";
|
||||
"\\.$" = "'";
|
||||
"\\s+$" = "'";
|
||||
"^\\s+" = "'";
|
||||
"^-" = "'";
|
||||
"’" = "'";
|
||||
"′" = "'";
|
||||
"″" = "'";
|
||||
"‐" = "-";
|
||||
};
|
||||
|
||||
aunique = {
|
||||
keys = ["albumartist" "albumtype" "year" "album"];
|
||||
disambuguators = ["format" "mastering" "media" "label" "albumdisambig" "releasegroupdisambig"];
|
||||
bracket = "[]";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
{config, ...}: {
|
||||
programs.fzf.enable = true;
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
autocd = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue