diff --git a/.emacs.d/include/priime-general.el b/.emacs.d/include/priime-general.el index 3fd0b8a..a4e4d84 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) "minji") '("JetBrains Mono Medium" "Roboto" 10 0.9)) + (cond ((string= (system-name) "framework") '("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) "minji") 100) + (cond ((string= (system-name) "framework") 100) (t 80))) (split-width-threshold - (cond ((string= (system-name) "minji") 180) + (cond ((string= (system-name) "framework") 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) "minji") + (when (string= (system-name) "framework") (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 60d5f91..c963f73 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -34,7 +34,7 @@ (load-library "priime-ai") ;; Legacy -(when (equal (system-name) "minji") +(when (equal (system-name) "framework") (load-library "mu4econfig")) (load-library "latexconfig") (load-library "gpgconfig") diff --git a/nix/hosts/minji/home.nix b/nix/hosts/framework/home.nix similarity index 95% rename from nix/hosts/minji/home.nix rename to nix/hosts/framework/home.nix index 1160d91..50b2156 100644 --- a/nix/hosts/minji/home.nix +++ b/nix/hosts/framework/home.nix @@ -220,7 +220,7 @@ duskTime = "20:00-21:00"; temperature = { day = 6500; - night = 2500; + night = 3500; }; }; @@ -287,18 +287,8 @@ programs.swaylock = { enable = true; - settings = { color = "000000"; }; - }; - - programs.waybar = { - enable = true; - # settings = { - # mainBar = { - # layer = "top"; - # position = "top"; - # height = 50; - # }; - # }; - # style = "\n"; + settings = { + color = "000000"; + }; }; } diff --git a/nix/hosts/minji/hw.nix b/nix/hosts/framework/hw.nix similarity index 100% rename from nix/hosts/minji/hw.nix rename to nix/hosts/framework/hw.nix diff --git a/nix/hosts/minji/sys.nix b/nix/hosts/framework/sys.nix similarity index 83% rename from nix/hosts/minji/sys.nix rename to nix/hosts/framework/sys.nix index b940b67..8178f8c 100644 --- a/nix/hosts/minji/sys.nix +++ b/nix/hosts/framework/sys.nix @@ -1,8 +1,8 @@ { inputs, config, pkgs, lib, ... }: { imports = [ ./hw.nix ../../modules/swaynotificationcenter.nix ]; - networking.hostName = "minji"; - time.timeZone = "Asia/Singapore"; + networking.hostName = "framework"; + time.timeZone = "America/New_York"; # Bootloader boot.loader.systemd-boot.enable = true; @@ -154,37 +154,6 @@ 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"; }; }; };