feat: synchronize, hibernate

This commit is contained in:
Kat Inskip 2025-10-22 15:31:51 -07:00
parent 6bb963d9ad
commit a4b63004fb
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
18 changed files with 48 additions and 110 deletions

View file

@ -113,7 +113,6 @@ in {
# konawall # konawall
enabled = false; enabled = false;
directory = ""; directory = "";
enableMultiMonitorDirectories = false;
setWallpaperOnAllMonitors = true; setWallpaperOnAllMonitors = true;
defaultWallpaper = ""; defaultWallpaper = "";
fillMode = "crop"; fillMode = "crop";
@ -197,8 +196,8 @@ in {
preferredPlayer = ""; preferredPlayer = "";
}; };
ui = { ui = {
fontDefault = config.stylix.fonts.sansSerif; fontDefault = "CozetteCrossedSevenVector";
fontFixed = config.stylix.fonts.monospace; fontFixed = "CozetteCrossedSevenVector";
fontDefaultScale = 1; fontDefaultScale = 1;
fontFixedScale = 1; fontFixedScale = 1;
monitorsScaling = [ monitorsScaling = [

View file

@ -51,19 +51,6 @@ _: {
]; ];
open-on-workspace = "chat"; open-on-workspace = "chat";
} }
{
matches = [
{
app-id = "steam";
title = "^notificationtoasts_\d+_desktop$";
}
];
default-floating-position = {
x = 10;
y = 10;
relative-to = "bottom-right";
};
}
{ {
matches = [ matches = [
{app-id = "^steam_app_default$";} {app-id = "^steam_app_default$";}

View file

@ -22,22 +22,22 @@
terminal = 0.9; terminal = 0.9;
popups = 0.8; popups = 0.8;
}; };
polarity = "dark";
fonts = { fonts = {
sansSerif = { sansSerif = {
name = "Jost"; name = "CozetteCrossedSevenVector";
package = pkgs.jost; package = pkgs.cozette;
}; };
serif = { serif = {
name = "Libre Baskerville"; name = "Libre Baskerville";
package = pkgs.libre-baskerville; package = pkgs.libre-baskerville;
}; };
monospace = { monospace = {
name = "Monaspace Krypton"; name = "CozetteCrossedSevenVector";
package = pkgs.monaspace; package = pkgs.cozette;
}; };
}; };
autoEnable = true; autoEnable = true;
polarity = "light";
base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml";
}; };
} }

View file

