diff --git a/flake.lock b/flake.lock index a6c21b4..c8a886e 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1725377834, - "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", + "lastModified": 1727097838, + "narHash": "sha256-URruiiuIyKzao6QcGXQXFaX3RRvlNFHHm19uOGmB0Dw=", "owner": "nix-community", "repo": "disko", - "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", + "rev": "b1d6bed240abef5f5373e88fc7909f493013e557", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1725893417, - "narHash": "sha256-fj2LxTZAncL/s5NrtXe1nLfO0XDvRixtCu3kmV9jDPw=", + "lastModified": 1727111745, + "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", "owner": "nix-community", "repo": "home-manager", - "rev": "10541f19c584fe9633c921903d8c095d5411e041", + "rev": "21c021862fa696c8199934e2153214ab57150cb6", "type": "github" }, "original": { @@ -151,15 +151,15 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725635983, - "narHash": "sha256-haSfwdurfltqQ/7YEmDcmWLnWwvAgelIHnXsHG34P1k=", - "owner": "lilyinstarlight", + "lastModified": 1726651036, + "narHash": "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE=", + "owner": "Mic92", "repo": "nix-update", - "rev": "ed54a7546affb3f8c9c3e10a6fa6fdb21756ec8f", + "rev": "7dd0e4467c571ebb7e53d9e3d40c49f75473efdf", "type": "github" }, "original": { - "owner": "lilyinstarlight", + "owner": "Mic92", "repo": "nix-update", "type": "github" } @@ -175,11 +175,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725929183, - "narHash": "sha256-cn6sCXK6iPAKJ7cWNgxw2oNBXmT3CWuL3U+ZAWgO9f4=", + "lastModified": 1727055346, + "narHash": "sha256-zwBBNKHQMgkR/Drg+xd+6TZvBWhvxjOXU9svAdkhYws=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "a4739c7e563ffd9dcd0cc7e0c4783b7ca3e2b3a5", + "rev": "a524dc50573d0f690c0aaeba46dd73c8b29325de", "type": "github" }, "original": { @@ -190,11 +190,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1727040444, + "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", "type": "github" }, "original": { @@ -221,11 +221,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1725693463, - "narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=", + "lastModified": 1726838390, + "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68e7dce0a6532e876980764167ad158174402c6f", + "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", "type": "github" }, "original": { @@ -237,11 +237,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1725914634, - "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", + "lastModified": 1727020652, + "narHash": "sha256-zwTXt1bcf+wycX389ZyJFzUO2gzCb16ButXxiX2iA7Y=", "owner": "pjones", "repo": "plasma-manager", - "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", + "rev": "6f1db348fcb89fd6b0b9c32e279d29ee6b4d1272", "type": "github" }, "original": { @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1725762472, - "narHash": "sha256-thdxLVdcfrJNMFV3Ej9mDIh6QgHyoYswiW0SFNwod8A=", + "lastModified": 1726972233, + "narHash": "sha256-FlL/bNESOtDQoczRhmPfReNAmLqVg+dAX4HectPOOf0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "57a1564c924ee4acbffe0ad3d65c7e90d3e77cd8", + "rev": "36d73192555e569d27579f6c486fea3ab768823c", "type": "github" }, "original": { @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1725529174, - "narHash": "sha256-6hhiPXXZw24jaQJKJgaLIZ9Z8iEs25Sb+xMqEv6t2Go=", + "lastModified": 1726001766, + "narHash": "sha256-ADvEWfo0AuHR06ah1nnzOyhsG05/b5QpUc7vFNbiEfM=", "owner": "MarceColl", "repo": "zen-browser-flake", - "rev": "5fce6f9bc9b2bda1f0281fcbef3160903ddc5882", + "rev": "06505a088396e2c0b9ad100302502783a6bcdb40", "type": "github" }, "original": { diff --git a/systems/BASED.nix b/systems/BASED.nix index d69aaf0..3c45691 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -109,15 +109,15 @@ security.sudo-rs.enable = true; security.sudo.enable = false; - # i18n.inputMethod = { - # enable = true; - # type = "fcitx5"; - # fcitx5.addons = with pkgs; [ - # fcitx5-gtk - # fcitx5-mozc - # fcitx5-rime - # ]; - # }; + i18n.inputMethod = { + enable = true; + type = "fcitx5"; + fcitx5.addons = with pkgs; [ + fcitx5-gtk + fcitx5-mozc + fcitx5-rime + ]; + }; environment.variables = { EDITOR = "hx"; diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 0335a54..5264527 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -36,19 +36,6 @@ services.tailscale.useRoutingFeatures = "client"; systemd.services."backlight@backlight:amdgpu_bl2".enable = false; - environment.etc = { - "libinput/local-overrides.quirks".text = " -# MatchUdevType=touchpad -# MatchDMIModalias=dmi:*svnFramework:pnLaptop* -# AttrEventCode=-BTN_RIGHT - -[Framework Laptop 16 Keyboard Module] -MatchName=Framework Laptop 16 Keyboard Module* -# MatchUdevType=keyboard -# MatchDMIModalias=dmi:*svnFramework:pnLaptop16* -AttrKeyboardIntegration=internal"; - }; - nix.buildMachines = [ { hostName = "nocomputer"; @@ -68,16 +55,14 @@ AttrKeyboardIntegration=internal"; nix.distributedBuilds = true; services.udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness" - ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness" + # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness" + # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness" - # prevent kb and mouse from waking laptop + # prevent kb from waking laptop # kb - ACTION=="add", ATTRS{idVendor}="32ac", ATTRS{idProduct}="0012", ATTR{power/wakeup}="disabled" + ACTION=="add", ATTR{idVendor}="32ac", ATTR{idProduct}="0012", ATTR{power/wakeup}="disabled" # macropad - ACTION=="add", ATTRS{idVendor}="32ac", ATTRS{idProduct}="0013", ATTR{power/wakeup}="disabled" - # - # ACTION=="add", ATTRS{idVendor}="32ac", ATTRS{idProduct}="", ATTR{power/wakeup}="disabled" + ACTION=="add", ATTR{idVendor}="32ac", ATTR{idProduct}="0013", ATTR{power/wakeup}="disabled" ''; boot.kernelPackages = pkgs.linuxPackages_latest; @@ -94,9 +79,6 @@ AttrKeyboardIntegration=internal"; "amdgpu.abmlevel=1" ]; boot.kernelModules = ["kvm-amd"]; - # boot.extraModulePackages = with config.boot.kernelPackages; [ - # framework-laptop-kmod - # ]; powerManagement.cpuFreqGovernor = "powersave"; systemd.sleep.extraConfig = "HibernateDelaySec=360m";