From c6f49452eb40fbfafef9df591e6e77798b806fbf Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 18:37:38 +0800 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 From 001c77024ae7c99468de960bda90e5bbe745d115 Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 18:37:38 +0800 Subject: [PATCH 4/7] fix(nix): change framework hostname --- flake.nix | 4 ++-- nix/hosts/{framework => minji}/home.nix | 10 ++++++---- nix/hosts/{framework => minji}/hw.nix | 0 nix/hosts/{framework => minji}/sys.nix | 10 ++++------ 4 files changed, 12 insertions(+), 12 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/flake.nix b/flake.nix index c09c8cd..01a0d20 100644 --- a/flake.nix +++ b/flake.nix @@ -17,14 +17,14 @@ outputs = { self, nixpkgs, home-manager, flake-utils, agenix, ... }@inputs: let inherit (self) outputs; in { - nixosConfigurations.framework = nixpkgs.lib.nixosSystem { + nixosConfigurations.minji = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inputs = inputs; }; modules = [ home-manager.nixosModules.default agenix.nixosModules.default ./nix/hosts/common/sys.nix - ./nix/hosts/framework/sys.nix + ./nix/hosts/minji/sys.nix ]; }; 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 2f300d7f2a1e591d7f11ff30d94b33e9aa9f1d89 Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 18:37:58 +0800 Subject: [PATCH 5/7] 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 6f33ae23236692d44fe6f5b34fd4eada3ccda9a2 Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 18:54:58 +0800 Subject: [PATCH 6/7] 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 From 94f33b58480a3ea230cbf920a98da5d17f80906a Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Tue, 19 Aug 2025 20:09:32 +0800 Subject: [PATCH 7/7] chore(nix): update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 43cc6c7..1ffe796 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1753181343, - "narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", + "lastModified": 1755601933, + "narHash": "sha256-iXZeeYyfy8NdpvH/OOW9V3C2AfsXE+fzDHfrIOHBPF0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", + "rev": "8af2e064f93234ee79df8b9858eeefbf84394488", "type": "github" }, "original": { @@ -180,11 +180,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": {