@ -3,9 +3,6 @@ _: {
enable = true; enable = true;
settings = { settings = {
logo = { logo = {
type = "chafa";
source = ./nixowos.png;
height = 32;
padding = { padding = {
right = 2; right = 2;
}; };

Binary file not shown.

Before

Width:  |  Height:  |  Size: 163 KiB

View file

@ -1,11 +0,0 @@
{
pkgs,
lib,
...
}: let
inherit (lib.meta) getExe;
in {
programs.zsh.shellAliases = {
uwufetch = "${getExe pkgs.fastfetch} --chafa ${./nixowos.png} --logo-height 32";
};
}

View file

@ -1,35 +0,0 @@
{
inputs,
pkgs,
...
}: {
programs.wezterm = {
enable = false;
package = inputs.wezterm.outputs.packages.${pkgs.system}.default;
extraConfig = ''
local wezterm = require 'wezterm';
local config = {}
config.front_end = "OpenGL"
config.font = wezterm.font_with_fallback({
"Monaspace Krypton",
"JetBrains Mono",
"Noto Color Emoji",
"Symbols Nerd Font Mono",
})
config.window_padding = {
left = 8,
right = 8,
top = 8,
bottom = 8,
}
config.use_fancy_tab_bar = true
config.tab_bar_at_bottom = true
config.hide_mouse_cursor_when_typing = false
config.window_decorations = "TITLE | RESIZE"
config.warn_about_missing_glyphs = false
config.font_size = 12.0
config.check_for_updates = false
return config
'';
};
}

View file

@ -1,9 +1,8 @@
{pkgs, ...}: { {pkgs, ...}: {
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
font-awesome
twitter-color-emoji twitter-color-emoji
iosevka-bin cozette
monaspace monaspace
]; ];
}; };

View file

@ -1,10 +0,0 @@
{
pkgs,
inputs,
...
}: {
programs.nh = {
enable = true;
package = inputs.nh.packages.${pkgs.system}.nh;
};
}

View file

@ -1,11 +0,0 @@
_: {
services.nixos-cli = {
enable = true;
config = {
use_nvd = true;
apply = {
use_nom = true;
};
};
};
}

View file

@ -23,19 +23,19 @@
popups = 0.8; popups = 0.8;
}; };
image = ./stylix.png; image = ./stylix.png;
polarity = "light"; polarity = "dark";
fonts = { fonts = {
sansSerif = { sansSerif = {
name = "Jost"; name = "CozetteCrossedSevenVector";
package = pkgs.jost; package = pkgs.cozette;
}; };
serif = { serif = {
name = "Libre Baskerville"; name = "Libre Baskerville";
package = pkgs.libre-baskerville; package = pkgs.libre-baskerville;
}; };
monospace = { monospace = {
name = "Monaspace Krypton"; name = "CozetteCrossedSevenVector";
package = pkgs.monaspace; package = pkgs.cozette;
}; };
}; };
autoEnable = true; autoEnable = true;

3
nixos/common/zfs.nix Normal file
View file

@ -0,0 +1,3 @@
_: {
boot.zfs.requestEncryptionCredentials = true;
}

View file

@ -1,15 +1,13 @@
{pkgs, ...}: { {pkgs, ...}: {
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
font-awesome
noto-fonts-cjk-sans noto-fonts-cjk-sans
twitter-color-emoji twitter-color-emoji
iosevka-bin
monaspace
corefonts corefonts
vistafonts vistafonts
open-dyslexic open-dyslexic
ubuntu-sans ubuntu-sans
monaspace
jost jost
]; ];
enableDefaultPackages = true; enableDefaultPackages = true;

View file

@ -1,2 +0,0 @@
_: {
}

View file

@ -0,0 +1,12 @@
_: {
systemd.sleep.extraConfig = ''
HibernateDelaySec=30m
SuspendState=mem
'';
boot.kernelParams = ["mem_sleep_default=deep"];
services.logind = {
powerKey = "hibernate";
powerKeyLongPress = "poweroff";
lidSwitch = "suspend-then-hibernate";
};
}

View file

@ -0,0 +1,3 @@
_: {
services.power-profiles-daemon.enable = true;
}

View file

@ -77,7 +77,7 @@ _: let
konawall-py.settings = { konawall-py.settings = {
source = "konachan"; source = "konachan";
tags = [ tags = [
"rating:e" "rating:-e"
]; ];
}; };
# konawall-py.settings = { # konawall-py.settings = {
@ -184,7 +184,9 @@ _: let
}; };
boot = { boot = {
zfs.requestEncryptionCredentials = true; extraModulePackages = with config.boot.kernelPackages; [
config.boot.kernelPackages.v4l2loopback.out
];
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
@ -193,9 +195,6 @@ _: let
availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
}; };
kernelModules = ["nct6775" "kvm-amd" "k10temp"]; kernelModules = ["nct6775" "kvm-amd" "k10temp"];
extraModulePackages = with config.boot.kernelPackages; [
v4l2loopback.out
];
supportedFilesystems = ["ntfs" "zfs"]; supportedFilesystems = ["ntfs" "zfs"];
}; };

View file

@ -19,6 +19,10 @@ _: let
then "/" then "/"
else "/${dataset}" else "/${dataset}"
) { ) {
neededForBoot =
if builtins.elem dataset ["home"]
then true
else false;
device = "zpool/${dataset}"; device = "zpool/${dataset}";
fsType = "zfs"; fsType = "zfs";
options = ["zfsutil"]; options = ["zfsutil"];
@ -34,10 +38,10 @@ _: let
}; };
}; };
swap = rec { swap = rec {
raw = "/dev/disk/by-partuuid/cba02f4a-a90d-44e3-81a8-46bb4500112e"; raw = "/dev/disk/by-id/nvme-CT1000P5PSSD8_22343AC9A481-part2";
result = { result = {
device = raw; device = raw;
randomEncryption = true; randomEncryption = false; # fix hibernation
}; };
}; };
}; };
@ -91,6 +95,8 @@ _: let
drives.swap.result drives.swap.result
]; ];
powerManagement.enable = true;
hardware.framework.enableKmod = false; hardware.framework.enableKmod = false;
boot = { boot = {
@ -98,6 +104,10 @@ _: let
grub.useOSProber = true; grub.useOSProber = true;
systemd-boot.enable = lib.mkForce false; systemd-boot.enable = lib.mkForce false;
}; };
zfs = {
forceImportRoot = false;
allowHibernation = true;
};
kernelModules = ["cros_ec" "cros_ec_lpcs"]; kernelModules = ["cros_ec" "cros_ec_lpcs"];
extraModprobeConfig = "options snd_hda_intel power_save=0"; extraModprobeConfig = "options snd_hda_intel power_save=0";
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [