diff --git a/bg.jpg b/bg.jpg new file mode 100644 index 0000000..6725978 Binary files /dev/null and b/bg.jpg differ diff --git a/etc/apps/dttyper/default.nix b/etc/apps/dttyper/default.nix deleted file mode 100755 index fd52632..0000000 --- a/etc/apps/dttyper/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, rustPlatform, fetchFromGitea, pkgs, stdenv, ... }: - -rustPlatform.buildRustPackage rec { - pname = "dttyper"; - version = "1.4.0"; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkgs.pkg-config ]; - OPENSSL_NO_VENDOR = 1; - buildInputs = lib.optionals stdenv.isLinux [ pkgs.openssl ]; - - src = fetchFromGitea { - domain = "git.berryez.xyz"; - owner = "berry"; - repo = "dttyper"; - rev = "89203be0677520d4e6945254419e7ae7377581ae"; - hash = "sha256-ZlCvMgb8yE3zDmCteyy8XXvgz+clpccV3gtXKHyZGlo="; - }; - - cargoHash = "sha256-dpN7hHpqSur6KjtEikVjQMqnF8PW27ax7ccpQNU5vdA="; - - meta = with lib; { - description = "Terminal-based typing test which exports each test into an influx bd"; - homepage = "https://git.berryez.xyz/berry/dttyper"; - license = licenses.mit; - }; -} diff --git a/etc/apps/firefox.nix b/etc/apps/firefox.nix deleted file mode 100755 index 8b13789..0000000 --- a/etc/apps/firefox.nix +++ /dev/null @@ -1 +0,0 @@ - diff --git a/etc/apps/goki/default.nix b/etc/apps/goki/default.nix deleted file mode 100755 index 251abb8..0000000 --- a/etc/apps/goki/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, pkgs, stdenv, ... }: -buildGoModule rec { - pname = "goki"; - version = "0.1.1"; - - src = fetchFromGitHub - { - owner = "abeleinin"; - repo = "goki"; - rev = "b2c4ee6f0e040ce9ac2b089ab01438066e47bb9f"; - hash = "sha256-ThAQ/VgIBjKyAmo2oZARh3nqo8wB6nuv/HYRCOSbe8U="; - }; - - - vendorHash = "sha256-SCX/eXXnwnCNZ11jw+ZNeJ42HUhI5MnV+AaO89BTKJs="; - - meta = with lib; { - description = "An intelligent flashcard management tool for the terminal! "; - homepage = "https://github.com/abeleinin/goki"; - license = licenses.mit; - }; -} diff --git a/etc/apps/gpu-screen-recorder/default.nix b/etc/apps/gpu-screen-recorder/default.nix deleted file mode 100755 index 60c2c67..0000000 --- a/etc/apps/gpu-screen-recorder/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv -, lib -, fetchurl -, makeWrapper -, pkgs -}: - -stdenv.mkDerivation { - pname = "gpu-screen-recorder"; - version = "unstable-2023-11-18"; - - # printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - src = fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r418.5a8900e.tar.gz"; - hash = "sha256-Dal6KxQOTqoNH6e8lYk5XEXGFG/vzbguNFZ9yk9nKe0="; - }; - sourceRoot = "."; - - nativeBuildInputs = with pkgs; [ - pkg-config - makeWrapper - ]; - - buildInputs = with pkgs; [ - xorg.libXcomposite - libpulseaudio - ffmpeg - wayland - libdrm - libva - xorg.libXrandr - linuxKernel.packages.linux_xanmod_stable.nvidia_x11 - ]; - - buildPhase = '' - ./build.sh - ''; - - postInstall = '' - install -Dt $out/bin gpu-screen-recorder gsr-kms-server - mkdir $out/bin/.wrapped - mv $out/bin/gpu-screen-recorder $out/bin/.wrapped/ - makeWrapper "$out/bin/.wrapped/gpu-screen-recorder" "$out/bin/gpu-screen-recorder" \ - --prefix LD_LIBRARY_PATH : ${pkgs.libglvnd}/lib \ - --prefix LD_LIBRARY_PATH : ${pkgs.linuxKernel.packages.linux_xanmod_stable.nvidia_x11}/lib \ - --prefix PATH : $out/bin - ''; - - meta = with lib; { - description = "A screen recorder that has minimal impact on system performance by recording a window using the GPU only"; - homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ babbaj ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/etc/apps/music.nix b/etc/apps/music.nix deleted file mode 100755 index b168570..0000000 --- a/etc/apps/music.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, config, ... }: { - environment.systemPackages = with pkgs; [ - cmus - playerctl - jamesdsp - yt-dlp - #picard # audio metadata - #ncmpc - #mpd - ]; - - home-manager.users.grape = { - services.mpd-mpris = { - enable = false; - mpd = { - useLocal = true; - }; - }; - # running it via home manager, as by default it has no permission to access my audio drivers - services.mpd = { - enable = false; - musicDirectory = "/home/grape/Music"; - playlistDirectory = "/home/grape/Music/playlists"; - network = { - port = 6600; - listenAddress = "127.0.0.1"; - }; - }; - }; -} - diff --git a/etc/apps/romodoro/default.nix b/etc/apps/romodoro/default.nix deleted file mode 100755 index 9152c58..0000000 --- a/etc/apps/romodoro/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, rustPlatform, fetchFromGitea, pkgs, stdenv, ... }: - -rustPlatform.buildRustPackage rec { - pname = "romodoro"; - version = "0.1.4"; - - nativeBuildInputs = [ - # adding unstable rustc - pkgs.unstable.rustc - pkgs.pkg-config - pkgs.git - pkgs.cmake - ]; - - buildInputs = [ - pkgs.alsa-oss - pkgs.alsa-lib.dev - pkgs.alsa-utils - pkgs.git - ]; - - src = fetchFromGitea - { - domain = "git.berryez.xyz"; - owner = "berry"; - repo = "romodoro"; - rev = "11414e11c99bebee6fee1561c5f8158405b05708"; - hash = "sha256-7OnY8pUrDZ26sbpE7Yco6k3UhcB+7Ipd6FskHG97m58="; - }; - - cargoHash = "sha256-FTolAioLPwLoFRWRepdAcirS5zSKKTCGR8qGyevABNA="; - - meta = with lib; { - description = "A TUI pomodoro written in rust"; - homepage = "https://git.berryez.xyz/berry/romodoro"; - license = licenses.mit; - }; -} diff --git a/etc/opt/firefox/bookmarks.nix b/etc/opt/firefox/bookmarks.nix deleted file mode 100755 index 638d06e..0000000 --- a/etc/opt/firefox/bookmarks.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - - { - name = "Stats"; - tags = [ "metrics" ]; - keyword = "grafana"; - url = "http://stats.barna.local"; - } - { - name = "Slskd - Soulseek server"; - tags = [ "music" "piracy" ]; - keyword = "slskd"; - url = "http://32.54.31.5:5030"; - } - { - name = "Gitea - berryez"; - tags = [ "git" "code" ]; - keyword = "gitea"; - url = "https://git.berryez.xyz"; - } - { - name = "NUR"; - tags = [ "nixos" ]; - keyword = "nur"; - url = "https://nur.nix-community.org/"; - } - -] - diff --git a/init.sh b/init.sh new file mode 100755 index 0000000..4e12205 --- /dev/null +++ b/init.sh @@ -0,0 +1,6 @@ +#! /bin/sh + +mkdir ~/Pictures +mkdir ~/Pictures/screenshots +mkdir ~/Videos +mkdir ~/Videos/replays diff --git a/kzszs10_james_dsp.conf b/kzszs10_james_dsp.conf new file mode 100644 index 0000000..960b8d2 --- /dev/null +++ b/kzszs10_james_dsp.conf @@ -0,0 +1,51 @@ +bass_enable=false +bass_maxgain=5 +compander_enable=false +compander_granularity=2 +compander_response=95.0;200.0;400.0;800.0;1600.0;3400.0;7500.0;0;0;0;0;0;0;0 +compander_time_freq_transforms=0 +compander_timeconstant=0.22000 +convolver_enable=false +convolver_file= +convolver_optimization_mode=0 +convolver_waveform_edit=-80;-100;0;0;0;0 +crossfeed_bs2b_fcut=700 +crossfeed_bs2b_feed=60 +crossfeed_enable=false +crossfeed_mode=0 +ddc_enable=false +ddc_file= +graphiceq_enable=true +graphiceq_param=GraphicEQ: 20 -3.1; 21 -3.3; 22 -3.3; 23 -3.3; 24 -3.4; 26 -3.6; 27 -3.7; 29 -3.9; 30 -3.9; 32 -4; 34 -4; 36 -4.1; 38 -4.2; 40 -4.2; 43 -4.3; 45 -4.3; 48 -4.3; 50 -4.4; 53 -4.4; 56 -4.5; 59 -4.7; 63 -4.8; 66 -4.9; 70 -5; 74 -5.2; 78 -5.4; 83 -5.6; 87 -5.8; 92 -6; 97 -6.2; 103 -6.5; 109 -6.8; 115 -7; 121 -7.1; 128 -7.3; 136 -7.4; 143 -7.5; 151 -7.6; 160 -7.6; 169 -7.5; 178 -7.5; 188 -7.4; 199 -7.2; 210 -7; 222 -6.8; 235 -6.6; 248 -6.4; 262 -6.2; 277 -5.9; 292 -5.6; 309 -5.3; 326 -5; 345 -4.7; 364 -4.4; 385 -4; 406 -3.7; 429 -3.4; 453 -3.1; 479 -2.8; 506 -2.5; 534 -2.2; 565 -1.9; 596 -1.7; 630 -1.5; 665 -1.3; 703 -1.1; 743 -0.9; 784 -1.2; 829 -0.9; 875 -0.2; 924 -0.5; 977 -0.9; 1032 -1.2; 1090 -1.6; 1151 -1.9; 1216 -2.2; 1284 -2.5; 1357 -2.8; 1433 -3.1; 1514 -3.5; 1599 -3.9; 1689 -4.4; 1784 -5; 1885 -5.6; 1991 -6.2; 2103 -6.5; 2221 -6.4; 2347 -5.8; 2479 -4.9; 2618 -4.1; 2766 -3.6; 2921 -3.5; 3086 -3.8; 3260 -4.1; 3443 -4.6; 3637 -5.2; 3842 -5.2; 4058 -4; 4287 -2.5; 4528 -1.2; 4783 -1.6; 5052 -3.1; 5337 -4.6; 5637 -5.9; 5955 -4.9; 6290 -3.2; 6644 -1.8; 7018 -0.5; 7414 -0.8; 7831 -1.4; 8272 -1.7; 8738 -2.3; 9230 -3; 9749 -3.6; 10298 -3.9; 10878 -4; 11490 -4.1; 12137 -4.1; 12821 -4.2; 13543 -4.2; 14305 -4.1; 15110 -4.1; 15961 -4; 16860 -3.9; 17809 -3.8; 18812 -3.6; 19871 -3.5 +liveprog_enable=true +liveprog_file=/home/grape/.config/jamesdsp/liveprog/dynamicbass.eel +master_enable=true +master_limrelease=223 +master_limthreshold=-5 +master_postgain=4 +reverb_bassboost=0.25000 +reverb_decay=2.09000 +reverb_delay=0.00000 +reverb_enable=false +reverb_finaldry=-7.00000 +reverb_finalwet=-9.00000 +reverb_lfo_spin=0.70000 +reverb_lfo_wander=0.30000 +reverb_lpf_bass=600 +reverb_lpf_damp=9000 +reverb_lpf_input=18000 +reverb_lpf_output=17000 +reverb_osf=1 +reverb_reflection_amount=0.30000 +reverb_reflection_factor=1.00000 +reverb_reflection_width=0.70000 +reverb_wet=-8.00000 +reverb_width=1.00000 +stereowide_enable=false +stereowide_level=60 +tone_enable=true +tone_eq=25.0;40.0;63.0;100.0;160.0;250.0;400.0;630.0;1000.0;1600.0;2500.0;4000.0;6300.0;10000.0;16000.0;8.38776;8.22449;8.06122;8.08163;3.26531;1.65306;1.4898;-0.142857;0.244898;-0.979591;0.102041;-0.816327;0.163264;-0.918367;0.591837 +tone_filtertype=0 +tone_interpolation=0 +tube_enable=false +tube_pregain=200 diff --git a/etc/apps/communication.nix b/nix/apps/communication.nix similarity index 100% rename from etc/apps/communication.nix rename to nix/apps/communication.nix diff --git a/etc/apps/graphics.nix b/nix/apps/graphics.nix similarity index 100% rename from etc/apps/graphics.nix rename to nix/apps/graphics.nix diff --git a/etc/apps/keepassxc.nix b/nix/apps/keepassxc.nix similarity index 100% rename from etc/apps/keepassxc.nix rename to nix/apps/keepassxc.nix diff --git a/nix/apps/music.nix b/nix/apps/music.nix new file mode 100755 index 0000000..00b3cc5 --- /dev/null +++ b/nix/apps/music.nix @@ -0,0 +1,10 @@ +{ pkgs, config, ... }: { + environment.systemPackages = with pkgs; [ + #cmus + playerctl + jamesdsp + yt-dlp + feishin + ]; +} + diff --git a/etc/apps/office.nix b/nix/apps/office.nix similarity index 100% rename from etc/apps/office.nix rename to nix/apps/office.nix diff --git a/etc/apps/prod.nix b/nix/apps/prod.nix similarity index 100% rename from etc/apps/prod.nix rename to nix/apps/prod.nix diff --git a/etc/apps/syncthing.nix b/nix/apps/syncthing.nix similarity index 100% rename from etc/apps/syncthing.nix rename to nix/apps/syncthing.nix diff --git a/etc/configs/alacritty.nix b/nix/configs/alacritty.nix similarity index 100% rename from etc/configs/alacritty.nix rename to nix/configs/alacritty.nix diff --git a/etc/configs/btop.nix b/nix/configs/btop.nix similarity index 100% rename from etc/configs/btop.nix rename to nix/configs/btop.nix diff --git a/etc/configs/builders.nix b/nix/configs/builders.nix similarity index 100% rename from etc/configs/builders.nix rename to nix/configs/builders.nix diff --git a/etc/configs/element.nix b/nix/configs/element.nix similarity index 100% rename from etc/configs/element.nix rename to nix/configs/element.nix diff --git a/etc/configs/firefox.nix b/nix/configs/firefox.nix similarity index 91% rename from etc/configs/firefox.nix rename to nix/configs/firefox.nix index 80910f1..37414f7 100644 --- a/etc/configs/firefox.nix +++ b/nix/configs/firefox.nix @@ -7,9 +7,9 @@ isDefault = true; id = 0; # TODO fix impurity - extraConfig = builtins.readFile "/etc/nixos/opt/firefox/user.js"; # custom userjs config - userChrome = builtins.readFile "/etc/nixos/opt/firefox/userChrome.css"; # browser styles - userContent = builtins.readFile "/etc/nixos/opt/firefox/userContent.css"; # browser styles + extraConfig = builtins.readFile "/home/grape/dotfiles/nix/opt/firefox/user.js"; # custom userjs config + userChrome = builtins.readFile "/home/grape/dotfiles/nix/opt/firefox/userChrome.css"; # browser styles + userContent = builtins.readFile "/home/grape/dotfiles/nix/opt/firefox/userContent.css"; # browser styles extensions = [ @@ -103,7 +103,7 @@ }; }; }; - + } diff --git a/etc/configs/firewall.nix b/nix/configs/firewall.nix similarity index 100% rename from etc/configs/firewall.nix rename to nix/configs/firewall.nix diff --git a/etc/configs/gpu-screen-recorder.nix b/nix/configs/gpu-screen-recorder.nix similarity index 90% rename from etc/configs/gpu-screen-recorder.nix rename to nix/configs/gpu-screen-recorder.nix index 13ea7a9..fbbf38c 100644 --- a/etc/configs/gpu-screen-recorder.nix +++ b/nix/configs/gpu-screen-recorder.nix @@ -10,5 +10,8 @@ --prefix LD_LIBRARY_PATH : ${pkgs.libglvnd}/lib \ --prefix LD_LIBRARY_PATH : ${config.boot.kernelPackages.nvidia_x11}/lib '') + # for scripts + pkgs.xdotool + pkgs.jq ]; } diff --git a/etc/configs/i3.nix b/nix/configs/i3.nix similarity index 98% rename from etc/configs/i3.nix rename to nix/configs/i3.nix index 34221d0..248ae3e 100755 --- a/etc/configs/i3.nix +++ b/nix/configs/i3.nix @@ -3,11 +3,7 @@ let scripts = "~/.config/scripts"; in { - environment.systemPackages = with pkgs; [ - # for replay - xdotool - jq - ]; + home-manager.users.grape.xsession.windowManager.i3 = { enable = true; @@ -64,6 +60,8 @@ in "mod4+t" = "exec alacritty"; "mod4+r" = "exec firefox"; + "mod4+m" = "exec feishin"; + "mod4+p" = "exec keepassxc"; # power off diff --git a/etc/configs/kitty.nix b/nix/configs/kitty.nix similarity index 100% rename from etc/configs/kitty.nix rename to nix/configs/kitty.nix diff --git a/etc/configs/nvim.nix b/nix/configs/nvim.nix similarity index 100% rename from etc/configs/nvim.nix rename to nix/configs/nvim.nix diff --git a/etc/configs/ollama.nix b/nix/configs/ollama.nix similarity index 100% rename from etc/configs/ollama.nix rename to nix/configs/ollama.nix diff --git a/etc/configs/picom.nix b/nix/configs/picom.nix similarity index 97% rename from etc/configs/picom.nix rename to nix/configs/picom.nix index de4d84c..16db888 100755 --- a/etc/configs/picom.nix +++ b/nix/configs/picom.nix @@ -72,6 +72,8 @@ "80:class_g *= 'rofi'" "80:class_g *= 'lutris'" "80:class_g *= 'Mumble'" + "80:class_g *= 'Feishin'" + "80:class_g *= 'feishin'" "80:class_g *= 'Element'" "85:class_g *= 'Logseq'" "85:class_g *= 'Codium'" diff --git a/etc/configs/polybar.nix b/nix/configs/polybar.nix similarity index 99% rename from etc/configs/polybar.nix rename to nix/configs/polybar.nix index 9c0152f..6ad40a2 100755 --- a/etc/configs/polybar.nix +++ b/nix/configs/polybar.nix @@ -156,7 +156,7 @@ in "module/fs-data" = { "inherit" = "fs-base"; - mount-0 = "/mnt/terra"; + mount-0 = "/media/terra"; interval = 30; label-mounted = "%free%(%total%)"; }; diff --git a/etc/configs/polybar/bottom.nix b/nix/configs/polybar/bottom.nix similarity index 91% rename from etc/configs/polybar/bottom.nix rename to nix/configs/polybar/bottom.nix index d42207e..e311313 100644 --- a/etc/configs/polybar/bottom.nix +++ b/nix/configs/polybar/bottom.nix @@ -14,7 +14,7 @@ let seperatorColor = "#FAD000"; }; - script = "~/.config/scripts"; + script = "~/dotfiles/scripts"; in { @@ -59,13 +59,7 @@ in click-right = "pavucontrol"; }; - "module/timew" = { - exec = "${script}/timew.sh"; - format = "%{T2}%{F#191830}%{F-}%{T-}