From e09709c638c6c11bd1ed36f05c65756940b4cd71 Mon Sep 17 00:00:00 2001 From: gwg313 Date: Wed, 5 Mar 2025 22:26:28 -0500 Subject: [PATCH] lots --- common/gui/common.nix | 1 - common/networking/firewall.nix | 3 +- common/networking/networkmanager.nix | 45 ++- common/networking/zerotier.nix | 9 +- common/nixos/default.nix | 4 +- common/nixos/logrotate.nix | 14 + common/nixos/packages.nix | 5 +- common/virtualization/libvirt.nix | 45 ++- flake.lock | 357 ++++++++++++--------- home-manager/machines/candlekeep.nix | 2 +- home-manager/modules/common.nix | 3 +- home-manager/modules/hyprland/bindings.nix | 4 +- home-manager/modules/hyprland/default.nix | 2 +- home-manager/modules/lazygit.nix | 6 +- home-manager/modules/nushell.nix | 3 +- home-manager/modules/nushell/default.nix | 2 +- hosts/candlekeep/configuration.nix | 1 + hosts/candlekeep/earlyoom.nix | 10 +- hosts/candlekeep/kernel.nix | 2 +- hosts/grymforge/configuration.nix | 1 + hosts/grymforge/earlyoom.nix | 11 +- hosts/grymforge/kernel.nix | 2 +- 22 files changed, 335 insertions(+), 197 deletions(-) create mode 100644 common/nixos/logrotate.nix diff --git a/common/gui/common.nix b/common/gui/common.nix index 633c702..e1ff1ce 100644 --- a/common/gui/common.nix +++ b/common/gui/common.nix @@ -5,7 +5,6 @@ environment.systemPackages = with pkgs; [ adwaita-icon-theme gnome-themes-extra - firefox-wayland librewolf discord qt5.qtwayland diff --git a/common/networking/firewall.nix b/common/networking/firewall.nix index b14141f..96ceb9a 100644 --- a/common/networking/firewall.nix +++ b/common/networking/firewall.nix @@ -5,7 +5,8 @@ inputs, outputs, ... -}: { +}: +{ options = { firewall.enable = lib.mkEnableOption "Enable the Firewall"; }; diff --git a/common/networking/networkmanager.nix b/common/networking/networkmanager.nix index a9196e8..b025d2d 100644 --- a/common/networking/networkmanager.nix +++ b/common/networking/networkmanager.nix @@ -5,6 +5,8 @@ }: { + environment.systemPackages = with pkgs; [ linuxKernel.packages.linux_5_4.wireguard ]; + sops.secrets."wireless.env" = { }; networking = { networkmanager = { @@ -29,21 +31,50 @@ connection.type = "wifi"; wifi.ssid = "eduroam"; wifi-security = { - auth-alg = "open"; key-mgmt = "wpa-eap"; - eap = "peap"; + }; + "802-1x" = { + eap = "peap;"; identity = "$eduroam_identity"; password = "$school_password"; - phase2 = "mschapv2"; + phase2-auth = "mschapv2"; + }; + connection.autoconnect = true; + connection.autoconnect-priority = 80; + wifi.powersave = 2; + wifi.mode = "infrastructure"; + ipv4.method = "auto"; + # ipv4.dns = "8.8.8.8,8.8.4.4."; + # ipv6.dns = "2001:4860:4860::8888"; + # wifi.mac-address-randomization = "random"; + ipv4.dhcp-send-hostname = false; + # ipv4.dhcp-hostname = "NoName"; + # connection.metered = "yes"; + }; + + school = { + connection.id = "School"; + connection.type = "wifi"; + wifi.ssid = "$school_uuid"; + wifi-security = { + key-mgmt = "wpa-eap"; + }; + "802-1x" = { + eap = "peap;"; + identity = "$school_identity"; + password = "$school_password"; + phase2-auth = "mschapv2"; }; connection.autoconnect = true; connection.autoconnect-priority = 90; wifi.powersave = 2; - ipv4.dns = "8.8.8.8,8.8.4.4."; - ipv6.dns = "2001:4860:4860::8888"; - wifi.mac-address-randomization = "random"; + wifi.mode = "infrastructure"; + ipv4.method = "auto"; + # ipv4.dns = "8.8.8.8,8.8.4.4."; + # ipv6.dns = "2001:4860:4860::8888"; + # wifi.mac-address-randomization = "random"; ipv4.dhcp-send-hostname = false; - ipv4.dhcp-hostname = "NoName"; + # ipv4.dhcp-hostname = "NoName"; # connection.metered = "yes"; }; }; diff --git a/common/networking/zerotier.nix b/common/networking/zerotier.nix index 31c7ed8..e474bda 100644 --- a/common/networking/zerotier.nix +++ b/common/networking/zerotier.nix @@ -5,7 +5,8 @@ inputs, outputs, ... -}: { +}: +{ options = { zerotier.enable = lib.mkEnableOption "Enables zerotier and joins my network"; }; @@ -18,9 +19,9 @@ }; networking.extraHosts = '' - 192.168.194.241 nothing.zt - 192.168.191.213 candlekeep.zt - 192.168.191.168 grymforge.zt + 192.168.194.54 graphene.zt + 192.168.191.218 candlekeep.zt + 192.168.191.201 grymforge.zt ''; }; } diff --git a/common/nixos/default.nix b/common/nixos/default.nix index e6d3920..245a447 100644 --- a/common/nixos/default.nix +++ b/common/nixos/default.nix @@ -1,10 +1,12 @@ -{lib, ...}: { +{ lib, ... }: +{ imports = [ ./common.nix ./laptop.nix ./nfs.nix ./restic.nix ./ssh/default.nix + ./logrotate.nix ]; laptop.enable = lib.mkDefault false; diff --git a/common/nixos/logrotate.nix b/common/nixos/logrotate.nix new file mode 100644 index 0000000..17e9e22 --- /dev/null +++ b/common/nixos/logrotate.nix @@ -0,0 +1,14 @@ +{ + ... +}: +{ + + services.logrotate = { + settings = { + "var/log/audit/audit.log" = { + frequency = "daily"; + rotate = 3; + }; + }; + }; +} diff --git a/common/nixos/packages.nix b/common/nixos/packages.nix index bcbad7e..2073739 100644 --- a/common/nixos/packages.nix +++ b/common/nixos/packages.nix @@ -6,7 +6,8 @@ inputs, outputs, ... -}: { +}: +{ # Some programs need SUID wrappers, can be configured further or are # started in user sessions. programs.gnupg.agent = { @@ -20,7 +21,7 @@ alejandra sops just - vim + # vim wget home-manager git diff --git a/common/virtualization/libvirt.nix b/common/virtualization/libvirt.nix index 13f87a0..3db68a1 100644 --- a/common/virtualization/libvirt.nix +++ b/common/virtualization/libvirt.nix @@ -10,18 +10,51 @@ libvirt.enable = lib.mkEnableOption "Enables Libvirt"; }; config = lib.mkIf config.libvirt.enable { + networking.firewall.trustedInterfaces = [ "virbr0" ]; boot.kernelModules = [ "kvm-amd" ]; environment.systemPackages = with pkgs; [ virt-manager + virtiofsd # vagrant ]; - virtualisation.libvirtd.enable = true; + + users.users.${user} = { + extraGroups = [ + "libvirtd" + "qemu-libvirtd" + "kvm" + ]; + }; + # Allow VM to run as non-root without ulimit + security.pam.loginLimits = [ + { + domain = "${user}"; + type = "soft"; + item = "memlock"; + value = "20000000"; + } + { + domain = "${user}"; + type = "hard"; + item = "memlock"; + value = "20000000"; + } + ]; + + virtualisation.libvirtd = { + enable = true; + qemu.ovmf.enable = true; + qemu.runAsRoot = false; + onBoot = "ignore"; + onShutdown = "shutdown"; + }; + users.extraGroups.libvirtd.members = [ "${user}" ]; - virtualisation.virtualbox.host.enable = true; - users.extraGroups.vboxusers.members = [ "glen" ]; - virtualisation.virtualbox.host.enableExtensionPack = true; - virtualisation.virtualbox.guest.enable = true; - virtualisation.virtualbox.guest.dragAndDrop = true; + # virtualisation.virtualbox.host.enable = true; + # users.extraGroups.vboxusers.members = [ "${user}" ]; + # virtualisation.virtualbox.host.enableExtensionPack = true; + # virtualisation.virtualbox.guest.enable = true; + # virtualisation.virtualbox.guest.dragAndDrop = true; }; } diff --git a/flake.lock b/flake.lock index 952fa5b..abe220d 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1736677288, - "narHash": "sha256-Vj3WOLy6o6Zf44Rwg9eLqNRQPlVoDrQ89tsef3l3990=", + "lastModified": 1738087375, + "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=", "owner": "Aylur", "repo": "ags", - "rev": "90db9b9fecc0f4228440d83107c6c745a35e7d77", + "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1736102453, - "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", + "lastModified": 1739103745, + "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4846091641f3be0ad7542086d52769bb7932bde6", + "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1735172721, - "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", + "lastModified": 1737670815, + "narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=", "owner": "aylur", "repo": "astal", - "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", + "rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", "type": "github" }, "original": { @@ -207,16 +207,17 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1731949548, - "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" } }, @@ -234,11 +235,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1728672398, - "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", + "lastModified": 1737621947, + "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=", "owner": "cachix", "repo": "cachix", - "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", + "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5", "type": "github" }, "original": { @@ -259,11 +260,11 @@ ] }, "locked": { - "lastModified": 1736426010, - "narHash": "sha256-d0rE+u8/rQjXLvDobz1StGTfqvRKvq+8kVsHnIGVD1o=", + "lastModified": 1739444039, + "narHash": "sha256-J7PLowc4pCdEkXEWtm72bC6gNNlT7sgNAq5YMZmvvkg=", "owner": "cachix", "repo": "devenv", - "rev": "1c384bc4be3ee571511fbbc6fdc94fe47d60f6cf", + "rev": "1235cd13f47df6ad19c8a183c6eabc1facb7c399", "type": "github" }, "original": { @@ -297,11 +298,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1734969791, - "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "lastModified": 1736899990, + "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", "type": "github" }, "original": { @@ -313,11 +314,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -360,12 +361,12 @@ }, "flake-compat_4": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -391,11 +392,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -450,11 +451,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -545,17 +546,14 @@ "nixpkgs": [ "devenv", "nixpkgs" - ], - "nixpkgs-stable": [ - "devenv" ] }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -577,11 +575,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -600,19 +598,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "nixpkgs-stable": [ - "stylix", - "git-hooks", - "nixpkgs" ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -802,11 +795,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1739658904, + "narHash": "sha256-2o/JuD6qD0CtPNVvdPNL3bEDFITaSfSLceajHcIzmw4=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "45c07fcf7d28b5fb3ee189c260dee0a2e4d14317", "type": "github" }, "original": { @@ -824,11 +817,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -845,11 +838,11 @@ ] }, "locked": { - "lastModified": 1735774425, - "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", + "lastModified": 1737630279, + "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", + "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "type": "github" }, "original": { @@ -874,11 +867,11 @@ ] }, "locked": { - "lastModified": 1734906540, - "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -935,11 +928,11 @@ ] }, "locked": { - "lastModified": 1736115290, - "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -964,11 +957,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1736873552, - "narHash": "sha256-lGZv+YcdDXYowKJf7vaeu97o7JKFzTL/vzS8WxTT+UM=", + "lastModified": 1739665242, + "narHash": "sha256-eKIMpBXaGrB/V/afS4pjropo50FgLE1t1W2aMI4/mhA=", "ref": "refs/heads/main", - "rev": "25add26881d7b98d2b80eb7a95d3aee0449b72b9", - "revCount": 5672, + "rev": "897ee276dc0a8a6b11a8102b225a9e969faac0bf", + "revCount": 5823, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -991,11 +984,11 @@ ] }, "locked": { - "lastModified": 1735774328, - "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -1032,6 +1025,38 @@ } }, "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, + "hyprland-qt-support_2": { "inputs": { "hyprlang": "hyprlang_2", "nixpkgs": [ @@ -1059,8 +1084,15 @@ }, "hyprland-qtutils": { "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland", + "hyprland-qtutils", + "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -1073,11 +1105,11 @@ ] }, "locked": { - "lastModified": 1736114838, - "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -1132,11 +1164,11 @@ ] }, "locked": { - "lastModified": 1735393019, - "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -1211,11 +1243,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1736834018, - "narHash": "sha256-B2QbLPeWMrCX5pOTCC/g0hF1+SAorCQsZVTwdRsjUN8=", + "lastModified": 1739606511, + "narHash": "sha256-ywkv5Pm6p4Taavp3yX9SjoLVf/mIHS3fRXSHjXqaJHQ=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "d49ae7d11d429df10aabed0a51390529b3171f43", + "rev": "c309a73d2d9821c90864447058b627c02bd82165", "type": "github" }, "original": { @@ -1226,7 +1258,7 @@ }, "hyprpolkitagent": { "inputs": { - "hyprland-qt-support": "hyprland-qt-support", + "hyprland-qt-support": "hyprland-qt-support_2", "hyprutils": "hyprutils_3", "nixpkgs": "nixpkgs_6", "systems": "systems_2" @@ -1251,11 +1283,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1736162631, - "narHash": "sha256-i4pwzFbmnBRJyWADux6eOXv30l2SGu4MifeEMWKDqOk=", + "lastModified": 1739004667, + "narHash": "sha256-t/KaeHEgzh225HUdAiHXRsgDeyDrBCMTg0LjR73v3Nw=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "f430d4bf8afa9397c937d575cb7a9176a76aeace", + "rev": "ac55bbdb6cee760af9315899b5b187a40ce43e46", "type": "github" }, "original": { @@ -1276,11 +1308,11 @@ ] }, "locked": { - "lastModified": 1736164519, - "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", + "lastModified": 1739048933, + "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", + "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", "type": "github" }, "original": { @@ -1382,11 +1414,11 @@ ] }, "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "lastModified": 1739049028, + "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "rev": "04146df74a8d5ec0b579657307be01f1e241125f", "type": "github" }, "original": { @@ -1485,11 +1517,11 @@ ] }, "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "lastModified": 1734114420, + "narHash": "sha256-n52PUzub5jZWc8nI/sR7UICOheU8rNA+YZ73YaHeCBg=", "owner": "domenkozar", "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "rev": "bde6a1a0d1f2af86caa4d20d23eca019f3d57eee", "type": "github" }, "original": { @@ -1507,11 +1539,11 @@ ] }, "locked": { - "lastModified": 1736370755, - "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -1527,11 +1559,11 @@ ] }, "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", + "lastModified": 1739675689, + "narHash": "sha256-zSmU6RvIdwbwGObnjXb+jTmF4q9e7D4BCs2926VegR8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", + "rev": "52ef1072d57cfd0b4d2c375d646e7420ae2f5901", "type": "github" }, "original": { @@ -1542,11 +1574,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { @@ -1574,11 +1606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -1622,11 +1654,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -1654,11 +1686,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -1718,11 +1750,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -1734,16 +1766,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1738797219, + "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "1da52dd49a127ad74486b135898da2cef8c62665", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1761,11 +1793,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736964246, - "narHash": "sha256-gb3ujURRlI/D5Jc8PUDOpJr8RyrTwnDDIDtnQK4upso=", + "lastModified": 1739632145, + "narHash": "sha256-maNBjf9whO303r4+8ekfAZOrf3sHnw6DLiSph5xnXJw=", "owner": "nix-community", "repo": "nixvim", - "rev": "5b068e7f8f2b6beaa1fafe0c8b3604b63bcccc2d", + "rev": "b8c55873998948bf14a2b6cf30f9ad5ecdf79818", "type": "github" }, "original": { @@ -1784,11 +1816,11 @@ ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -1807,11 +1839,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -1854,11 +1886,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -1891,11 +1923,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1736808430, - "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": { @@ -1922,15 +1954,16 @@ "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1736955291, - "narHash": "sha256-h5y11C4vMi8VoIVeHr/xFJO5N1nWKiKoAILPPUl7P/8=", + "lastModified": 1739375014, + "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", "owner": "danth", "repo": "stylix", - "rev": "2985ee9b2836a725b04628d24f934212b96eacbe", + "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "type": "github" }, "original": { @@ -1947,11 +1980,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1736149529, - "narHash": "sha256-v7EfMgOsc6FSGIjYkF+44t0wl34WFmokOtzNOAOneBc=", + "lastModified": 1739530074, + "narHash": "sha256-/6JIAIsqiWg0853YDU/Ncc51+pcHAfkZu2nW3J8uo3w=", "owner": "MHNightCat", "repo": "superfile", - "rev": "820140a9cb3f815f5528c59d43681575aceef172", + "rev": "231c9dcef20d917dff5426e2c30a0490db019d72", "type": "github" }, "original": { @@ -2084,14 +2117,30 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1737565458, + "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1729501581, - "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "lastModified": 1735737224, + "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", "type": "github" }, "original": { @@ -2124,11 +2173,11 @@ ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { @@ -2165,11 +2214,11 @@ ] }, "locked": { - "lastModified": 1734907020, - "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { diff --git a/home-manager/machines/candlekeep.nix b/home-manager/machines/candlekeep.nix index 271ae5c..563fd1b 100644 --- a/home-manager/machines/candlekeep.nix +++ b/home-manager/machines/candlekeep.nix @@ -76,7 +76,7 @@ stylix = { base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml"; - image = ../../wallpapers/forrest.png; + image = ../../wallpapers/hollow-knight.jpg; autoEnable = true; enable = true; diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix index a8234f5..af9b40e 100644 --- a/home-manager/modules/common.nix +++ b/home-manager/modules/common.nix @@ -11,6 +11,7 @@ ./btop.nix # ./broot.nix ./eza.nix + ./lazygit.nix ./git.nix ./pass.nix ./starship.nix @@ -26,7 +27,7 @@ [ # Editors # neovim # Improved version of vim, often used with overlays. - vim # Highly configurable text editor popular for efficiency and extensibility. + # vim # Highly configurable text editor popular for efficiency and extensibility. sshfs lurk diff --git a/home-manager/modules/hyprland/bindings.nix b/home-manager/modules/hyprland/bindings.nix index 7b8683d..fa2f867 100644 --- a/home-manager/modules/hyprland/bindings.nix +++ b/home-manager/modules/hyprland/bindings.nix @@ -15,14 +15,14 @@ # general binds ",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid # "$mod, RETURN, exec, ${pkgs.alacritty}/bin/alacritty" - "$mod, RETURN, exec, ${pkgs.ghostty}/bin/ghostty" + "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" "$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus "$mod, Q, killactive" "SUPER_SHIFT, Q, exec, ${pkgs.wlogout}/bin/wlogout" "$mod, SPACE, exec, pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" # pkill or allows for toggle "SUPER_SHIFT, SPACE, togglefloating" # "$mod, F, fullscreen" - "$mod,F, exec, fullscreen" # Toggle fullscreen + "$mod,F, fullscreen" # Toggle fullscreen "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" "$mod, B, exec, ${pkgs.grim}/bin/grim \"desktop-$(${pkgs.busybox}/bin/date +\"%Y%m%d%H%m\").png" "SUPER_SHIFT, B, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy" # Screenshot selection directly to clipboard diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index a8d6ac1..b0c2ef4 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -157,7 +157,7 @@ in input = { # kb_layout = keyboardLayout; - kb_options = "caps:escape"; + # kb_options = "caps:escape"; follow_mouse = 1; sensitivity = 0.5; repeat_delay = 300; diff --git a/home-manager/modules/lazygit.nix b/home-manager/modules/lazygit.nix index 94d41d2..dc1116f 100644 --- a/home-manager/modules/lazygit.nix +++ b/home-manager/modules/lazygit.nix @@ -1,6 +1,10 @@ # A terminal-based Git interface. -{...}: { +{ ... }: +{ programs.lazygit = { enable = true; + settings = { + git.overrideGpg = true; + }; }; } diff --git a/home-manager/modules/nushell.nix b/home-manager/modules/nushell.nix index f64624f..a2ed3b0 100644 --- a/home-manager/modules/nushell.nix +++ b/home-manager/modules/nushell.nix @@ -1,4 +1,3 @@ -# A cat clone with syntax highlighting and Git integration. { pkgs, ... }: { programs.nushell = { @@ -30,7 +29,7 @@ # Default flags rm = "rm -i"; chmod = "chmod -R"; - cp = "cp -i -v"; + cp = "cp -r -i -v"; mv = "mv -i -v"; mkdir = "mkdir -p -v"; df = "df -h"; diff --git a/home-manager/modules/nushell/default.nix b/home-manager/modules/nushell/default.nix index bf7b090..a5b2859 100644 --- a/home-manager/modules/nushell/default.nix +++ b/home-manager/modules/nushell/default.nix @@ -34,7 +34,7 @@ ) ''; shellAliases = { - cd = "z"; + # cd = "z"; update = "sudo nixos-rebuild switch"; clean = "nix-collect-garbage -d"; diff --git a/hosts/candlekeep/configuration.nix b/hosts/candlekeep/configuration.nix index 30c6800..f256e52 100644 --- a/hosts/candlekeep/configuration.nix +++ b/hosts/candlekeep/configuration.nix @@ -115,6 +115,7 @@ isNormalUser = true; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILq54YrM3BbhBs0oDLOrc1bkg6FCCmkV4E3pWLZp0ejN gwg313@pm.me" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPZK7127ict2+Urhi1cbD6EIU85mD4lkQ9/ihaif0jsX" # Phone ]; extraGroups = [ "wheel" ]; }; diff --git a/hosts/candlekeep/earlyoom.nix b/hosts/candlekeep/earlyoom.nix index 84211e1..46de16f 100644 --- a/hosts/candlekeep/earlyoom.nix +++ b/hosts/candlekeep/earlyoom.nix @@ -4,10 +4,10 @@ freeSwapThreshold = 2; freeMemThreshold = 2; enableNotifications = true; - extraArgs = [ - "-g" - "--avoid '^(.Hyrpland-wrapp|alacritty|zerotier-one|.waybar-wrapped)$'" - "--prefer '^(electron|libreoffice|gimp|Isolated Web Co)$'" - ]; + # extraArgs = [ + # "-g" + # "--avoid '^(.Hyrpland-wrapp|alacritty|zerotier-one|.waybar-wrapped)$'" + # "--prefer '^(electron|libreoffice|gimp|Isolated Web Co)$'" + # ]; }; } diff --git a/hosts/candlekeep/kernel.nix b/hosts/candlekeep/kernel.nix index 66bd791..61403aa 100644 --- a/hosts/candlekeep/kernel.nix +++ b/hosts/candlekeep/kernel.nix @@ -5,7 +5,7 @@ ... }: { - # boot.kernelPackages = pkgs.linuxPackages_hardened; + boot.kernelPackages = pkgs.linuxPackages_hardened; boot.kernelParams = [ # Disable slab merging to prevent heap exploitation "slab_nomerge" diff --git a/hosts/grymforge/configuration.nix b/hosts/grymforge/configuration.nix index e46e4d6..b4634ae 100644 --- a/hosts/grymforge/configuration.nix +++ b/hosts/grymforge/configuration.nix @@ -117,6 +117,7 @@ isNormalUser = true; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILq54YrM3BbhBs0oDLOrc1bkg6FCCmkV4E3pWLZp0ejN gwg313@pm.me" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPZK7127ict2+Urhi1cbD6EIU85mD4lkQ9/ihaif0jsX" # Phone ]; extraGroups = [ "wheel" ]; }; diff --git a/hosts/grymforge/earlyoom.nix b/hosts/grymforge/earlyoom.nix index 5aace10..5d28890 100644 --- a/hosts/grymforge/earlyoom.nix +++ b/hosts/grymforge/earlyoom.nix @@ -3,10 +3,11 @@ enable = true; freeSwapThreshold = 2; freeMemThreshold = 2; - extraArgs = [ - "-g" - "--avoid '^(.Hyrpland-wrapp|alacritty|zerotier-one|.waybar-wrapped)$'" - "--prefer '^(electron|libreoffice|gimp|Isolated Web Co)$'" - ]; + enableNotifications = true; + # extraArgs = [ + # "-g" + # "--avoid '(^|/)(.Hyrpland-wrapp|ghostty|zerotier-one)$'" + # "--prefer '(^|/)(electron|libreoffice|gimp|Isolated Web Co)$'" + # ]; }; } diff --git a/hosts/grymforge/kernel.nix b/hosts/grymforge/kernel.nix index 1fd03f2..46e14b7 100644 --- a/hosts/grymforge/kernel.nix +++ b/hosts/grymforge/kernel.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - # boot.kernelPackages = pkgs.linuxPackages_hardened; + boot.kernelPackages = pkgs.linuxPackages_hardened; boot.kernelParams = [ # Disable slab merging to prevent heap exploitation "slab_nomerge"