diff options
author | polwex <polwex@sortug.com> | 2024-09-24 00:10:30 +0700 |
---|---|---|
committer | polwex <polwex@sortug.com> | 2024-09-24 00:10:30 +0700 |
commit | a6109558c4b246bbe71f6e949f92f427116eb033 (patch) | |
tree | dbaf7591af5dcc579ffe458bba7da52dfda72b90 | |
parent | 536916df4d5c5bd32086227658e7c1c0e1ba0757 (diff) |
m
-rw-r--r-- | flake.lock | 146 | ||||
-rw-r--r-- | hosts/local/fw11/configuration.nix | 2 | ||||
-rw-r--r-- | hosts/local/fw11/keyboard.nix | 8 | ||||
-rw-r--r-- | hosts/local/fw11/thinkpad.kbd | 2 |
4 files changed, 79 insertions, 79 deletions
@@ -11,11 +11,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725794804, - "narHash": "sha256-QJvZDYfbcOM1Pt6YUPl+Xmw+JDJQtokdYj4P7sXuF7U=", + "lastModified": 1726755133, + "narHash": "sha256-03XIEjHeZEjHXctsXYUB+ZLQmM0WuhR6qWQjwekFk/M=", "owner": "yaxitech", "repo": "ragenix", - "rev": "7f6c227f86c5b4e6e7f6d2d62c614acd28d25627", + "rev": "687ee92114bce9c4724376cf6b21235abe880bfa", "type": "github" }, "original": { @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1726396892, - "narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=", + "lastModified": 1727097838, + "narHash": "sha256-URruiiuIyKzao6QcGXQXFaX3RRvlNFHHm19uOGmB0Dw=", "owner": "nix-community", "repo": "disko", - "rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce", + "rev": "b1d6bed240abef5f5373e88fc7909f493013e557", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -448,11 +448,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -469,11 +469,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725513492, - "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", + "lastModified": 1726745158, + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "type": "github" }, "original": { @@ -555,11 +555,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1726394915, - "narHash": "sha256-guDSphIBbkUGI9LQDAls4PUDDJFl9URC0EAUKb+sjks=", + "lastModified": 1727025422, + "narHash": "sha256-qgCGwS2tcYy2EAPlI69VWP1jxQAMDIYlmkQw4m8gU6E=", "owner": "helix-editor", "repo": "helix", - "rev": "5ce77de0dc7106c6f1460d80a3c5a51eaea3108c", + "rev": "73deabaa408c505905271e11065846ac87e1afd0", "type": "github" }, "original": { @@ -672,11 +672,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1725797487, - "narHash": "sha256-1NqTS6PePeoLVH8UY6poIoxlNq1Hhgn7RZs+OT8b2wQ=", + "lastModified": 1727007123, + "narHash": "sha256-B2WqDa4Sd7EVrGfxnVSCL39yOKWqn14vhhTGlbtd+48=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "3c180ce6583583285ef1b105cbc1667ba00c3e8d", + "rev": "e4bb2b4962e79814c38862dce5eca90af3de6a3c", "type": "github" }, "original": { @@ -712,11 +712,11 @@ ] }, "locked": { - "lastModified": 1726188813, - "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", + "lastModified": 1727003835, + "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", + "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", "type": "github" }, "original": { @@ -733,11 +733,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723372011, - "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=", + "lastModified": 1726859423, + "narHash": "sha256-7H4u29z/Qwi/KsXS3ucrvXr/gx2fqT48i8EpKMBpMvs=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "8802412b8747633e9d80639897e4d58fa6290909", + "rev": "6684d2074e3cde8a180ef87fac284d6f02ac16d0", "type": "github" }, "original": { @@ -753,11 +753,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1726364380, - "narHash": "sha256-hICWlRKF1lOzRwTepJORe9hWYGkUVXJxKjTe5P5CSg0=", + "lastModified": 1727055585, + "narHash": "sha256-TcyM17rJ2YUg0AqjktaMB4+VKioV6SI/yJx4zeUzpFQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "3e51c9884bca93625ff1deca440e30c8d2f2e522", + "rev": "f3e977545ca45fce04c475273dcb16df3d61cfb9", "type": "github" }, "original": { @@ -790,11 +790,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725757153, - "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", + "lastModified": 1726966855, + "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", + "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", "type": "github" }, "original": { @@ -847,11 +847,11 @@ ] }, "locked": { - "lastModified": 1726102718, - "narHash": "sha256-u89QyfjtXryLHrO3Wre4kuWK5KDKiXe8lgRi6+cUOEw=", + "lastModified": 1727053438, + "narHash": "sha256-t/+z1Tf7hSaStU1pBYkY7i0/GkG+YIPSmfeRrK8eYUw=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "5ae384b83b91080f0fead6bc1add1cff8277cb3f", + "rev": "e8c1cd886cc17e31e424f915efd32e84d8af0ce9", "type": "github" }, "original": { @@ -884,11 +884,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": { @@ -949,11 +949,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1725882169, - "narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=", + "lastModified": 1727091786, + "narHash": "sha256-n36Vtdtx7tTTKFI9aoWxdNIlJ2dwxoitFDwcPXrS+Jk=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180", + "rev": "1fcec53c692c15091ca5bb9eaf86a2cac6c53278", "type": "github" }, "original": { @@ -996,11 +996,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1726328674, - "narHash": "sha256-qmd7YxokSkpZSwuXoD8a734JkIQmm2kaDrBzocKpVrA=", + "lastModified": 1726954592, + "narHash": "sha256-ti4xoSuzgv3RK1Hnwfkad/L+HvY1yPawAJLEU8ZbG7M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b51904c22eef2070055aa4dc9e8004c19faac776", + "rev": "10182eec1f68d1b1f9cd1efc10b0fa92bbdec988", "type": "github" }, "original": { @@ -1036,11 +1036,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1725757153, - "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", + "lastModified": 1726966855, + "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", + "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", "type": "github" }, "original": { @@ -1083,11 +1083,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", + "lastModified": 1726969270, + "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", + "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ ] }, "locked": { - "lastModified": 1726392443, - "narHash": "sha256-w0r9FyV909RtE9DpHqd8oISO77mmAPak5yzNR1uMWiM=", + "lastModified": 1727109214, + "narHash": "sha256-VxIzIcv6mHYQ2KlTG/0ubs/9ilfyBhkJeI9BvZU04X4=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "d73b97762fcc98b89dd2cb87df6c17962b2c1e0f", + "rev": "d6c8bdc9c96a85c688328998e9e7da45e743eda0", "type": "github" }, "original": { @@ -1122,11 +1122,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1726062873, - "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -1250,11 +1250,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1726238386, - "narHash": "sha256-3//V84fYaGVncFImitM6lSAliRdrGayZLdxWlpcuGk0=", + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f064c99c792715054dc7a70e4c1626dbbec0c3", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", "type": "github" }, "original": { @@ -1282,11 +1282,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1725693463, - "narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=", + "lastModified": 1726838390, + "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68e7dce0a6532e876980764167ad158174402c6f", + "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", "type": "github" }, "original": { @@ -1298,11 +1298,11 @@ }, "nur": { "locked": { - "lastModified": 1726393490, - "narHash": "sha256-LVGtTtPzF0rxy3nKzegvaLVsTKSM0IMLjfbxnh7FKP0=", + "lastModified": 1727106107, + "narHash": "sha256-R/+A6iDq622aD09AV64JVvDNGM3spgch7QKzw9VpMMM=", "owner": "nix-community", "repo": "NUR", - "rev": "1a4d47c6fc08986702c185ef0409d59dd42269a1", + "rev": "0c433cd20e23788926ab884aa0b610121b97b640", "type": "github" }, "original": { @@ -1636,11 +1636,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1726301236, - "narHash": "sha256-0JQH9RYdGL1NUaQE5syA/SmbxuZ6NTLn3FduapSXUXA=", + "lastModified": 1726768365, + "narHash": "sha256-5yQJ3krsZioC+Nim4/oaOjKp3CXFWolTFMpXnUBcYtE=", "ref": "refs/heads/main", - "rev": "e06443981e3bf09cbc70aaffe245e4a03f1a6df7", - "revCount": 715, + "rev": "e42043a26639cfb69d14c6945ecdebe2bb3c42fc", + "revCount": 727, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -1660,11 +1660,11 @@ ] }, "locked": { - "lastModified": 1726383898, - "narHash": "sha256-Z2ZS4rD3FjNIblPlXpx9XhkvepZWhO4xnJNk7o5ebe0=", + "lastModified": 1727106303, + "narHash": "sha256-/PFnrEyYoEWtrIFLNzqG4L6SC9dX7svwJf7j+bhk/rM=", "owner": "alexays", "repo": "waybar", - "rev": "0d02f6877d88551ea2be0cd151c1e6354e208b1c", + "rev": "07f75e303c4d6de8198e30239a808bfbc0d80ea5", "type": "github" }, "original": { diff --git a/hosts/local/fw11/configuration.nix b/hosts/local/fw11/configuration.nix index b83f185..9c34ddb 100644 --- a/hosts/local/fw11/configuration.nix +++ b/hosts/local/fw11/configuration.nix @@ -35,7 +35,7 @@ in { boot.loader.efi.canTouchEfiVariables = true; # boot.supportedFilesystems = ["ntfs"]; # boot.kernelPackages = lib.mkForce unfreePkgs.linuxKernel.packages.linux_xanmod_latest; - boot.kernelPackages = pkgs.linuxPackages_latest; + # boot.kernelPackages = pkgs.linuxPackages_latest; services.fprintd.enable = true; networking = { diff --git a/hosts/local/fw11/keyboard.nix b/hosts/local/fw11/keyboard.nix index 68302f8..13852a0 100644 --- a/hosts/local/fw11/keyboard.nix +++ b/hosts/local/fw11/keyboard.nix @@ -34,10 +34,10 @@ enable = true; keyboards.internal = { - # device = "/dev/input/by-path/platform-i8042-serio-0-event-kbd"; - # config = builtins.readFile ./framework.kbd; - device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_USB_Keyboard_with_Trackpoint-event-kbd"; - config = builtins.readFile ./thinkpad.kbd; + device = "/dev/input/by-path/platform-i8042-serio-0-event-kbd"; + config = builtins.readFile ./framework.kbd; + # device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_USB_Keyboard_with_TrackPoint-event-kbd"; + # config = builtins.readFile ./thinkpad.kbd; # defcfg = { # enable = true; diff --git a/hosts/local/fw11/thinkpad.kbd b/hosts/local/fw11/thinkpad.kbd index ea4751e..7fb53d2 100644 --- a/hosts/local/fw11/thinkpad.kbd +++ b/hosts/local/fw11/thinkpad.kbd @@ -10,7 +10,7 @@ fallthrough true ;; allow-cmd true ;; use 'ls /dev/input/by-id/' for detachable keyboards and ;; 'ls /dev/input/by-path/' for builtin keyboards location' -input (device-file "/dev/input/event16") +input (device-file "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_USB_Keyboard_with_TrackPoint-event-kbd") ;; Not sure what this does. Please check the docs. output (uinput-sink "My KMonad output") ) |