diff --git a/profiles/personal/home.nix b/profiles/personal/home.nix index 4d7abe7..e6b2ce8 100644 --- a/profiles/personal/home.nix +++ b/profiles/personal/home.nix @@ -21,7 +21,6 @@ librewolf brave git - syncthing ]; diff --git a/profiles/work/home.nix b/profiles/work/home.nix index b9ed613..dd0e62f 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -34,7 +34,6 @@ brave qutebrowser git - syncthing # Office libreoffice-fresh @@ -188,8 +187,6 @@ extension = "svg"; }; - services.syncthing.enable = true; - xdg.enable = true; xdg.userDirs = { enable = true; diff --git a/profiles/wsl/home.nix b/profiles/wsl/home.nix index e742270..6eb7d83 100644 --- a/profiles/wsl/home.nix +++ b/profiles/wsl/home.nix @@ -22,7 +22,6 @@ # Core zsh git - syncthing # Office libreoffice-fresh @@ -33,8 +32,6 @@ nodePackages.ungit ]; - services.syncthing.enable = true; - xdg.enable = true; xdg.userDirs = { enable = true; diff --git a/system/security/firewall.nix b/system/security/firewall.nix index ff582da..a27abad 100644 --- a/system/security/firewall.nix +++ b/system/security/firewall.nix @@ -4,8 +4,6 @@ # Firewall networking.firewall.enable = true; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 22000 21027 ]; # syncthing - networking.firewall.allowedUDPPorts = [ 22000 21027 ]; # syncthing # Or disable the firewall altogether. # networking.firewall.enable = false; } diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index dac93db..749a9ce 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -53,7 +53,6 @@ in #exec-once = STEAM_FRAME_FORCE_CLOSE=1 steam -silent exec-once = nm-applet exec-once = blueman-applet - exec-once = GOMAXPROCS=1 syncthing --no-browser exec-once = protonmail-bridge --noninteractive exec-once = waybar diff --git a/user/wm/xmonad/README.org b/user/wm/xmonad/README.org deleted file mode 100644 index 79692bb..0000000 --- a/user/wm/xmonad/README.org +++ /dev/null @@ -1,28 +0,0 @@ -#+title: XMonad -#+author: Emmet - -* What is XMonad? -[[https://xmonad.org/][XMonad]] is a tiling window manager written and configured in Haskell. Since I have built up my own XMonad config over a few years, it is extremely efficient for me to operate (since it can be managed fully with the keyboard). - -[[xmonad.png]] - -With my XMonad setup, there are several auxiliary utilities required to make it a "full desktop environment." A few of these packages include: -- [[https://codeberg.org/xmobar/xmobar][xmobar]] - Status bar -- [[https://github.com/davatorium/rofi][rofi]] - App launcher -- [[https://github.com/sagb/alttab][alttab]] - Window switcher -- [[https://feh.finalrewind.org/][feh]] - Wallpaper utility -- pavucontrol and pamixer - Sound and volume control -- [[https://github.com/firecat53/networkmanager-dmenu][networkmanager_dmenu]] - Internet connection control -- brightnessctl - Screen brightness control -- [[https://www.umaxx.net/][sct]] - Adjust screen color temperature -- xkill and killall - Better than hitting Ctrl+Alt+Delete and waiting a few minutes - -* My Config -This directory includes my XMonad configuration, which consists of: -- [[./xmonad.hs][xmonad.hs]] - Main configuration -- [[./startup.sh][startup.sh]] - Startup script called by XMonad on startup -- [[./lib/Colors/Stylix.hs.mustache][lib/Colors/Stylix.hs.mustache]] - Mustache template used to generate color library to theme XMonad with Stylix -- [[./xmobarrc.mustache][xmobarrc.mustache]] - Mustache template used to generate my xmobar config themed with Stylix -- [[./xmonad.nix][xmonad.nix]] - Loads XMonad and my configuration (along with any necessary packages for my config) into my flake when imported - -My full config is a [[./xmonad.org][literate org document (xmonad.org)]]. diff --git a/user/wm/xmonad/startup.sh b/user/wm/xmonad/startup.sh index 94e95d7..33061bc 100755 --- a/user/wm/xmonad/startup.sh +++ b/user/wm/xmonad/startup.sh @@ -19,7 +19,6 @@ setxkbmap -option caps:escape & alttab -w 1 -t 240x160 -i 64x64 -sc 1 -bg $colorBg -fg $colorFg -frame $colorSecondary -inact $colorFg & ##/usr/bin/trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --transparent true --alpha 0 --height 28 --tint $trayertint --monitor "primary" & nm-applet & -GOMAXPROCS=1 syncthing --no-browser & protonmail-bridge --noninteractive & gnome-keyring-daemon --daemonize --login & gnome-keyring-daemon --start --components=secrets & diff --git a/user/wm/xmonad/xmobarrc.mustache b/user/wm/xmonad/xmobarrc.mustache index 65cd7ac..e1ba432 100644 --- a/user/wm/xmonad/xmobarrc.mustache +++ b/user/wm/xmonad/xmobarrc.mustache @@ -39,9 +39,7 @@ Config { font = "Inconsolata 16" , Run DynNetwork [ "-t", "\xf0200 "] 1 , Run Com "cat" - [ "/home/ama/.st-status"] "syncthing" 10 , Run Com "echo" - [ "\xea77 "] "syncthingsymbol" 0 , Run Com "echo" [ "\xeb5c "] "artsymbol" 0 , Run Com "cat" @@ -50,6 +48,6 @@ Config { font = "Inconsolata 16" ] , sepChar = "%" , alignSep = "}{" - , template = " %battery% %bright%%default:Master% %memory% %artsymbol%%currenttheme%}%XMonadLog%{%syncthing% %dynnetwork% %date% " + , template = " %battery% %bright%%default:Master% %memory% %artsymbol%%currenttheme%}%XMonadLog%{ %dynnetwork% %date% " } } diff --git a/user/wm/xmonad/xmonad.hs b/user/wm/xmonad/xmonad.hs index c711811..a17040a 100644 --- a/user/wm/xmonad/xmonad.hs +++ b/user/wm/xmonad/xmonad.hs @@ -399,7 +399,6 @@ myManageHook = title =? "scratch_cfw" --> (customFloating $ W.RationalRect 0.58 0.04 0.42 0.7), title =? "xmonad_helpmenu" --> (customFloating $ W.RationalRect 0.05 0.05 0.9 0.9), className =? "Pavucontrol" --> (customFloating $ W.RationalRect 0.05 0.04 0.5 0.35), - className =? "Syncthing GTK" --> (customFloating $ W.RationalRect 0.53 0.50 0.46 0.45), className =? "Proton Mail Bridge" --> (customFloating $ W.RationalRect 0.59 0.66 0.40 0.30), className =? "Zenity" --> (customFloating $ W.RationalRect 0.45 0.4 0.1 0.2), resource =? "desktop_window" --> doIgnore,