Compare commits
No commits in common. "b99f2544a53581e949844587c42357de981e313b" and "7c549b8c78ac1c9d73e848af806ea24af969cbd2" have entirely different histories.
b99f2544a5
...
7c549b8c78
8 changed files with 91 additions and 86 deletions
128
flake.lock
generated
128
flake.lock
generated
|
|
@ -1,5 +1,24 @@
|
|||
{
|
||||
"nodes": {
|
||||
"asahi": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780669925,
|
||||
"narHash": "sha256-inOQx/s7GQjh9bcCjCHXAeX0EHX+sOQUBoo8+bs48ME=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-apple-silicon",
|
||||
"rev": "5880026520a3fd248d59e1c81c4e4e111aefc6af",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-apple-silicon",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16": {
|
||||
"inputs": {
|
||||
"fromYaml": "fromYaml"
|
||||
|
|
@ -22,9 +41,9 @@
|
|||
"inputs": {
|
||||
"cachyos-kernel": "cachyos-kernel_2",
|
||||
"cachyos-kernel-patches": "cachyos-kernel-patches",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776386586,
|
||||
|
|
@ -75,7 +94,7 @@
|
|||
},
|
||||
"catppuccin": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776420287,
|
||||
|
|
@ -92,6 +111,21 @@
|
|||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"locked": {
|
||||
"lastModified": 1761640442,
|
||||
"narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-compat",
|
||||
"rev": "4a56054d8ffc173222d09dad23adf4ba946c8884",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1767039857,
|
||||
|
|
@ -107,21 +141,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"locked": {
|
||||
"lastModified": 1761640442,
|
||||
"narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-compat",
|
||||
"rev": "4a56054d8ffc173222d09dad23adf4ba946c8884",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -344,7 +363,7 @@
|
|||
"inputs": {
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
|
|
@ -419,7 +438,7 @@
|
|||
},
|
||||
"nix-vscode-extensions": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777951761,
|
||||
|
|
@ -435,37 +454,18 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-apple-silicon": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781108254,
|
||||
"narHash": "sha256-acCLKPvXbyLVd8Vui/6GuQp2JQ409riBOe00nr/qe+w=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-apple-silicon",
|
||||
"rev": "53ae7e036433331013bd7c03ae927da554482816",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-apple-silicon",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1776311487,
|
||||
"narHash": "sha256-9U8bL9X/0R9cZD3Uc/mN37AWvv5dB4WQqqjLRAxQfas=",
|
||||
"lastModified": 1779560665,
|
||||
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cc1e0e027707ad53dddae39d3b3e992262c7d8c7",
|
||||
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable-small",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -503,16 +503,16 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1776169885,
|
||||
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
||||
"lastModified": 1776311487,
|
||||
"narHash": "sha256-9U8bL9X/0R9cZD3Uc/mN37AWvv5dB4WQqqjLRAxQfas=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
||||
"rev": "cc1e0e027707ad53dddae39d3b3e992262c7d8c7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixos-unstable-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -534,6 +534,22 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1776169885,
|
||||
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1777207419,
|
||||
"narHash": "sha256-V3bmPWAajDiC+1ClDOp55gianW2EyRJSJOyu1RUQibc=",
|
||||
|
|
@ -549,22 +565,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1780243769,
|
||||
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1776169885,
|
||||
|
|
@ -599,6 +599,7 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"asahi": "asahi",
|
||||
"base16": "base16",
|
||||
"cachyos-kernel": "cachyos-kernel",
|
||||
"catppuccin": "catppuccin",
|
||||
|
|
@ -608,7 +609,6 @@
|
|||
"niri": "niri",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nix-vscode-extensions": "nix-vscode-extensions",
|
||||
"nixos-apple-silicon": "nixos-apple-silicon",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"systems": "systems_2",
|
||||
"tt-schemes": "tt-schemes",
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
nixos-apple-silicon.url = "github:nix-community/nixos-apple-silicon";
|
||||
asahi.url = "github:nix-community/nixos-apple-silicon";
|
||||
|
||||
cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@
|
|||
dunst.enable = true;
|
||||
rofi.enable = true;
|
||||
waybar.enable = true;
|
||||
poweralertd.enable = true;
|
||||
wob.enable = true;
|
||||
gammastep.enable = true;
|
||||
wl-clip-persist.enable = true;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
dunst.enable = true;
|
||||
rofi.enable = true;
|
||||
waybar.enable = true;
|
||||
poweralertd.enable = true;
|
||||
batsignal.enable = true;
|
||||
wob.enable = true;
|
||||
gammastep.enable = true;
|
||||
wl-clip-persist.enable = true;
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
regreet.enable = true;
|
||||
|
||||
# theme, see `modules/desktop/themes`
|
||||
themes.active = "gruvbox";
|
||||
themes.active = "catppuccin";
|
||||
|
||||
# monitors, see `modules/desktop/monitors`
|
||||
monitors.enable = true;
|
||||
|
|
@ -92,7 +92,6 @@
|
|||
system.loupe.enable = true;
|
||||
system.ananicy.enable = true;
|
||||
system.kdeconnect.enable = true;
|
||||
system.virt-manager.enable = true;
|
||||
# editors
|
||||
editors.micro.enable = true;
|
||||
editors.vscode.enable = true;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
imports =
|
||||
[
|
||||
inputs.nixos-apple-silicon.nixosModules.apple-silicon-support
|
||||
inputs.asahi.nixosModules.apple-silicon-support
|
||||
inputs.hardware.nixosModules.common-pc-laptop-ssd
|
||||
inputs.hardware.nixosModules.common-pc-laptop
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ in {
|
|||
# services that help w/ battery saving
|
||||
powerManagement.powertop.enable = true;
|
||||
services.power-profiles-daemon.enable = true;
|
||||
services.upower.enable = true;
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
23
modules/desktop/batsignal.nix
Normal file
23
modules/desktop/batsignal.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.modules.desktop.batsignal;
|
||||
in {
|
||||
options.modules.desktop.batsignal = {
|
||||
enable = mkEnableOption "Enable batsignal, a battery notification service";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
hm.services.batsignal = {
|
||||
enable = true;
|
||||
|
||||
extraArgs = [
|
||||
# -w 20 -c 10 -d 5 -- set battery levels
|
||||
# -p -- notify on plug/unplug
|
||||
# -m 2 -- set interval to 2 seconds
|
||||
"-w 20" "-c 10" "-d 5" "-p" "-m 2"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.modules.desktop.poweralertd;
|
||||
in {
|
||||
options.modules.desktop.poweralertd = {
|
||||
enable = mkEnableOption "Enable poweralertd, a battery notification service";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.upower.enable = true;
|
||||
hm.services.poweralertd.enable = true;
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue