From b41ca373e37dd5076245eae0e405bb01c5c54f68 Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 18:37:38 +0800 Subject: [PATCH 1/5] fix(nix): change framework hostname --- nix/hosts/{framework => minji}/home.nix | 18 ++++++++++--- nix/hosts/{framework => minji}/hw.nix | 0 nix/hosts/{framework => minji}/sys.nix | 35 +++++++++++++++++++++++-- 3 files changed, 47 insertions(+), 6 deletions(-) rename nix/hosts/{framework => minji}/home.nix (95%) rename nix/hosts/{framework => minji}/hw.nix (100%) rename nix/hosts/{framework => minji}/sys.nix (83%) diff --git a/nix/hosts/framework/home.nix b/nix/hosts/minji/home.nix similarity index 95% rename from nix/hosts/framework/home.nix rename to nix/hosts/minji/home.nix index 50b2156..1160d91 100644 --- a/nix/hosts/framework/home.nix +++ b/nix/hosts/minji/home.nix @@ -220,7 +220,7 @@ duskTime = "20:00-21:00"; temperature = { day = 6500; - night = 3500; + night = 2500; }; }; @@ -287,8 +287,18 @@ programs.swaylock = { enable = true; - settings = { - color = "000000"; - }; + settings = { color = "000000"; }; + }; + + programs.waybar = { + enable = true; + # settings = { + # mainBar = { + # layer = "top"; + # position = "top"; + # height = 50; + # }; + # }; + # style = "\n"; }; } diff --git a/nix/hosts/framework/hw.nix b/nix/hosts/minji/hw.nix similarity index 100% rename from nix/hosts/framework/hw.nix rename to nix/hosts/minji/hw.nix diff --git a/nix/hosts/framework/sys.nix b/nix/hosts/minji/sys.nix similarity index 83% rename from nix/hosts/framework/sys.nix rename to nix/hosts/minji/sys.nix index 8178f8c..b940b67 100644 --- a/nix/hosts/framework/sys.nix +++ b/nix/hosts/minji/sys.nix @@ -1,8 +1,8 @@ { inputs, config, pkgs, lib, ... }: { imports = [ ./hw.nix ../../modules/swaynotificationcenter.nix ]; - networking.hostName = "framework"; - time.timeZone = "America/New_York"; + networking.hostName = "minji"; + time.timeZone = "Asia/Singapore"; # Bootloader boot.loader.systemd-boot.enable = true; @@ -154,6 +154,37 @@ overrideDevices = true; overrideFolders = false; settings = { + devices = { + "server" = { + id = + "FDJDTBE-IZXSILI-GOCWGYS-NYZIQRH-43U36EB-NBBCTBU-4QYKPRI-2KBHZAC"; + }; + "xps13" = { + id = + "NQILTIK-3NWMWQN-RS3K7ZD-QCGFSKD-GI6GY6D-7NHSPIW-3XOODQ6-MLWUDQQ"; + }; + "pixel8" = { + id = + "XSGLHMM-LA2R5BF-B4PRZS3-TPUKMBZ-D42A5B2-UUXJ3BE-TA23YLU-VUBRGQM"; + }; + }; + folders = { + "Books" = { + id = "8hb7r-dn7zj"; + path = "/home/priime/docs/books"; + devices = [ "server" "xps13" "pixel8" ]; + }; + "Sync" = { + id = "default"; + path = "/home/priime/Sync"; + devices = [ "server" "xps13" "pixel8" ]; + }; + "org" = { + id = "vsiqs-jtzzm"; + path = "/home/priime/org"; + devices = [ "server" "xps13" "pixel8" ]; + }; + }; gui = { user = "priime"; }; }; }; From b6ae214283094bae316aabf6edd81998f3086b49 Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 18:37:58 +0800 Subject: [PATCH 2/5] fix(emacs): reference new hostname --- .emacs.d/include/priime-general.el | 8 ++++---- .emacs.d/init.el | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.emacs.d/include/priime-general.el b/.emacs.d/include/priime-general.el index a4e4d84..3fd0b8a 100644 --- a/.emacs.d/include/priime-general.el +++ b/.emacs.d/include/priime-general.el @@ -8,7 +8,7 @@ ;;; Font (defvar priime--font-config - (cond ((string= (system-name) "framework") '("JetBrains Mono Medium" "Roboto" 10 0.9)) + (cond ((string= (system-name) "minji") '("JetBrains Mono Medium" "Roboto" 10 0.9)) ((eq system-type 'gnu/linux) '("Roboto Mono Medium" "Roboto" 12 0.8)) ((eq system-type 'darwin) '("Menlo" "Verdana" 12 1)) (t '("Roboto Mono" "Roboto" 10 0.8)))) @@ -121,10 +121,10 @@ (ring-bell-function 'ignore) (initial-scratch-message nil) (split-height-threshold - (cond ((string= (system-name) "framework") 100) + (cond ((string= (system-name) "minji") 100) (t 80))) (split-width-threshold - (cond ((string= (system-name) "framework") 180) + (cond ((string= (system-name) "minji") 180) (t 160))) ;; Editing (indent-tabs-mode nil) @@ -195,7 +195,7 @@ (keymap-global-unset "C--") (keymap-global-set "C--" #'priime-font-) - (when (string= (system-name) "framework") + (when (string= (system-name) "minji") (setenv "DISPLAY" ":0") (setenv "WAYLAND_DISPLAY" "wayland-1") (setenv "XDG_SESSION_TYPE" "wayland") diff --git a/.emacs.d/init.el b/.emacs.d/init.el index c963f73..60d5f91 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -34,7 +34,7 @@ (load-library "priime-ai") ;; Legacy -(when (equal (system-name) "framework") +(when (equal (system-name) "minji") (load-library "mu4econfig")) (load-library "latexconfig") (load-library "gpgconfig") From c6f49452eb40fbfafef9df591e6e77798b806fbf Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 18:37:38 +0800 Subject: [PATCH 3/5] fix(nix): change framework hostname --- nix/hosts/{framework => minji}/home.nix | 10 ++++++---- nix/hosts/{framework => minji}/hw.nix | 0 nix/hosts/{framework => minji}/sys.nix | 10 ++++------ 3 files changed, 10 insertions(+), 10 deletions(-) rename nix/hosts/{framework => minji}/home.nix (98%) rename nix/hosts/{framework => minji}/hw.nix (100%) rename nix/hosts/{framework => minji}/sys.nix (96%) diff --git a/nix/hosts/framework/home.nix b/nix/hosts/minji/home.nix similarity index 98% rename from nix/hosts/framework/home.nix rename to nix/hosts/minji/home.nix index 50b2156..b2e3416 100644 --- a/nix/hosts/framework/home.nix +++ b/nix/hosts/minji/home.nix @@ -220,7 +220,7 @@ duskTime = "20:00-21:00"; temperature = { day = 6500; - night = 3500; + night = 2500; }; }; @@ -287,8 +287,10 @@ programs.swaylock = { enable = true; - settings = { - color = "000000"; - }; + settings = { color = "000000"; }; + }; + + programs.waybar = { + enable = true; }; } diff --git a/nix/hosts/framework/hw.nix b/nix/hosts/minji/hw.nix similarity index 100% rename from nix/hosts/framework/hw.nix rename to nix/hosts/minji/hw.nix diff --git a/nix/hosts/framework/sys.nix b/nix/hosts/minji/sys.nix similarity index 96% rename from nix/hosts/framework/sys.nix rename to nix/hosts/minji/sys.nix index 8178f8c..936c919 100644 --- a/nix/hosts/framework/sys.nix +++ b/nix/hosts/minji/sys.nix @@ -1,8 +1,8 @@ { inputs, config, pkgs, lib, ... }: { imports = [ ./hw.nix ../../modules/swaynotificationcenter.nix ]; - networking.hostName = "framework"; - time.timeZone = "America/New_York"; + networking.hostName = "minji"; + time.timeZone = "Asia/Singapore"; # Bootloader boot.loader.systemd-boot.enable = true; @@ -120,7 +120,7 @@ CC = "gcc"; LSP_USE_PLISTS = "true"; MOZ_USE_XINPUT2 = "1"; - RUSTICL_ENABLE="radeonsi"; + RUSTICL_ENABLE = "radeonsi"; ROC_ENABLE_PRE_VEGA = "1"; QT_QPA_PLATFORM = "xcb"; }; @@ -153,9 +153,7 @@ configDir = "/home/priime/.config/syncthing"; overrideDevices = true; overrideFolders = false; - settings = { - gui = { user = "priime"; }; - }; + settings = { }; }; # Programs From 9f87ee400908da247c270c9415c7ef8e91718956 Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 18:37:58 +0800 Subject: [PATCH 4/5] fix(emacs): reference new hostname --- .emacs.d/include/priime-general.el | 8 ++++---- .emacs.d/init.el | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.emacs.d/include/priime-general.el b/.emacs.d/include/priime-general.el index a4e4d84..3fd0b8a 100644 --- a/.emacs.d/include/priime-general.el +++ b/.emacs.d/include/priime-general.el @@ -8,7 +8,7 @@ ;;; Font (defvar priime--font-config - (cond ((string= (system-name) "framework") '("JetBrains Mono Medium" "Roboto" 10 0.9)) + (cond ((string= (system-name) "minji") '("JetBrains Mono Medium" "Roboto" 10 0.9)) ((eq system-type 'gnu/linux) '("Roboto Mono Medium" "Roboto" 12 0.8)) ((eq system-type 'darwin) '("Menlo" "Verdana" 12 1)) (t '("Roboto Mono" "Roboto" 10 0.8)))) @@ -121,10 +121,10 @@ (ring-bell-function 'ignore) (initial-scratch-message nil) (split-height-threshold - (cond ((string= (system-name) "framework") 100) + (cond ((string= (system-name) "minji") 100) (t 80))) (split-width-threshold - (cond ((string= (system-name) "framework") 180) + (cond ((string= (system-name) "minji") 180) (t 160))) ;; Editing (indent-tabs-mode nil) @@ -195,7 +195,7 @@ (keymap-global-unset "C--") (keymap-global-set "C--" #'priime-font-) - (when (string= (system-name) "framework") + (when (string= (system-name) "minji") (setenv "DISPLAY" ":0") (setenv "WAYLAND_DISPLAY" "wayland-1") (setenv "XDG_SESSION_TYPE" "wayland") diff --git a/.emacs.d/init.el b/.emacs.d/init.el index c963f73..60d5f91 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -34,7 +34,7 @@ (load-library "priime-ai") ;; Legacy -(when (equal (system-name) "framework") +(when (equal (system-name) "minji") (load-library "mu4econfig")) (load-library "latexconfig") (load-library "gpgconfig") From 447bedb695e18a4e5782654f84caaac3af1a455e Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 18:54:58 +0800 Subject: [PATCH 5/5] fix(nix): remove dependency --- nix/hosts/minji/home.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nix/hosts/minji/home.nix b/nix/hosts/minji/home.nix index b2e3416..7854bf2 100644 --- a/nix/hosts/minji/home.nix +++ b/nix/hosts/minji/home.nix @@ -68,7 +68,6 @@ niri fuzzel - mako waybar swaybg swaylock