realized I was inheriting nipkgs in my nixosSystems

added ways to use different branches of nixpkgs
made unfree packages have to specified
switched to nix master branch
moved sxhkd from a seperate flake
switched spotify and maim versions because both are broken on nixos-unstable right now
moved afk-cmds from local to remote
added flake-utils for easier devShell decleration
switched my mom's laptop to stable branch
This commit is contained in:
Gerg-L 2023-02-13 20:30:06 -05:00
parent 0132cde3f7
commit dc2db4a9bc
45 changed files with 449 additions and 1878 deletions

6
modules/default.nix Normal file
View file

@ -0,0 +1,6 @@
inputs: {
imports = [
(import ./sxhkd.nix inputs)
(import ./unfree.nix inputs)
];
}

69
modules/sxhkd.nix Normal file
View file

@ -0,0 +1,69 @@
_:{
config,
lib,
options,
pkgs,
...
}:
with lib; let
cfg = config.services.sxhkd;
keybindingsStr = concatStringsSep "\n" (mapAttrsToList (hotkey: command:
optionalString (command != null) ''
${hotkey}
${command}
'')
cfg.keybindings);
configFile = pkgs.writeText "sxhkdrc" (concatStringsSep "\n" [keybindingsStr cfg.extraConfig]);
in {
options.services.sxhkd = {
enable = mkEnableOption "simple X hotkey daemon";
package = mkOption {
type = types.package;
default = pkgs.sxhkd;
defaultText = "pkgs.sxhkd";
description = "Package containing the <command>sxhkd</command> executable.";
};
extraOptions = mkOption {
type = types.listOf types.str;
default = [];
description = "Command line arguments to invoke <command>sxhkd</command> with.";
example = literalExpression ''[ "-m 1" ]'';
};
keybindings = mkOption {
type = types.attrsOf (types.nullOr types.str);
default = {};
description = "An attribute set that assigns hotkeys to commands.";
example = literalExpression ''
{
"super + shift + {r,c}" = "i3-msg {restart,reload}";
"super + {s,w}" = "i3-msg {stacking,tabbed}";
}
'';
};
extraConfig = mkOption {
default = "";
type = types.lines;
description = "Additional configuration to add.";
example = literalExpression ''
super + {_,shift +} {1-9,0}
i3-msg {workspace,move container to workspace} {1-10}
'';
};
};
config = mkIf cfg.enable {
environment.systemPackages = [cfg.package];
systemd.user.services.sxhkd = {
description = "sxhkd hotkey daemon";
wantedBy = ["graphical-session.target"];
partOf = ["graphical-session.target"];
serviceConfig = {
ExecStart = "${cfg.package}/bin/sxhkd -c ${configFile} ${toString cfg.extraOptions}";
RestartSec = 3;
Restart = "always";
};
};
};
}

21
modules/unfree.nix Normal file
View file

@ -0,0 +1,21 @@
_: {
config,
lib,
...
}: let
allowed = config.nixpkgs.allowedUnfree;
in {
options.nixpkgs = {
allowedUnfree = lib.mkOption {
type = lib.types.listOf lib.types.string;
default = [];
description = ''
Allows for unfree packages by their name.
'';
};
};
config = lib.mkMerge [
(lib.mkIf (allowed != []) {nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) allowed;})
];
}