diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix index 5d54942..d08b671 100644 --- a/hosts/Lenni/default.nix +++ b/hosts/Lenni/default.nix @@ -3,6 +3,5 @@ imports = [ ./hardware-configuration.nix #./disko.nix - ./syncthing.nix ]; } diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix index 2f8eb6c..81f90fb 100644 --- a/hosts/Puenktchen/default.nix +++ b/hosts/Puenktchen/default.nix @@ -3,6 +3,5 @@ imports = [ ./hardware-configuration.nix ./disko.nix - ./syncthing.nix ]; } diff --git a/hosts/Puenktchen/syncthing.nix b/hosts/Puenktchen/syncthing.nix deleted file mode 100644 index c975529..0000000 --- a/hosts/Puenktchen/syncthing.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ ... }: -{ - services.syncthing = { - enable = true; - user = "willifan"; - dataDir = "/mnt/data"; - configDir = "/mnt/data/.config/syncthing"; - overrideDevices = true; - overrideFolders = true; - settings = { - gui = { - user = "willifan"; - password = "temppassword"; - }; - devices = { - Anton = { id = "WCDBADD-UPKCACI-X2YJOIO-5QC44PL-DBCR6TS-ADVQV33-HSMF32O-FOKMKAU"; }; - }; - folders = { - "Documents" = { - id = "jtl6g-qjmwo"; - path = "/mnt/data/Documents"; - devices = [ "Anton" ]; - }; - "Enpass" = { - id = "ciksm-xsw4m"; - path = "/mnt/data/Enpass"; - devices = [ "Anton" ]; - }; - "Pictures" = { - id = "po4qj-q9t0t"; - path = "/mnt/data/Pictures"; - devices = [ "Anton" ]; - }; - "Videos" = { - id = "4wqf5-xasng"; - path = "/mnt/data/Videos"; - devices = [ "Anton" ]; - }; - "Notes" = { - id = "oc61n-iewgj"; - path = "/mnt/data/Notes"; - devices = [ "Anton" ]; - }; - "Music" = { - id = "xxh8a-3y2tq"; - path = "/mnt/data/Music"; - devices = [ "Anton" ]; - }; - }; - }; - }; -} diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index d93246d..e0e477a 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -6,6 +6,7 @@ ./nfs-client.nix ./nix-ld.nix ./printers.nix + ./syncthing.nix ]; hardware.bluetooth.enable = true; diff --git a/hosts/Lenni/syncthing.nix b/hosts/desktop/syncthing.nix similarity index 100% rename from hosts/Lenni/syncthing.nix rename to hosts/desktop/syncthing.nix diff --git a/users/willifan/Lillie/default.nix b/users/willifan/Lillie/default.nix index af25aa0..1469dd4 100644 --- a/users/willifan/Lillie/default.nix +++ b/users/willifan/Lillie/default.nix @@ -2,7 +2,6 @@ { imports = [ - ./emulation.nix ./jovian.nix ]; } diff --git a/users/willifan/Lillie/emulation.nix b/users/willifan/Lillie/emulation.nix deleted file mode 100644 index c7cdc0f..0000000 --- a/users/willifan/Lillie/emulation.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - - environment.systemPackages = with pkgs; [ - melonDS - dolphin-emu - lime3ds - cemu - steam-rom-manager - ]; -} diff --git a/users/willifan/Lillie/jovian.nix b/users/willifan/Lillie/jovian.nix index ec96f29..fd3ecae 100644 --- a/users/willifan/Lillie/jovian.nix +++ b/users/willifan/Lillie/jovian.nix @@ -1,32 +1,8 @@ -{ pkgs, ... }: +{ ... }: { jovian = { - decky-loader = { - enable = true; - user = "willifan"; - extraPackages = with pkgs; [ - # Generic packages - curl - unzip - util-linux - gnugrep - - readline.out - procps - pciutils - libpulseaudio - - # SimpleDeckyTDP - ryzenadj # actual TDP util - kmod # modprobe for acpi_call check - ]; - extraPythonPackages = pythonPackages: with pythonPackages; [ - pyyaml # hhd-decky - aiohttp - certifi - ]; - }; + decky-loader.enable = true; devices.steamdeck = { enable = true; enableGyroDsuService = true; @@ -39,9 +15,4 @@ desktopSession = "hyprland"; }; }; - - environment.systemPackages = with pkgs; [ - python3 - ]; - } diff --git a/users/willifan/desktop/hyprland/Lillie/default.nix b/users/willifan/desktop/hyprland/Lillie/default.nix index efdc5fb..e6bedc1 100644 --- a/users/willifan/desktop/hyprland/Lillie/default.nix +++ b/users/willifan/desktop/hyprland/Lillie/default.nix @@ -4,7 +4,6 @@ programs.hyprland.enable = true; imports = [ ./fuzzel.nix - ./hyprexit.nix ./hyprland.nix ./hyprpaper.nix ./mako.nix diff --git a/users/willifan/desktop/hyprland/Lillie/hyprexit.nix b/users/willifan/desktop/hyprland/Lillie/hyprexit.nix deleted file mode 100644 index 28a653a..0000000 --- a/users/willifan/desktop/hyprland/Lillie/hyprexit.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - (pkgs.writeShellScriptBin "hyprexit" '' - ${hyprland}/bin/hyprctl dispatch exit - ${systemd}/bin/loginctl terminate-user willifan - '') - ]; -} diff --git a/users/willifan/desktop/hyprland/Lillie/hyprland.nix b/users/willifan/desktop/hyprland/Lillie/hyprland.nix index c276236..18eecfb 100644 --- a/users/willifan/desktop/hyprland/Lillie/hyprland.nix +++ b/users/willifan/desktop/hyprland/Lillie/hyprland.nix @@ -16,7 +16,7 @@ monitor = [ ", preffered, auto, 1" - "eDP-1, preffered, 0x0, 1.25, transform, 3" + "eDP-1, 1280x800, 0x0, 1.5, transform, 1" ]; # Execute your favorite apps at launch exec-once = [ @@ -44,8 +44,6 @@ follow_mouse = 1; touchpad.natural_scroll = "yes"; - - touchdevice.transform = 3; sensitivity = -0.8; # -1.0 - 1.0, 0 means no modification. numlock_by_default = 1;