diff --git a/home/environments/niri/noctalia.nix b/home/environments/niri/noctalia.nix index ad22f732..615cd3f0 100644 --- a/home/environments/niri/noctalia.nix +++ b/home/environments/niri/noctalia.nix @@ -113,7 +113,6 @@ in { # konawall enabled = false; directory = ""; - enableMultiMonitorDirectories = false; setWallpaperOnAllMonitors = true; defaultWallpaper = ""; fillMode = "crop"; @@ -197,8 +196,8 @@ in { preferredPlayer = ""; }; ui = { - fontDefault = config.stylix.fonts.sansSerif; - fontFixed = config.stylix.fonts.monospace; + fontDefault = "CozetteCrossedSevenVector"; + fontFixed = "CozetteCrossedSevenVector"; fontDefaultScale = 1; fontFixedScale = 1; monitorsScaling = [ diff --git a/home/environments/niri/window-rules.nix b/home/environments/niri/window-rules.nix index af5e4661..a9c5e2a8 100644 --- a/home/environments/niri/window-rules.nix +++ b/home/environments/niri/window-rules.nix @@ -51,19 +51,6 @@ _: { ]; open-on-workspace = "chat"; } - { - matches = [ - { - app-id = "steam"; - title = "^notificationtoasts_\d+_desktop$"; - } - ]; - default-floating-position = { - x = 10; - y = 10; - relative-to = "bottom-right"; - }; - } { matches = [ {app-id = "^steam_app_default$";} diff --git a/home/profiles/common/stylix.nix b/home/profiles/common/stylix.nix index 0130c2f8..6278a8f3 100644 --- a/home/profiles/common/stylix.nix +++ b/home/profiles/common/stylix.nix @@ -22,22 +22,22 @@ terminal = 0.9; popups = 0.8; }; + polarity = "dark"; fonts = { sansSerif = { - name = "Jost"; - package = pkgs.jost; + name = "CozetteCrossedSevenVector"; + package = pkgs.cozette; }; serif = { name = "Libre Baskerville"; package = pkgs.libre-baskerville; }; monospace = { - name = "Monaspace Krypton"; - package = pkgs.monaspace; + name = "CozetteCrossedSevenVector"; + package = pkgs.cozette; }; }; autoEnable = true; - polarity = "light"; base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; }; } diff --git a/home/profiles/graphical/fastfetch.nix b/home/profiles/graphical/fastfetch.nix index f7d9a73f..1ccb5525 100644 --- a/home/profiles/graphical/fastfetch.nix +++ b/home/profiles/graphical/fastfetch.nix @@ -3,9 +3,6 @@ _: { enable = true; settings = { logo = { - type = "chafa"; - source = ./nixowos.png; - height = 32; padding = { right = 2; }; diff --git a/home/profiles/graphical/nixowos.png b/home/profiles/graphical/nixowos.png deleted file mode 100644 index e0eca1a6..00000000 Binary files a/home/profiles/graphical/nixowos.png and /dev/null differ diff --git a/home/profiles/graphical/uwufetch.nix b/home/profiles/graphical/uwufetch.nix deleted file mode 100644 index b4c8c6e2..00000000 --- a/home/profiles/graphical/uwufetch.nix +++ /dev/null @@ -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"; - }; -} diff --git a/home/profiles/graphical/wezterm.nix b/home/profiles/graphical/wezterm.nix deleted file mode 100644 index 5a225436..00000000 --- a/home/profiles/graphical/wezterm.nix +++ /dev/null @@ -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 - ''; - }; -} diff --git a/nixos/common/fonts.nix b/nixos/common/fonts.nix index 17047ad6..46b8eb31 100644 --- a/nixos/common/fonts.nix +++ b/nixos/common/fonts.nix @@ -1,9 +1,8 @@ {pkgs, ...}: { fonts = { packages = with pkgs; [ - font-awesome twitter-color-emoji - iosevka-bin + cozette monaspace ]; }; diff --git a/nixos/common/nh.nix b/nixos/common/nh.nix deleted file mode 100644 index c1174692..00000000 --- a/nixos/common/nh.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - pkgs, - inputs, - ... -}: { - programs.nh = { - enable = true; - package = inputs.nh.packages.${pkgs.system}.nh; - }; -} diff --git a/nixos/common/nixos-cli.nix b/nixos/common/nixos-cli.nix deleted file mode 100644 index dc47ee11..00000000 --- a/nixos/common/nixos-cli.nix +++ /dev/null @@ -1,11 +0,0 @@ -_: { - services.nixos-cli = { - enable = true; - config = { - use_nvd = true; - apply = { - use_nom = true; - }; - }; - }; -} diff --git a/nixos/common/stylix.nix b/nixos/common/stylix.nix index 442e7635..f8a883af 100644 --- a/nixos/common/stylix.nix +++ b/nixos/common/stylix.nix @@ -23,19 +23,19 @@ popups = 0.8; }; image = ./stylix.png; - polarity = "light"; + polarity = "dark"; fonts = { sansSerif = { - name = "Jost"; - package = pkgs.jost; + name = "CozetteCrossedSevenVector"; + package = pkgs.cozette; }; serif = { name = "Libre Baskerville"; package = pkgs.libre-baskerville; }; monospace = { - name = "Monaspace Krypton"; - package = pkgs.monaspace; + name = "CozetteCrossedSevenVector"; + package = pkgs.cozette; }; }; autoEnable = true; diff --git a/nixos/common/zfs.nix b/nixos/common/zfs.nix new file mode 100644 index 00000000..53c925a1 --- /dev/null +++ b/nixos/common/zfs.nix @@ -0,0 +1,3 @@ +_: { + boot.zfs.requestEncryptionCredentials = true; +} diff --git a/nixos/profiles/graphical/fonts.nix b/nixos/profiles/graphical/fonts.nix index 92f47594..6ea640ba 100644 --- a/nixos/profiles/graphical/fonts.nix +++ b/nixos/profiles/graphical/fonts.nix @@ -1,15 +1,13 @@ {pkgs, ...}: { fonts = { packages = with pkgs; [ - font-awesome noto-fonts-cjk-sans twitter-color-emoji - iosevka-bin - monaspace corefonts vistafonts open-dyslexic ubuntu-sans + monaspace jost ]; enableDefaultPackages = true; diff --git a/nixos/profiles/laptop/cpufreq.nix b/nixos/profiles/laptop/cpufreq.nix deleted file mode 100644 index 87a13d7f..00000000 --- a/nixos/profiles/laptop/cpufreq.nix +++ /dev/null @@ -1,2 +0,0 @@ -_: { -} diff --git a/nixos/profiles/laptop/hibernate.nix b/nixos/profiles/laptop/hibernate.nix new file mode 100644 index 00000000..45b0fd1c --- /dev/null +++ b/nixos/profiles/laptop/hibernate.nix @@ -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"; + }; +} diff --git a/nixos/profiles/laptop/ppd.nix b/nixos/profiles/laptop/ppd.nix new file mode 100644 index 00000000..bce55e3d --- /dev/null +++ b/nixos/profiles/laptop/ppd.nix @@ -0,0 +1,3 @@ +_: { + services.power-profiles-daemon.enable = true; +} diff --git a/systems/goliath.nix b/systems/goliath.nix index a69c15b1..e7cd4ba5 100644 --- a/systems/goliath.nix +++ b/systems/goliath.nix @@ -77,7 +77,7 @@ _: let konawall-py.settings = { source = "konachan"; tags = [ - "rating:e" + "rating:-e" ]; }; # konawall-py.settings = { @@ -184,7 +184,9 @@ _: let }; boot = { - zfs.requestEncryptionCredentials = true; + extraModulePackages = with config.boot.kernelPackages; [ + config.boot.kernelPackages.v4l2loopback.out + ]; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; @@ -193,9 +195,6 @@ _: let availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; }; kernelModules = ["nct6775" "kvm-amd" "k10temp"]; - extraModulePackages = with config.boot.kernelPackages; [ - v4l2loopback.out - ]; supportedFilesystems = ["ntfs" "zfs"]; }; diff --git a/systems/koishi.nix b/systems/koishi.nix index 7c0f7572..2bdda11a 100644 --- a/systems/koishi.nix +++ b/systems/koishi.nix @@ -19,6 +19,10 @@ _: let then "/" else "/${dataset}" ) { + neededForBoot = + if builtins.elem dataset ["home"] + then true + else false; device = "zpool/${dataset}"; fsType = "zfs"; options = ["zfsutil"]; @@ -34,10 +38,10 @@ _: let }; }; swap = rec { - raw = "/dev/disk/by-partuuid/cba02f4a-a90d-44e3-81a8-46bb4500112e"; + raw = "/dev/disk/by-id/nvme-CT1000P5PSSD8_22343AC9A481-part2"; result = { device = raw; - randomEncryption = true; + randomEncryption = false; # fix hibernation }; }; }; @@ -91,6 +95,8 @@ _: let drives.swap.result ]; + powerManagement.enable = true; + hardware.framework.enableKmod = false; boot = { @@ -98,6 +104,10 @@ _: let grub.useOSProber = true; systemd-boot.enable = lib.mkForce false; }; + zfs = { + forceImportRoot = false; + allowHibernation = true; + }; kernelModules = ["cros_ec" "cros_ec_lpcs"]; extraModprobeConfig = "options snd_hda_intel power_save=0"; extraModulePackages = with config.boot.kernelPackages; [