mirror of
https://codeberg.org/muon/home.git
synced 2025-12-06 08:07:45 +00:00
Compare commits
2 commits
6478868ff0
...
286632be79
| Author | SHA1 | Date | |
|---|---|---|---|
| 286632be79 | |||
| dfb61b24a6 |
4 changed files with 88 additions and 32 deletions
|
|
@ -1,6 +1,5 @@
|
||||||
{ config, lib, pkgs, inputs, system, sources, modulesPath, ... }:
|
{ config, lib, pkgs, inputs, system, sources, modulesPath, ... }:
|
||||||
let cfg = config.mods;
|
let cfg = config.mods;
|
||||||
|
|
||||||
in {
|
in {
|
||||||
# Hardware
|
# Hardware
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -25,6 +24,7 @@ in {
|
||||||
networking.hostName = "murk";
|
networking.hostName = "murk";
|
||||||
networking.hostId = "a2309090";
|
networking.hostId = "a2309090";
|
||||||
mods.home.file = ./home.nix;
|
mods.home.file = ./home.nix;
|
||||||
|
nix.settings.trusted-users = [ "root" "muon" ];
|
||||||
|
|
||||||
# Modules
|
# Modules
|
||||||
mods.desktop.enable = true;
|
mods.desktop.enable = true;
|
||||||
|
|
@ -44,15 +44,53 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
# Hardware preferences
|
# Hardware preferences
|
||||||
environment.variables = {
|
# environment.variables = {
|
||||||
WINIT_HIDPI_FACTOR = "1";
|
# WINIT_HIDPI_FACTOR = "1";
|
||||||
WINIT_X11_SCALE_FACTOR = "1";
|
# WINIT_X11_SCALE_FACTOR = "1";
|
||||||
};
|
# };
|
||||||
|
|
||||||
## Laptop
|
## Laptop
|
||||||
powerManagement.enable = true;
|
powerManagement.enable = true;
|
||||||
services.thermald.enable = true;
|
services.thermald.enable = true;
|
||||||
services.tlp.enable = true;
|
services.tlp.enable = true;
|
||||||
|
services.xserver.dpi = lib.mkForce 180;
|
||||||
|
environment.variables = {
|
||||||
|
GDK_SCALE = "2";
|
||||||
|
GDK_DPI_SCALE = "0.5";
|
||||||
|
_JAVA_OPTIONS = "-Dsun.java2d.uiScale=2";
|
||||||
|
};
|
||||||
|
|
||||||
|
## Monitors
|
||||||
|
mods.monitors = {
|
||||||
|
primary = {
|
||||||
|
name = "eDP-1";
|
||||||
|
config = {
|
||||||
|
enable = true;
|
||||||
|
mode = "2560x1600";
|
||||||
|
position = "1264x1440";
|
||||||
|
primary = true;
|
||||||
|
rate = "60.00";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
left = {
|
||||||
|
name = "DP-1-2";
|
||||||
|
config = {
|
||||||
|
enable = true;
|
||||||
|
mode = "2560x1440";
|
||||||
|
position = "0x0";
|
||||||
|
rate = "60.00";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
right = {
|
||||||
|
name = "DP-1-1";
|
||||||
|
config = {
|
||||||
|
enable = true;
|
||||||
|
mode = "2560x1440";
|
||||||
|
position = "2560x0";
|
||||||
|
rate = "60.00";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
## Mouse
|
## Mouse
|
||||||
services.libinput.mouse.accelProfile = "flat";
|
services.libinput.mouse.accelProfile = "flat";
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,7 @@
|
||||||
{
|
{ pkgs, lib, config, osConfig, inputs, ... }:
|
||||||
pkgs,
|
let cfg = osConfig.mods;
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
osConfig,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
cfg = osConfig.mods;
|
|
||||||
in {
|
in {
|
||||||
imports = [inputs.impermanence.homeManagerModules.impermanence];
|
imports = [ inputs.impermanence.homeManagerModules.impermanence ];
|
||||||
|
|
||||||
# Modules
|
# Modules
|
||||||
mods.xdg.enable = true;
|
mods.xdg.enable = true;
|
||||||
|
|
@ -30,12 +23,27 @@ in {
|
||||||
|
|
||||||
docker
|
docker
|
||||||
fish
|
fish
|
||||||
|
devenv
|
||||||
]
|
]
|
||||||
# Non-free </3
|
# Non-free </3
|
||||||
++ [google-cloud-sdk];
|
++ [ google-cloud-sdk ];
|
||||||
|
|
||||||
# Hardware preferences
|
# Hardware preferences
|
||||||
## Monitors
|
## Monitors
|
||||||
|
xsession.windowManager.i3.config.workspaceOutputAssign = [
|
||||||
|
{
|
||||||
|
workspace = "1";
|
||||||
|
output = "${cfg.monitors.left.name}";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
workspace = "2";
|
||||||
|
output = "${cfg.monitors.right.name}";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
workspace = "4";
|
||||||
|
output = "${cfg.monitors.primary.name}";
|
||||||
|
}
|
||||||
|
];
|
||||||
services.autorandr.enable = true;
|
services.autorandr.enable = true;
|
||||||
programs.autorandr = {
|
programs.autorandr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -45,6 +53,21 @@ in {
|
||||||
${lib.getExe pkgs.feh} --bg-fill --nofehbg ${./wallpaper.png}
|
${lib.getExe pkgs.feh} --bg-fill --nofehbg ${./wallpaper.png}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
profiles.default = {
|
||||||
|
fingerprint = {
|
||||||
|
"${cfg.monitors.right.name}" =
|
||||||
|
"00ffffffffffff0030aef465010101011e1e0103803c22782a31d5a65453a0240a5054bfcf00d1c0d100b300a9c09500818081c08100e973006aa0a034504220680055502100001a565e00a0a0a029503020350055502100001a000000fd00304b0f6e1e000a202020202020000000fc00513237712d31300a202020202001ff020329f04b10050403021f1413121101230907078301000067030c001000183c681a00000101304b00023a801871382d40582c450055502100001e662156aa51001e30468f330055502100001eab22a0a050841a303020360055502100001a7c2e90a0601a1e403020360055502100001a000000000000000000000000000026";
|
||||||
|
"${cfg.monitors.left.name}" =
|
||||||
|
"00ffffffffffff0005e30427b11a0000321f0104a53c22783be445a554529e260d5054bfef00d1c0b30095008180814081c001010101565e00a0a0a029503020350055502100001e000000ff005141424d434841303036383333000000fc00513237563447350a2020202020000000fd00304b72721e010a2020202020200163020318f14b0103051404131f120211902309070783010000a073006aa0a029500820350055502100001a2a4480a0703827403020350055502100001a023a801871382d40582c450055502100001ef03c00d051a0355060883a0055502100001c000000000000000000000000000000000000000000000000000000000000005f";
|
||||||
|
"${cfg.monitors.primary.name}" =
|
||||||
|
"00ffffffffffff0026cfab050000000000200104b51f147803de50a3544c99260f505400000001010101010101010101010101010101b29f00a0a04089631830760a38c310000019b29f00a0a040466018303c0038c310000019000000fd00285a969629010a202020202020000000fe004d3134354e574b31205230200a00ad";
|
||||||
|
};
|
||||||
|
config = {
|
||||||
|
"${cfg.monitors.primary.name}" = cfg.monitors.primary.config;
|
||||||
|
"${cfg.monitors.left.name}" = cfg.monitors.left.config;
|
||||||
|
"${cfg.monitors.right.name}" = cfg.monitors.right.config;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Version of first install
|
# Version of first install
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,8 @@
|
||||||
{
|
{ pkgs, lib, config, inputs, ... }: {
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
options.mods.terminal.development.enable =
|
options.mods.terminal.development.enable =
|
||||||
lib.mkEnableOption "enables cli editor";
|
lib.mkEnableOption "enables cli editor";
|
||||||
|
|
||||||
imports = [inputs.nvf.homeManagerModules.default];
|
imports = [ inputs.nvf.homeManagerModules.default ];
|
||||||
|
|
||||||
config = lib.mkIf config.mods.terminal.development.enable {
|
config = lib.mkIf config.mods.terminal.development.enable {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
@ -42,18 +36,18 @@
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
keys.normal = {
|
keys.normal = {
|
||||||
"esc" = ["collapse_selection" "keep_primary_selection"];
|
"esc" = [ "collapse_selection" "keep_primary_selection" ];
|
||||||
"Z" = {
|
"Z" = {
|
||||||
"Q" = ":quit!";
|
"Q" = ":quit!";
|
||||||
"Z" = ":write-quit!";
|
"Z" = ":write-quit!";
|
||||||
};
|
};
|
||||||
"V" = ["select_mode" "extend_to_line_bounds"];
|
"V" = [ "select_mode" "extend_to_line_bounds" ];
|
||||||
};
|
};
|
||||||
editor = {
|
editor = {
|
||||||
line-number = "relative";
|
line-number = "relative";
|
||||||
completion-replace = true;
|
completion-replace = true;
|
||||||
bufferline = "always";
|
bufferline = "always";
|
||||||
rulers = [80];
|
rulers = [ 80 ];
|
||||||
soft-wrap.enable = true;
|
soft-wrap.enable = true;
|
||||||
indent-guides.render = true;
|
indent-guides.render = true;
|
||||||
cursor-shape = {
|
cursor-shape = {
|
||||||
|
|
@ -82,18 +76,18 @@
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "glsl";
|
name = "glsl";
|
||||||
language-servers = ["glsl"];
|
language-servers = [ "glsl" ];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "wgsl";
|
name = "wgsl";
|
||||||
language-servers = ["wgsl"];
|
language-servers = [ "wgsl" ];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "python";
|
name = "python";
|
||||||
auto-format = true;
|
auto-format = true;
|
||||||
formatter = {
|
formatter = {
|
||||||
command = "${pkgs.black}/bin/black";
|
command = "${pkgs.black}/bin/black";
|
||||||
args = ["-" "--quiet" "--line-length=79"];
|
args = [ "-" "--quiet" "--line-length=79" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
@ -123,6 +117,7 @@
|
||||||
rust.enable = true;
|
rust.enable = true;
|
||||||
rust.crates.enable = true;
|
rust.crates.enable = true;
|
||||||
python.enable = true;
|
python.enable = true;
|
||||||
|
python.format.type = "ruff";
|
||||||
clang.enable = true;
|
clang.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -145,7 +140,7 @@
|
||||||
todo-comments.enable = true;
|
todo-comments.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
spellcheck = {enable = true;};
|
spellcheck = { enable = true; };
|
||||||
|
|
||||||
binds = {
|
binds = {
|
||||||
whichKey.enable = true;
|
whichKey.enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue