From ab37c08deb8d331aab7d7acf2de794c4e7242e4f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 26 Dec 2024 17:11:32 +0100 Subject: [PATCH 01/10] use corerct disk --- config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.nix b/config.nix index 57df56e..bf38a48 100644 --- a/config.nix +++ b/config.nix @@ -170,7 +170,7 @@ in disk = { main = { type = "disk"; - device = "/dev/sda"; + device = "/dev/sdb"; content = { type = "gpt"; partitions = { From 466592e7cbb8559a85e2ddc2e3a5d9d82f1b207d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Dec 2024 00:33:30 +0100 Subject: [PATCH 02/10] add autostart --- config.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/config.nix b/config.nix index bf38a48..850b040 100644 --- a/config.nix +++ b/config.nix @@ -68,6 +68,11 @@ in wayland.windowManager.sway = { enable = true; + config.startup = [ + { + command = "firefox-esr --kiosk c3nav.de"; + } + ]; extraConfig = '' set $ws1 c3nav default_border none @@ -133,6 +138,18 @@ in PasswordAuthentication = false; }; }; + xserver = { + displayManager = { + autoLogin = { + enable = true; + autoLogin.user = "c3terminal"; + }; + lightdm = { + greeter.enable = false; + lightdm.enable = true; + }; + }; + }; }; programs.sway = { From e5478bd328d6b4014ab57b03e39451bce8e64694 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Dec 2024 00:38:32 +0100 Subject: [PATCH 03/10] update config --- config.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/config.nix b/config.nix index 850b040..054e729 100644 --- a/config.nix +++ b/config.nix @@ -68,15 +68,21 @@ in wayland.windowManager.sway = { enable = true; - config.startup = [ - { - command = "firefox-esr --kiosk c3nav.de"; - } - ]; + config = { + startup = [ + { + command = "firefox-esr --kiosk c3nav.de"; + } + ]; + fonts = { + names = [ "Noto Sans" ]; + style = "regular"; + size = 30; + }; + }; extraConfig = '' set $ws1 c3nav default_border none - font pango: "Noto Sans" regular 30 exec swaymsg "workspace $ws1;exec firefox-esr --name=c3nav --no-remote -P "terminal" https://c3nav.de; workspace $ws2; exec firefox-esr --name=fahrplan --no-remote -P "default" https://fahrplan.events.ccc.de/congress/2024/fahrplan/schedule/" include /etc/sway/config.d/* ''; From ad3768889961d82701d98f1cb821ddf17c6e1420 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Dec 2024 00:39:30 +0100 Subject: [PATCH 04/10] fix --- config.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config.nix b/config.nix index 054e729..e1dbc7b 100644 --- a/config.nix +++ b/config.nix @@ -18,11 +18,6 @@ in programs.vim.enable = true; programs.vim.defaultEditor = true; - services = { - xserver = { - xkb.layout = "de"; - }; - }; console = { enable = true; useXkbConfig = true; @@ -145,14 +140,16 @@ in }; }; xserver = { + xkb.layout = "de"; displayManager = { + defaultSession = "sway"; autoLogin = { enable = true; - autoLogin.user = "c3terminal"; + user = "c3terminal"; }; lightdm = { greeter.enable = false; - lightdm.enable = true; + enable = true; }; }; }; From 351bf8fac13c5580e3e1e3b7a446282e5d0d44bb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Dec 2024 00:48:16 +0100 Subject: [PATCH 05/10] tes --- config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.nix b/config.nix index e1dbc7b..2bdd967 100644 --- a/config.nix +++ b/config.nix @@ -140,9 +140,11 @@ in }; }; xserver = { + enable = true; xkb.layout = "de"; displayManager = { defaultSession = "sway"; + sessionData.autologinSession = "sway"; autoLogin = { enable = true; user = "c3terminal"; From e9ba00674acac79828b7ff1ace0788155859cca4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Dec 2024 00:49:19 +0100 Subject: [PATCH 06/10] font size --- config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.nix b/config.nix index 2bdd967..1d52cbf 100644 --- a/config.nix +++ b/config.nix @@ -72,7 +72,7 @@ in fonts = { names = [ "Noto Sans" ]; style = "regular"; - size = 30; + size = 30.0; }; }; extraConfig = '' From 51d2fd1316f9845a633431c2fd914448b3ab78bb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Dec 2024 01:04:37 +0100 Subject: [PATCH 07/10] create profile --- config.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/config.nix b/config.nix index 1d52cbf..94f1fc8 100644 --- a/config.nix +++ b/config.nix @@ -78,8 +78,6 @@ in extraConfig = '' set $ws1 c3nav default_border none - exec swaymsg "workspace $ws1;exec firefox-esr --name=c3nav --no-remote -P "terminal" https://c3nav.de; workspace $ws2; exec firefox-esr --name=fahrplan --no-remote -P "default" https://fahrplan.events.ccc.de/congress/2024/fahrplan/schedule/" - include /etc/sway/config.d/* ''; }; @@ -87,18 +85,11 @@ in firefox = { enable = true; package = pkgs.firefox-esr; - policies = { - SupportMenu = { - Title = "Config"; - URL = "https://git.hamburg.ccc.de/jopejoe1/c3terminal"; - }; - Preferences = { - "browser.ssb.enabled" = lock true; - #"ui.osk.detected_physical_keyboard" = lock false; - #"browser.gesture.pinch.in" = lock false; - #"browser.gesture.pinch.out" = lock false; - "zoom.maxPercent" = lock 100; - "zoom.minPercent" = lock 100; + profiles = { + default = { + id = 0; + isDefault = true; + name = "default"; }; }; }; From 52453f06c9ca0f3c2c864408d1994dd8d020dcfa Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Dec 2024 01:11:08 +0100 Subject: [PATCH 08/10] add website filter --- config.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/config.nix b/config.nix index 94f1fc8..e585612 100644 --- a/config.nix +++ b/config.nix @@ -85,6 +85,29 @@ in firefox = { enable = true; package = pkgs.firefox-esr; + policies = { + SupportMenu = { + Title = "Config"; + URL = "https://git.hamburg.ccc.de/jopejoe1/c3terminal"; + }; + WebsiteFilter = { + Block = [ + "" + ]; + Exceptions = [ + "https://c3nav.de" + "https://*.c3nav.de" + ]; + }; + Preferences = { + "browser.ssb.enabled" = lock true; + #"ui.osk.detected_physical_keyboard" = lock false; + #"browser.gesture.pinch.in" = lock false; + #"browser.gesture.pinch.out" = lock false; + "zoom.maxPercent" = lock 100; + "zoom.minPercent" = lock 100; + }; + }; profiles = { default = { id = 0; From 2eac40b35febbb715491d15a112ad7dce9b0cca3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Dec 2024 01:15:34 +0100 Subject: [PATCH 09/10] add backup ext --- config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config.nix b/config.nix index e585612..b91969a 100644 --- a/config.nix +++ b/config.nix @@ -48,6 +48,7 @@ in ]; home-manager = { + backupFileExtension = "backup"; users.c3terminal = { home = { username = config.users.users.c3terminal.name; From 54599b05946f78ec88f43efbcd1053ada750db49 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Dec 2024 01:21:46 +0100 Subject: [PATCH 10/10] rm website filter --- config.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/config.nix b/config.nix index b91969a..27b1317 100644 --- a/config.nix +++ b/config.nix @@ -91,15 +91,6 @@ in Title = "Config"; URL = "https://git.hamburg.ccc.de/jopejoe1/c3terminal"; }; - WebsiteFilter = { - Block = [ - "" - ]; - Exceptions = [ - "https://c3nav.de" - "https://*.c3nav.de" - ]; - }; Preferences = { "browser.ssb.enabled" = lock true; #"ui.osk.detected_physical_keyboard" = lock false;