1
0
Fork 0

Compare commits

..

No commits in common. "b6ae214283094bae316aabf6edd81998f3086b49" and "7af7c629c56aecee40b45e0b24185a093e671d39" have entirely different histories.

5 changed files with 11 additions and 52 deletions

View file

@ -8,7 +8,7 @@
;;; Font ;;; Font
(defvar priime--font-config (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 'gnu/linux) '("Roboto Mono Medium" "Roboto" 12 0.8))
((eq system-type 'darwin) '("Menlo" "Verdana" 12 1)) ((eq system-type 'darwin) '("Menlo" "Verdana" 12 1))
(t '("Roboto Mono" "Roboto" 10 0.8)))) (t '("Roboto Mono" "Roboto" 10 0.8))))
@ -121,10 +121,10 @@
(ring-bell-function 'ignore) (ring-bell-function 'ignore)
(initial-scratch-message nil) (initial-scratch-message nil)
(split-height-threshold (split-height-threshold
(cond ((string= (system-name) "minji") 100) (cond ((string= (system-name) "framework") 100)
(t 80))) (t 80)))
(split-width-threshold (split-width-threshold
(cond ((string= (system-name) "minji") 180) (cond ((string= (system-name) "framework") 180)
(t 160))) (t 160)))
;; Editing ;; Editing
(indent-tabs-mode nil) (indent-tabs-mode nil)
@ -195,7 +195,7 @@
(keymap-global-unset "C--") (keymap-global-unset "C--")
(keymap-global-set "C--" #'priime-font-) (keymap-global-set "C--" #'priime-font-)
(when (string= (system-name) "minji") (when (string= (system-name) "framework")
(setenv "DISPLAY" ":0") (setenv "DISPLAY" ":0")
(setenv "WAYLAND_DISPLAY" "wayland-1") (setenv "WAYLAND_DISPLAY" "wayland-1")
(setenv "XDG_SESSION_TYPE" "wayland") (setenv "XDG_SESSION_TYPE" "wayland")

View file

@ -34,7 +34,7 @@
(load-library "priime-ai") (load-library "priime-ai")
;; Legacy ;; Legacy
(when (equal (system-name) "minji") (when (equal (system-name) "framework")
(load-library "mu4econfig")) (load-library "mu4econfig"))
(load-library "latexconfig") (load-library "latexconfig")
(load-library "gpgconfig") (load-library "gpgconfig")

View file

@ -220,7 +220,7 @@
duskTime = "20:00-21:00"; duskTime = "20:00-21:00";
temperature = { temperature = {
day = 6500; day = 6500;
night = 2500; night = 3500;
}; };
}; };
@ -287,18 +287,8 @@
programs.swaylock = { programs.swaylock = {
enable = true; enable = true;
settings = { color = "000000"; }; settings = {
}; color = "000000";
};
programs.waybar = {
enable = true;
# settings = {
# mainBar = {
# layer = "top";
# position = "top";
# height = 50;
# };
# };
# style = "\n";
}; };
} }

View file

@ -1,8 +1,8 @@
{ inputs, config, pkgs, lib, ... }: { { inputs, config, pkgs, lib, ... }: {
imports = [ ./hw.nix ../../modules/swaynotificationcenter.nix ]; imports = [ ./hw.nix ../../modules/swaynotificationcenter.nix ];
networking.hostName = "minji"; networking.hostName = "framework";
time.timeZone = "Asia/Singapore"; time.timeZone = "America/New_York";
# Bootloader # Bootloader
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@ -154,37 +154,6 @@
overrideDevices = true; overrideDevices = true;
overrideFolders = false; overrideFolders = false;
settings = { 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"; }; gui = { user = "priime"; };
}; };
}; };