From fb85169fdb219e903a81c99f67fee2414d4cdea6 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sun, 3 Nov 2024 20:22:01 +0100
Subject: [PATCH 1/7] fixed hyprland display
---
users/willifan/desktop/hyprland/Lillie/hyprland.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/users/willifan/desktop/hyprland/Lillie/hyprland.nix b/users/willifan/desktop/hyprland/Lillie/hyprland.nix
index 18eecfb..8d3210a 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, 1280x800, 0x0, 1.5, transform, 1"
+ "eDP-1, preffered, 0x0, 1.6, transform, 3"
];
# Execute your favorite apps at launch
exec-once = [
From 8bf1ac05e1a70eeca931d778b563174103505ba5 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sun, 3 Nov 2024 20:43:18 +0100
Subject: [PATCH 2/7] added hyprexit workaround
---
users/willifan/desktop/hyprland/Lillie/default.nix | 1 +
users/willifan/desktop/hyprland/Lillie/hyprexit.nix | 9 +++++++++
2 files changed, 10 insertions(+)
create mode 100644 users/willifan/desktop/hyprland/Lillie/hyprexit.nix
diff --git a/users/willifan/desktop/hyprland/Lillie/default.nix b/users/willifan/desktop/hyprland/Lillie/default.nix
index e6bedc1..efdc5fb 100644
--- a/users/willifan/desktop/hyprland/Lillie/default.nix
+++ b/users/willifan/desktop/hyprland/Lillie/default.nix
@@ -4,6 +4,7 @@
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
new file mode 100644
index 0000000..28a653a
--- /dev/null
+++ b/users/willifan/desktop/hyprland/Lillie/hyprexit.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+ environment.systemPackages = with pkgs; [
+ (pkgs.writeShellScriptBin "hyprexit" ''
+ ${hyprland}/bin/hyprctl dispatch exit
+ ${systemd}/bin/loginctl terminate-user willifan
+ '')
+ ];
+}
From cc94956b4bf2dff45ef0a0afbdb48de55159e781 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sun, 3 Nov 2024 21:06:07 +0100
Subject: [PATCH 3/7] made syncthing device specific
---
hosts/Lenni/default.nix | 1 +
hosts/{desktop => Lenni}/syncthing.nix | 0
hosts/Puenktchen/default.nix | 1 +
hosts/Puenktchen/syncthing.nix | 52 ++++++++++++++++++++++++++
hosts/desktop/default.nix | 1 -
5 files changed, 54 insertions(+), 1 deletion(-)
rename hosts/{desktop => Lenni}/syncthing.nix (100%)
create mode 100644 hosts/Puenktchen/syncthing.nix
diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix
index d08b671..5d54942 100644
--- a/hosts/Lenni/default.nix
+++ b/hosts/Lenni/default.nix
@@ -3,5 +3,6 @@
imports = [
./hardware-configuration.nix
#./disko.nix
+ ./syncthing.nix
];
}
diff --git a/hosts/desktop/syncthing.nix b/hosts/Lenni/syncthing.nix
similarity index 100%
rename from hosts/desktop/syncthing.nix
rename to hosts/Lenni/syncthing.nix
diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix
index 81f90fb..2f8eb6c 100644
--- a/hosts/Puenktchen/default.nix
+++ b/hosts/Puenktchen/default.nix
@@ -3,5 +3,6 @@
imports = [
./hardware-configuration.nix
./disko.nix
+ ./syncthing.nix
];
}
diff --git a/hosts/Puenktchen/syncthing.nix b/hosts/Puenktchen/syncthing.nix
new file mode 100644
index 0000000..c975529
--- /dev/null
+++ b/hosts/Puenktchen/syncthing.nix
@@ -0,0 +1,52 @@
+{ ... }:
+{
+ 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 e0e477a..d93246d 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -6,7 +6,6 @@
./nfs-client.nix
./nix-ld.nix
./printers.nix
- ./syncthing.nix
];
hardware.bluetooth.enable = true;
From 50b606c87d34dd6a2390e5f5253c4f6b628d2d0c Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Sun, 3 Nov 2024 21:08:35 +0100
Subject: [PATCH 4/7] fix decky-loader
---
users/willifan/Lillie/jovian.nix | 33 ++++++++++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/users/willifan/Lillie/jovian.nix b/users/willifan/Lillie/jovian.nix
index fd3ecae..ec96f29 100644
--- a/users/willifan/Lillie/jovian.nix
+++ b/users/willifan/Lillie/jovian.nix
@@ -1,8 +1,32 @@
-{ ... }:
+{ pkgs, ... }:
{
jovian = {
- decky-loader.enable = true;
+ 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
+ ];
+ };
devices.steamdeck = {
enable = true;
enableGyroDsuService = true;
@@ -15,4 +39,9 @@
desktopSession = "hyprland";
};
};
+
+ environment.systemPackages = with pkgs; [
+ python3
+ ];
+
}
From 7056751d97e324c43dcafd1841f66c62b49d39cd Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Mon, 4 Nov 2024 21:31:31 +0100
Subject: [PATCH 5/7] added emulation software
---
users/willifan/Lillie/default.nix | 1 +
users/willifan/Lillie/emulation.nix | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100644 users/willifan/Lillie/emulation.nix
diff --git a/users/willifan/Lillie/default.nix b/users/willifan/Lillie/default.nix
index 1469dd4..af25aa0 100644
--- a/users/willifan/Lillie/default.nix
+++ b/users/willifan/Lillie/default.nix
@@ -2,6 +2,7 @@
{
imports = [
+ ./emulation.nix
./jovian.nix
];
}
diff --git a/users/willifan/Lillie/emulation.nix b/users/willifan/Lillie/emulation.nix
new file mode 100644
index 0000000..c7cdc0f
--- /dev/null
+++ b/users/willifan/Lillie/emulation.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+
+ environment.systemPackages = with pkgs; [
+ melonDS
+ dolphin-emu
+ lime3ds
+ cemu
+ steam-rom-manager
+ ];
+}
From 380978b48ef01b1bef650c582305947eedff8772 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Mon, 4 Nov 2024 23:49:34 +0100
Subject: [PATCH 6/7] changed Lillie hyprland scale
---
users/willifan/desktop/hyprland/Lillie/hyprland.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/users/willifan/desktop/hyprland/Lillie/hyprland.nix b/users/willifan/desktop/hyprland/Lillie/hyprland.nix
index 8d3210a..1a5a830 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.6, transform, 3"
+ "eDP-1, preffered, 0x0, 1.25, transform, 3"
];
# Execute your favorite apps at launch
exec-once = [
From 45af999d67beb0ca3ca41ccea186b4901783c001 Mon Sep 17 00:00:00 2001
From: willifan <willifan@proton.me>
Date: Tue, 5 Nov 2024 23:06:41 +0100
Subject: [PATCH 7/7] changed steam deck touchdevice transform
---
users/willifan/desktop/hyprland/Lillie/hyprland.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/users/willifan/desktop/hyprland/Lillie/hyprland.nix b/users/willifan/desktop/hyprland/Lillie/hyprland.nix
index 1a5a830..c276236 100644
--- a/users/willifan/desktop/hyprland/Lillie/hyprland.nix
+++ b/users/willifan/desktop/hyprland/Lillie/hyprland.nix
@@ -44,6 +44,8 @@
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;