diff --git a/flake.nix b/flake.nix index a098921..6e71801 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ inputs.nix-flatpak.homeManagerModules.nix-flatpak ]; - home-manager.backupFileExtension = "backup6"; + home-manager.backupFileExtension = "backup99"; } ]; }; diff --git a/modules/packages/default.nix b/modules/packages/default.nix index 7f07701..431bcf0 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -22,8 +22,9 @@ gftp # when pcmanfm die clang-tools multipath-tools # for pmbootstrap - nil # nix language server + nil # nix lang server typescript-language-server + jdt-language-server (python3.withPackages (lib: with lib; [ requests @@ -246,5 +247,7 @@ "net.sapples.LiveCaptions" "io.github.mrvladus.List" "app.zen_browser.zen" + "io.github.Soundux" ]; + } diff --git a/modules/packages/discord.nix b/modules/packages/discord.nix index e2d310c..560168b 100644 --- a/modules/packages/discord.nix +++ b/modules/packages/discord.nix @@ -14,7 +14,7 @@ enable = true; configDir = "${config.home.homeDirectory}/.config/discord"; package = pkgs.discord.overrideAttrs (oldAttrs: let - proxy = "127.0.0.1:1080"; + proxy = "127.0.0.1:10080"; in { src = builtins.fetchurl { url = "https://files.meex.lol/discord-linux-stable/discord-0.0.102.tar.gz"; diff --git a/modules/proxies/.gitignore b/modules/proxies/.gitignore index 5ff3f14..41ff3f3 100644 --- a/modules/proxies/.gitignore +++ b/modules/proxies/.gitignore @@ -1 +1,2 @@ shadowsocks.json +hysteria.yml diff --git a/modules/proxies/default.nix b/modules/proxies/default.nix index 1a74a1d..b81d3fc 100644 --- a/modules/proxies/default.nix +++ b/modules/proxies/default.nix @@ -2,7 +2,8 @@ { imports = [ - ./shadowsocks.nix + # ./shadowsocks.nix ./byedpi.nix + ./hysteria.nix ]; } diff --git a/modules/proxies/hysteria.nix b/modules/proxies/hysteria.nix new file mode 100644 index 0000000..60dfa87 --- /dev/null +++ b/modules/proxies/hysteria.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: + +{ + systemd.user.services.hysteria-proxy = { + Unit.Description = "Shadowsocks proxy service"; + Install.WantedBy = [ "default.target" ]; + Service = { + Restart = "always"; + ExecStart = "${pkgs.writeShellScript "hysteria-service-start" '' + #!/run/current-system/sw/bin/bash + ${pkgs.hysteria}/bin/hysteria -c ${./hysteria.yml} + ''}"; + ExecStop = "${pkgs.writeShellScript "hysteria-service-stop" '' + #!/run/current-system/sw/bin/bash + ${pkgs.toybox}/bin/killall hysteria + ''}"; + + }; + }; +} diff --git a/modules/sway/default.nix b/modules/sway/default.nix index 12d0e1b..59b5059 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -81,6 +81,26 @@ extraOptions = [ "--unsupported-gpu" ]; + extraSessionCommands = '' + # Hardware cursors not yet working on wlroots + export WLR_NO_HARDWARE_CURSORS=1 + # Set wlroots renderer to Vulkan to avoid flickering + # export WLR_RENDERER=vulkan + # General wayland environment variables + export XDG_SESSION_TYPE=wayland + export QT_QPA_PLATFORM=wayland + export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + # Firefox wayland environment variable + export MOZ_ENABLE_WAYLAND=1 + export MOZ_USE_XINPUT2=1 + # OpenGL Variables + export GBM_BACKEND=nvidia-drm + export __GL_GSYNC_ALLOWED=0 + export __GL_VRR_ALLOWED=0 + export __GLX_VENDOR_LIBRARY_NAME=nvidia + # Xwayland compatibility + export XWAYLAND_NO_GLAMOR=1 + ''; config = { defaultWorkspace = "workspace number 1"; menu = "wofi --show run"; @@ -176,7 +196,8 @@ (video {instance = "chromium";}) (video (class "firefox")) (video (class "Nightly")) - + + (important { app_id = "xarchiver"; }) (important (pcmanfm_title "Confirm to replace files")) (important (pcmanfm_title "(?:Open|Save) (?:File|Folder|As)")) (important (pcmanfm_title "^(File|Folder)\s*Already Exists\s*—\s*")) diff --git a/modules/sway/startup.sh b/modules/sway/startup.sh index 2d3dfcc..61e15c9 100755 --- a/modules/sway/startup.sh +++ b/modules/sway/startup.sh @@ -3,7 +3,8 @@ dunst & copyq & blueman-applet & -~/.config/sway/random-bg.py loop & +# ~/.config/sway/random-bg.py loop & +swaybg -m fill -i ~/.config/sway/wallpapers/wallhaven-218d7y.jpg & ~/.startup & wait diff --git a/modules/sway/wallpapers/wallhaven-218d7y.jpg b/modules/sway/wallpapers/wallhaven-218d7y.jpg new file mode 100644 index 0000000..a8e5505 Binary files /dev/null and b/modules/sway/wallpapers/wallhaven-218d7y.jpg differ diff --git a/system/default.nix b/system/default.nix index 2ae53ba..e5f571d 100644 --- a/system/default.nix +++ b/system/default.nix @@ -178,15 +178,25 @@ programs.adb.enable = true; users.extraGroups.adbusers.members = [ "user" ]; + # obs + programs.obs-studio = { + enable = true; + enableVirtualCamera = true; + + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + obs-gstreamer + obs-vkcapture + ]; + }; + # system-wide packages environment.systemPackages = with pkgs; [ - vim curl git + vim curl git openssl ]; - # obs - programs.obs-studio.enable = true; - programs.obs-studio.enableVirtualCamera = true; - # enable xdg portal and flatpak xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];