diff --git a/hosts/april/default.nix b/hosts/april/default.nix index 5e84da4..e0fa2ae 100644 --- a/hosts/april/default.nix +++ b/hosts/april/default.nix @@ -21,6 +21,10 @@ amdgpu.enable = false; }; + environment.systemPackages = with pkgs; [ + remmina + ]; + services = { vnstat.enable = true; }; diff --git a/modules/home/kanshi.nix b/modules/home/kanshi.nix index 6c49088..015b7b7 100644 --- a/modules/home/kanshi.nix +++ b/modules/home/kanshi.nix @@ -76,17 +76,18 @@ }; home = { outputs = [ - { - criteria = "eDP-1"; - position = "152,1440"; - } { criteria = "LG Electronics LG ULTRAGEAR+ 507NTRLM0646"; scale = 1.0; status = "enable"; position = "0,0"; # adaptiveSync = true; - mode = "2560x1440@144Hz"; + mode = if (host == "sakura") then "2560x1440@60Hz" else "2560x1440@60Hz"; + } + { + criteria = "eDP-1"; + status = if (host == "sakura") then "enable" else "disable"; + position = if (host == "sakura") then "152,1440" else "300,1440"; } ]; }; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 074b71b..9069d0b 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -27,7 +27,6 @@ qbittorrent # CLI shit - bitwarden-cli imagemagick foot # termpdfpy # shit broke again smfh @@ -56,10 +55,10 @@ yarn cargo rustc - wikit - reader + # wikit + # reader nmap - speedtest-go + # speedtest-go powertop android-tools sshpass @@ -75,10 +74,10 @@ # '') # Email/calendar/etc - neomutt + # neomutt w3m - khard - khal - vdirsyncer + # khard + # khal + # vdirsyncer ]; } diff --git a/roles/creative.nix b/roles/creative.nix index cb2762d..f252080 100644 --- a/roles/creative.nix +++ b/roles/creative.nix @@ -38,9 +38,9 @@ in gimp darktable audacity - kdePackages.kdenlive orca-slicer - freecad + # kdePackages.kdenlive + # freecad ]; }; }; diff --git a/roles/gui.nix b/roles/gui.nix index bf34e9a..5e323a8 100644 --- a/roles/gui.nix +++ b/roles/gui.nix @@ -69,23 +69,18 @@ in signal-desktop mumble anki-bin - obs-studio wdisplays - librewolf # main - ungoogled-chromium # for things that don't work with librewolf + librewolf + ungoogled-chromium nsxiv imv libreoffice - #xfce.thunar nautilus - # spotify spotify-player thunderbird lxqt.pavucontrol-qt mpv kdePackages.kdeconnect-kde - winbox - # onthespot-overlay # Gaming lunar-client @@ -100,7 +95,6 @@ in pkgs.twemoji-color-font pkgs.noto-fonts-color-emoji pkgs.swww - pkgs.swaylock pkgs.pywal16 ]; };