mirror of
https://github.com/kittywitch/nixfiles.git
synced 2026-02-09 12:29:19 -08:00
fix: clean-up
This commit is contained in:
parent
1ca6189cfd
commit
160be4bd90
11 changed files with 13 additions and 41 deletions
|
|
@ -1,5 +1,4 @@
|
||||||
{
|
{
|
||||||
pkgs,
|
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, nixos, lib, ... }: {
|
{ config, lib, ... }: {
|
||||||
# TODO: fix lib use
|
# TODO: fix lib use
|
||||||
home.packages = [
|
home.packages = [
|
||||||
config.services.konawall.konashow
|
config.services.konawall.konashow
|
||||||
|
|
@ -9,12 +9,12 @@
|
||||||
interval = "30m";
|
interval = "30m";
|
||||||
mode = "shuffle";
|
mode = "shuffle";
|
||||||
commonTags = [ "width:>=1600" ];
|
commonTags = [ "width:>=1600" ];
|
||||||
tagList = map (lib.toList) [
|
tagList = map lib.toList [
|
||||||
([
|
[
|
||||||
"score:>=50"
|
"score:>=50"
|
||||||
#"no_humans"
|
#"no_humans"
|
||||||
#"rating:s"
|
#"rating:s"
|
||||||
])
|
]
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, lib, ... }: let
|
{ config, pkgs, ... }: let
|
||||||
inherit (config.base16) palette;
|
inherit (config.base16) palette;
|
||||||
in {
|
in {
|
||||||
systemd.user.services = {
|
systemd.user.services = {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, kittywitch, lib, pkgs, ... }:
|
{ kittywitch, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
xdg.configFile."waybar/style.css" = { inherit (kittywitch.sassTemplate { name = "waybar-style"; src = ./waybar.sass; }) source; };
|
xdg.configFile."waybar/style.css" = { inherit (kittywitch.sassTemplate { name = "waybar-style"; src = ./waybar.sass; }) source; };
|
||||||
|
|
|
||||||
7
lib.nix
7
lib.nix
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
inputs,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
inputs.utils.lib.eachDefaultSystem (system: {
|
|
||||||
})
|
|
||||||
|
|
@ -13,11 +13,11 @@ in with lib; {
|
||||||
sass = {
|
sass = {
|
||||||
variables = mkOption {
|
variables = mkOption {
|
||||||
type = attrsOf str;
|
type = attrsOf str;
|
||||||
default = (cfg.palette // cfg.palette' // {
|
default = cfg.palette // cfg.palette' // {
|
||||||
term_font = "Iosevka";
|
term_font = "Iosevka";
|
||||||
font = "Iosevka";
|
font = "Iosevka";
|
||||||
font_size = "12px";
|
font_size = "12px";
|
||||||
});
|
};
|
||||||
};
|
};
|
||||||
css_style = mkOption {
|
css_style = mkOption {
|
||||||
type = enum [ "nested" "compressed" "compact" "expanded" ];
|
type = enum [ "nested" "compressed" "compact" "expanded" ];
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ inherit (lib.attrsets) mapAttrsToList;
|
||||||
commonUser = {
|
commonUser = {
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
openssh.authorizedKeys.keys = concatLists (mapAttrsToList
|
openssh.authorizedKeys.keys = concatLists (mapAttrsToList
|
||||||
(name: user:
|
(_: user:
|
||||||
if elem "wheel" user.extraGroups then
|
if elem "wheel" user.extraGroups then
|
||||||
user.openssh.authorizedKeys.keys
|
user.openssh.authorizedKeys.keys
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
inherit (std) list;
|
inherit (std) list;
|
||||||
in {
|
in {
|
||||||
boot = mkMerge [
|
boot = mkMerge [
|
||||||
({
|
{
|
||||||
kernel.sysctl = {
|
kernel.sysctl = {
|
||||||
"fs.inotify.max_user_watches" = 524288;
|
"fs.inotify.max_user_watches" = 524288;
|
||||||
"net.core.rmem_max" = 16777216;
|
"net.core.rmem_max" = 16777216;
|
||||||
|
|
@ -20,7 +20,7 @@ in {
|
||||||
tmpOnTmpfs = true;
|
tmpOnTmpfs = true;
|
||||||
tmpOnTmpfsSize = "80%";
|
tmpOnTmpfsSize = "80%";
|
||||||
kernelPackages = mkIf (list.elem "zfs" config.boot.supportedFilesystems) (mkDefault config.boot.zfs.package.latestCompatibleLinuxPackages);
|
kernelPackages = mkIf (list.elem "zfs" config.boot.supportedFilesystems) (mkDefault config.boot.zfs.package.latestCompatibleLinuxPackages);
|
||||||
})
|
}
|
||||||
(mkIf (list.elem "zfs" config.boot.supportedFilesystems) {
|
(mkIf (list.elem "zfs" config.boot.supportedFilesystems) {
|
||||||
kernelPackages = mkDefault config.boot.zfs.package.latestCompatibleLinuxPackages;
|
kernelPackages = mkDefault config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||||
zfs.enableUnstable = true;
|
zfs.enableUnstable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,4 @@
|
||||||
{ config, lib, pkgs, std, ... }: let
|
_: {
|
||||||
inherit (std) string;
|
|
||||||
inherit (lib.modules) mkForce;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
console = {
|
console = {
|
||||||
font = "Tamzen7x14";
|
font = "Tamzen7x14";
|
||||||
earlySetup = true;
|
earlySetup = true;
|
||||||
|
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
{ config, pkgs, ... }: {
|
|
||||||
services.xserver = {
|
|
||||||
enable = true;
|
|
||||||
autorun = false;
|
|
||||||
exportConfiguration = true;
|
|
||||||
in {
|
|
||||||
startx.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
xorg.xinit
|
|
||||||
xsel
|
|
||||||
scrot
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{inputs}: let
|
{inputs}: let
|
||||||
std = import ./std.nix {inherit inputs;};
|
std = import ./std.nix {inherit inputs;};
|
||||||
tree = import ./tree.nix {inherit inputs;};
|
tree = import ./tree.nix {inherit inputs;};
|
||||||
lib = inputs.nixpkgs.lib;
|
inherit (inputs.nixpkgs) lib;
|
||||||
systems = import ./systems {inherit inputs tree lib std;};
|
systems = import ./systems {inherit inputs tree lib std;};
|
||||||
shells = import ./shells {inherit inputs tree lib std pkgs;};
|
shells = import ./shells {inherit inputs tree lib std pkgs;};
|
||||||
inherit (import ./pkgs.nix {inherit inputs tree;}) pkgs;
|
inherit (import ./pkgs.nix {inherit inputs tree;}) pkgs;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue