diff --git a/flake.lock b/flake.lock index e50427c..4d9ee53 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1722347739, - "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", + "lastModified": 1724006173, + "narHash": "sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", + "rev": "7f8df01d4297b9068a9592400f16044602844f86", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1723803910, + "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724067415, + "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1723015306, - "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1721330371, - "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", + "lastModified": 1722623071, + "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", + "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "type": "github" }, "original": { @@ -426,11 +426,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1723405096, - "narHash": "sha256-2C5YJ3lYuRFTixTIfi5XL4IbMaf+bZ/qowyhZ5XKITs=", + "lastModified": 1724274303, + "narHash": "sha256-c2jNOqidh5lLX+uwjHgceFuKVJbqavDPoSS3PqLFj+U=", "ref": "refs/heads/main", - "rev": "118d4e1001d5847aa42d1e5d5fa9623954ae751d", - "revCount": 5078, + "rev": "cae937c51bd220d6676c6027d05ea51fc3c821bb", + "revCount": 5123, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -614,11 +614,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1722882121, - "narHash": "sha256-gr4mN6BYKqy9JDr/ygDlMGYvEYBCMTDDDVnGNp/EYuw=", + "lastModified": 1724235914, + "narHash": "sha256-QEVuZNXkytS1lqAtRMBAriJREcCTOeprxBTisXxpe3s=", "owner": "hyprwm", "repo": "Hyprlock", - "rev": "9393a3e94d837229714e28041427709756033f5a", + "rev": "7bb4113a7e9cb62120e96d7c81066f0c055f0db4", "type": "github" }, "original": { @@ -664,11 +664,11 @@ ] }, "locked": { - "lastModified": 1722098849, - "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", + "lastModified": 1722869141, + "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", + "rev": "0252fd13e78e60fb0da512a212e56007515a49f7", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1723859949, + "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "076b9a905af8a52b866c8db068d6da475839d97b", "type": "github" }, "original": { @@ -774,11 +774,11 @@ ] }, "locked": { - "lastModified": 1723352546, - "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", + "lastModified": 1723950649, + "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", + "rev": "392828aafbed62a6ea6ccab13728df2e67481805", "type": "github" }, "original": { @@ -789,11 +789,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -836,11 +836,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -852,11 +852,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -868,11 +868,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1697009197, - "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { @@ -911,11 +911,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723323133, - "narHash": "sha256-g3wit604jFhBvjDBziJgulDUXDl/ApafMXq7o7ioMxo=", + "lastModified": 1724222231, + "narHash": "sha256-IFlMn1lgVsZQZC9WklY9YKcCdI0mUxSYZ7EfkaKCsQU=", "owner": "nix-community", "repo": "nixvim", - "rev": "f13bdef0bc697261c51eab686c28c7e2e7b7db3c", + "rev": "b7f419a759f70126e220533b724cc17e8528b184", "type": "github" }, "original": { @@ -933,11 +933,11 @@ ] }, "locked": { - "lastModified": 1723134722, - "narHash": "sha256-wknII7R6ewALIxIKYtqeahjUk/ZrFj1ZtSpNBaHDCyg=", + "lastModified": 1723969429, + "narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=", "owner": "NuschtOS", "repo": "search", - "rev": "1016f4620e321c12ff1dbcd464e9de889e302d1c", + "rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0", "type": "github" }, "original": { @@ -952,15 +952,16 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1721413800, - "narHash": "sha256-8aI/9vSMel5nIfJoA4c53JuGv/k0c14OgRVrwecznKk=", - "owner": "Razer-Linux", + "lastModified": 1725405116, + "narHash": "sha256-95jwwJsPIts2zmyBi806AAl+aDy/peuwjJkuPM4ZtDk=", + "owner": "mardukpill", "repo": "razer-laptop-control-no-dkms", - "rev": "6005f354c1f329b50a2ea59a194595cf731595d2", + "rev": "e7fb9b3b895f405cad7d972b8b43827abab576c9", "type": "github" }, "original": { - "owner": "Razer-Linux", + "owner": "mardukpill", + "ref": "app", "repo": "razer-laptop-control-no-dkms", "type": "github" } @@ -1013,11 +1014,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1723149932, - "narHash": "sha256-8YSZa9FcbrHNSxwJFXAQtQquLIypUhy8tRrxh++uVBc=", + "lastModified": 1723493104, + "narHash": "sha256-PkiICvEaZHOgEKA4gMUjLEFZ8pcwW5vONrK4qrE3e3Q=", "owner": "LGFae", "repo": "swww", - "rev": "81ae44954ebea9fb301d4bea1b5fdde8da323fb4", + "rev": "886ce3e9c5d88187fd765fe22c92338b038177c8", "type": "github" }, "original": { @@ -1154,11 +1155,11 @@ ] }, "locked": { - "lastModified": 1723303070, - "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", + "lastModified": 1723808491, + "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "14c092e0326de759e16b37535161b3cb9770cea3", + "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b062b01..793a6b2 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ }; hardware.url = "github:nixos/nixos-hardware"; - razer-laptop-control.url = "github:Razer-Linux/razer-laptop-control-no-dkms"; + razer-laptop-control.url = "github:mardukpill/razer-laptop-control-no-dkms/app"; nixvim.url = "github:nix-community/nixvim"; swww.url = "github:LGFae/swww"; diff --git a/modules/nixos/cli/adb/default.nix b/modules/nixos/cli/adb/default.nix new file mode 100644 index 0000000..93d75c7 --- /dev/null +++ b/modules/nixos/cli/adb/default.nix @@ -0,0 +1,27 @@ +{ + pkgs, + namespace, + lib, + config, + ... +}: +let + inherit (lib) mkIf mkEnableOption; + + cfg = config.${namespace}.system.adb; +in +{ + options.${namespace}.system.adb = { + enable = mkEnableOption "adb and android sdk"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ android-tools ]; + + programs.adb = { + enable = true; + }; + + dotties.user.extraGroups = [ "adbusers" ]; + }; +} diff --git a/modules/nixos/hw/razer/default.nix b/modules/nixos/hw/razer/default.nix index 3f42e3c..483772e 100644 --- a/modules/nixos/hw/razer/default.nix +++ b/modules/nixos/hw/razer/default.nix @@ -18,9 +18,9 @@ in config = mkIf cfg.enable { services = { razer-laptop-control.enable = true; - # udev.extraRules = '' - # KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="plugdev" - # ''; # needed for correct permissions for razer-laptop-control + udev.extraRules = '' + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="plugdev" + ''; # needed for correct permissions for razer-laptop-control }; environment.systemPackages = with pkgs; [ polychromatic ]; diff --git a/modules/nixos/wms/hyprland/default.nix b/modules/nixos/wms/hyprland/default.nix index 9739431..8197d6d 100644 --- a/modules/nixos/wms/hyprland/default.nix +++ b/modules/nixos/wms/hyprland/default.nix @@ -7,6 +7,7 @@ }: let inherit (lib) mkIf mkEnableOption; + inherit (lib.${namespace}) enabled; cfg = config.${namespace}.wms.hyprland; in @@ -17,8 +18,6 @@ in config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ ]; - programs.hyprland.enable = true; programs.hyprland.portalPackage = pkgs.xdg-desktop-portal-gtk; diff --git a/systems/x86_64-linux/blade/default.nix b/systems/x86_64-linux/blade/default.nix index 56adb9d..0720ae6 100644 --- a/systems/x86_64-linux/blade/default.nix +++ b/systems/x86_64-linux/blade/default.nix @@ -54,6 +54,7 @@ in }; system = { + adb = enabled; nix = { managed = true; comma = true;