Compare commits
4 commits
447bedb695
...
94f33b5848
Author | SHA1 | Date | |
---|---|---|---|
94f33b5848 | |||
6f33ae2323 | |||
2f300d7f2a | |||
001c77024a |
7 changed files with 23 additions and 24 deletions
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
;;; Font
|
;;; Font
|
||||||
(defvar priime--font-config
|
(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 '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) "framework") 100)
|
(cond ((string= (system-name) "minji") 100)
|
||||||
(t 80)))
|
(t 80)))
|
||||||
(split-width-threshold
|
(split-width-threshold
|
||||||
(cond ((string= (system-name) "framework") 180)
|
(cond ((string= (system-name) "minji") 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) "framework")
|
(when (string= (system-name) "minji")
|
||||||
(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")
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
(load-library "priime-ai")
|
(load-library "priime-ai")
|
||||||
|
|
||||||
;; Legacy
|
;; Legacy
|
||||||
(when (equal (system-name) "framework")
|
(when (equal (system-name) "minji")
|
||||||
(load-library "mu4econfig"))
|
(load-library "mu4econfig"))
|
||||||
(load-library "latexconfig")
|
(load-library "latexconfig")
|
||||||
(load-library "gpgconfig")
|
(load-library "gpgconfig")
|
||||||
|
|
12
flake.lock
generated
12
flake.lock
generated
|
@ -149,11 +149,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753181343,
|
"lastModified": 1755601933,
|
||||||
"narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=",
|
"narHash": "sha256-iXZeeYyfy8NdpvH/OOW9V3C2AfsXE+fzDHfrIOHBPF0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe",
|
"rev": "8af2e064f93234ee79df8b9858eeefbf84394488",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -180,11 +180,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752950548,
|
"lastModified": 1755186698,
|
||||||
"narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
|
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
|
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -17,14 +17,14 @@
|
||||||
outputs = { self, nixpkgs, home-manager, flake-utils, agenix, ... }@inputs:
|
outputs = { self, nixpkgs, home-manager, flake-utils, agenix, ... }@inputs:
|
||||||
let inherit (self) outputs;
|
let inherit (self) outputs;
|
||||||
in {
|
in {
|
||||||
nixosConfigurations.framework = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.minji = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = { inputs = inputs; };
|
specialArgs = { inputs = inputs; };
|
||||||
modules = [
|
modules = [
|
||||||
home-manager.nixosModules.default
|
home-manager.nixosModules.default
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
./nix/hosts/common/sys.nix
|
./nix/hosts/common/sys.nix
|
||||||
./nix/hosts/framework/sys.nix
|
./nix/hosts/minji/sys.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,6 @@
|
||||||
|
|
||||||
niri
|
niri
|
||||||
fuzzel
|
fuzzel
|
||||||
mako
|
|
||||||
waybar
|
waybar
|
||||||
swaybg
|
swaybg
|
||||||
swaylock
|
swaylock
|
||||||
|
@ -220,7 +219,7 @@
|
||||||
duskTime = "20:00-21:00";
|
duskTime = "20:00-21:00";
|
||||||
temperature = {
|
temperature = {
|
||||||
day = 6500;
|
day = 6500;
|
||||||
night = 3500;
|
night = 2500;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -287,8 +286,10 @@
|
||||||
|
|
||||||
programs.swaylock = {
|
programs.swaylock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = { color = "000000"; };
|
||||||
color = "000000";
|
};
|
||||||
};
|
|
||||||
|
programs.waybar = {
|
||||||
|
enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
|
@ -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 = "framework";
|
networking.hostName = "minji";
|
||||||
time.timeZone = "America/New_York";
|
time.timeZone = "Asia/Singapore";
|
||||||
|
|
||||||
# Bootloader
|
# Bootloader
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
@ -120,7 +120,7 @@
|
||||||
CC = "gcc";
|
CC = "gcc";
|
||||||
LSP_USE_PLISTS = "true";
|
LSP_USE_PLISTS = "true";
|
||||||
MOZ_USE_XINPUT2 = "1";
|
MOZ_USE_XINPUT2 = "1";
|
||||||
RUSTICL_ENABLE="radeonsi";
|
RUSTICL_ENABLE = "radeonsi";
|
||||||
ROC_ENABLE_PRE_VEGA = "1";
|
ROC_ENABLE_PRE_VEGA = "1";
|
||||||
QT_QPA_PLATFORM = "xcb";
|
QT_QPA_PLATFORM = "xcb";
|
||||||
};
|
};
|
||||||
|
@ -153,9 +153,7 @@
|
||||||
configDir = "/home/priime/.config/syncthing";
|
configDir = "/home/priime/.config/syncthing";
|
||||||
overrideDevices = true;
|
overrideDevices = true;
|
||||||
overrideFolders = false;
|
overrideFolders = false;
|
||||||
settings = {
|
settings = { };
|
||||||
gui = { user = "priime"; };
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Programs
|
# Programs
|
Loading…
Add table
Add a link
Reference in a new issue