Skip to content

Commit

Permalink
merge new modules (#19)
Browse files Browse the repository at this point in the history 
* flake.lock: Update

Flake lock file updates:

• Updated input 'hardware':
    'github:nixos/nixos-hardware/c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf?narHash=sha256-IiH8jG6PpR4h9TxSGMYh%2B2/gQiJW9MwehFvheSb5rPc%3D' (2024-08-10)
  → 'github:nixos/nixos-hardware/b09c46430ffcf18d575acf5c339b38ac4e1db5d2?narHash=sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0%3D' (2024-08-19)
• Updated input 'home-manager':
    'github:nix-community/home-manager/086f619dd991a4d355c07837448244029fc2d9ab?narHash=sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4%3D' (2024-08-11)
  → 'github:nix-community/home-manager/2598861031b78aadb4da7269df7ca9ddfc3e1671?narHash=sha256-Fy%2BKEvDQ%2BHc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY%3D' (2024-08-18)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=118d4e1001d5847aa42d1e5d5fa9623954ae751d&submodules=1' (2024-08-11)
  → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=cae937c51bd220d6676c6027d05ea51fc3c821bb&submodules=1' (2024-08-21)
• Updated input 'hyprland/aquamarine':
    'github:hyprwm/aquamarine/7c3565f9bedc7cb601cc0baa14792247e4dc1d5a?narHash=sha256-rAoh%2BK6KG%2Bb1DwSWtqRVocdojnH6nGk6q07mNltoUSM%3D' (2024-07-30)
  → 'github:hyprwm/aquamarine/7f8df01d4297b9068a9592400f16044602844f86?narHash=sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk%3D' (2024-08-18)
• Updated input 'hyprland/hyprcursor':
    'github:hyprwm/hyprcursor/4493a972b48f9c3014befbbf381ed5fff91a65dc?narHash=sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI%3D' (2024-07-18)
  → 'github:hyprwm/hyprcursor/912d56025f03d41b1ad29510c423757b4379eb1c?narHash=sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE%3D' (2024-08-02)
• Updated input 'hyprland/hyprutils':
    'github:hyprwm/hyprutils/5dcbbc1e3de40b2cecfd2007434d86e924468f1f?narHash=sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu%2BxHxIVtSN%2BKkWZYvvVs%3D' (2024-07-27)
  → 'github:hyprwm/hyprutils/0252fd13e78e60fb0da512a212e56007515a49f7?narHash=sha256-0KU4qhyMp441qfwbirNg3%2Bwbm489KnEjXOz2I/RbeFs%3D' (2024-08-05)
• Updated input 'hyprland/nixpkgs':
    'github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d?narHash=sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k%3D' (2024-07-28)
  → 'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9?narHash=sha256-med8%2B5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c%3D' (2024-08-14)
• Updated input 'hyprlock':
    'github:hyprwm/Hyprlock/9393a3e94d837229714e28041427709756033f5a?narHash=sha256-gr4mN6BYKqy9JDr/ygDlMGYvEYBCMTDDDVnGNp/EYuw%3D' (2024-08-05)
  → 'github:hyprwm/Hyprlock/7bb4113a7e9cb62120e96d7c81066f0c055f0db4?narHash=sha256-QEVuZNXkytS1lqAtRMBAriJREcCTOeprxBTisXxpe3s%3D' (2024-08-21)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/ec78079a904d7d55e81a0468d764d0fffb50ac06?narHash=sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8%3D' (2024-08-11)
  → 'github:nix-community/nix-index-database/392828aafbed62a6ea6ccab13728df2e67481805?narHash=sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc%3D' (2024-08-18)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b?narHash=sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI%3D' (2024-08-09)
  → 'github:nixos/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba?narHash=sha256-Grh5PF0%2BgootJfOJFenTTxDTYPidA3V28dqJ/WV7iis%3D' (2024-08-18)
• Updated input 'nixvim':
    'github:nix-community/nixvim/f13bdef0bc697261c51eab686c28c7e2e7b7db3c?narHash=sha256-g3wit604jFhBvjDBziJgulDUXDl/ApafMXq7o7ioMxo%3D' (2024-08-10)
  → 'github:nix-community/nixvim/b7f419a759f70126e220533b724cc17e8528b184?narHash=sha256-IFlMn1lgVsZQZC9WklY9YKcCdI0mUxSYZ7EfkaKCsQU%3D' (2024-08-21)
• Updated input 'nixvim/git-hooks':
    'github:cachix/git-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1?narHash=sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q%3D' (2024-08-09)
  → 'github:cachix/git-hooks.nix/bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba?narHash=sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc%3D' (2024-08-16)
• Updated input 'nixvim/home-manager':
    'github:nix-community/home-manager/b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e?narHash=sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA%3D' (2024-08-07)
  → 'github:nix-community/home-manager/2598861031b78aadb4da7269df7ca9ddfc3e1671?narHash=sha256-Fy%2BKEvDQ%2BHc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY%3D' (2024-08-18)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/91010a5613ffd7ee23ee9263213157a1c422b705?narHash=sha256-%2BCQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU%3D' (2024-08-06)
  → 'github:lnl7/nix-darwin/076b9a905af8a52b866c8db068d6da475839d97b?narHash=sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4%3D' (2024-08-17)
• Updated input 'nixvim/nixpkgs':
    'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b?narHash=sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI%3D' (2024-08-09)
  → 'github:NixOS/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba?narHash=sha256-Grh5PF0%2BgootJfOJFenTTxDTYPidA3V28dqJ/WV7iis%3D' (2024-08-18)
• Updated input 'nixvim/nuschtosSearch':
    'github:NuschtOS/search/1016f4620e321c12ff1dbcd464e9de889e302d1c?narHash=sha256-wknII7R6ewALIxIKYtqeahjUk/ZrFj1ZtSpNBaHDCyg%3D' (2024-08-08)
  → 'github:NuschtOS/search/a05d1805f2a2bc47d230e5e92aecbf69f784f3d0?narHash=sha256-BuewfNEXEf11MIkJY%2BuvWsdLu1dIvgJqntWChvNdALg%3D' (2024-08-18)
• Updated input 'nixvim/treefmt-nix':
    'github:numtide/treefmt-nix/14c092e0326de759e16b37535161b3cb9770cea3?narHash=sha256-krGNVA30yptyRonohQ%2Bi9cnK%2BCfCpedg6z3qzqVJcTs%3D' (2024-08-10)
  → 'github:numtide/treefmt-nix/1d07739554fdc4f8481068f1b11d6ab4c1a4167a?narHash=sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc%3D' (2024-08-16)
• Updated input 'razer-laptop-control':
    'github:Razer-Linux/razer-laptop-control-no-dkms/6005f354c1f329b50a2ea59a194595cf731595d2?narHash=sha256-8aI/9vSMel5nIfJoA4c53JuGv/k0c14OgRVrwecznKk%3D' (2024-07-19)
  → 'github:Razer-Linux/razer-laptop-control-no-dkms/17f82d62a47b985c6ababd4af619b82ee9285a15?narHash=sha256-3F5d9D/MrAQwhdbW91v3eR%2B/tySitziQTAyfsP0zUOk%3D' (2024-08-20)
• Updated input 'swww':
    'github:LGFae/swww/81ae44954ebea9fb301d4bea1b5fdde8da323fb4?narHash=sha256-8YSZa9FcbrHNSxwJFXAQtQquLIypUhy8tRrxh%2B%2BuVBc%3D' (2024-08-08)
  → 'github:LGFae/swww/886ce3e9c5d88187fd765fe22c92338b038177c8?narHash=sha256-PkiICvEaZHOgEKA4gMUjLEFZ8pcwW5vONrK4qrE3e3Q%3D' (2024-08-12)

* razer: use fork

* add adb module

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

remove brillo

remove whitespace
  • Loading branch information
@mardukpill
mardukpill committed Sep 4, 2024
1 parent c98ff2e commit 03946da
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 72 deletions.
133 changes: 67 additions & 66 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
27 changes: 27 additions & 0 deletions modules/nixos/cli/adb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ];
};
}
6 changes: 3 additions & 3 deletions modules/nixos/hw/razer/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
3 changes: 1 addition & 2 deletions modules/nixos/wms/hyprland/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
}:
let
inherit (lib) mkIf mkEnableOption;
inherit (lib.${namespace}) enabled;

cfg = config.${namespace}.wms.hyprland;
in
Expand All @@ -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;

Expand Down
1 change: 1 addition & 0 deletions systems/x86_64-linux/blade/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ in
};

system = {
adb = enabled;
nix = {
managed = true;
comma = true;
Expand Down

0 comments on commit 03946da

Please sign in to comment.