This commit is contained in:
KnightArtorias 2026-05-19 01:08:18 +00:00
parent 05c2efb575
commit f536e08a2a
6 changed files with 32 additions and 75 deletions

36
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"lastModified": 1778716662,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
"type": "github"
},
"original": {
@ -20,11 +20,11 @@
},
"import-tree": {
"locked": {
"lastModified": 1773693634,
"narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
"lastModified": 1778781969,
"narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",
"owner": "vic",
"repo": "import-tree",
"rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
"rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",
"type": "github"
},
"original": {
@ -35,11 +35,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1776877367,
"narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
"lastModified": 1778869304,
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github"
},
"original": {
@ -51,11 +51,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1774748309,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
"lastModified": 1777168982,
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a",
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
"type": "github"
},
"original": {
@ -66,11 +66,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1775579569,
"narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=",
"lastModified": 1778869304,
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dfd9566f82a6e1d55c30f861879186440614696e",
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github"
},
"original": {
@ -93,11 +93,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1777158145,
"narHash": "sha256-xYXjoA5+9aDu/A4Og/89JF8n41b7vca9av1ecyR6dgo=",
"lastModified": 1779145538,
"narHash": "sha256-j2RQqBLYhPuddU6C8n5hGKboXq1tDLCZ7bWe5/LgTHM=",
"owner": "BirdeeHub",
"repo": "nix-wrapper-modules",
"rev": "fd6d1dc5fdfb1aa39c355f4da36773a972a35721",
"rev": "597b35c93dd0ab0ae38758e3193582b2fd259aa1",
"type": "github"
},
"original": {

View file

@ -8,8 +8,5 @@
wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
};
# import modules/ automatically
outputs = inputs: inputs.flake-parts.lib.mkFlake
{inherit inputs;}
(inputs.import-tree ./modules);
outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules);
}

View file

@ -1,25 +0,0 @@
{ self, inputs, ... }: {
flake.nixosModules.bluetooth = { inputs, ... }: {
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
settings = {
General = {
# Shows battery charge of connected devices on supported
# Bluetooth adapters. Defaults to 'false'.
Experimental = true;
# When enabled other devices can connect faster to us, however
# the tradeoff is increased power consumption. Defaults to
# 'false'.
FastConnectable = true;
};
Policy = {
# Enable all controllers when they are found. This includes
# adapters present on start as well as adapters that are plugged
# in later on. Defaults to 'true'.
AutoEnable = true;
};
};
};
};
}

View file

@ -1,10 +0,0 @@
{ self, inputs, ... }: {
flake.nixosModules.ckb-next = { inputs, ... }: {
hardware.ckb-next = {
enable = true;
package = pkgs.ckb-next.overrideAttrs (old: {
cmakeFlags = (old.cmakeFlags or [ ]) ++ [ "-DUSE_DBUS_MENU=0" ];
});
};
};
}

View file

@ -1,16 +1,8 @@
{ self, inputs, ... }: {
flake.wrappersModules.niri = {
config,
lib,
pkgs,
...
}: {
options.terminal = lib.mkOption {
type = lib.types.str;
default = "alacritty";
};
perSystem = { pkgs, ... }: {
packages.niri = inputs.wrapper-modules.wrappers.niri.wrap {
inherit pkgs;
config = {
settings = {
prefer-no-csd = true;
@ -347,11 +339,4 @@
};
};
};
perSystem = { pkgs, ... }: {
packages.niri = inputs.wrapper-modules.wrappers.niri.wrap {
inherit pkgs;
imports = [ self.wrapperModules.niri ];
};
};
}

10
modules/parts.nix Normal file
View file

@ -0,0 +1,10 @@
{
config = {
systems = [
"x86_64-linux"
"x86_64-darwin"
"aarch64-linux"
"aarch64-darwin"
];
};
}