cleanup
This commit is contained in:
@@ -7,7 +7,7 @@ in
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.hypridle = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
settings = {
|
||||
general = {
|
||||
before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
|
||||
|
||||
@@ -372,7 +372,7 @@ in
|
||||
${defaultBorderRadius}
|
||||
${defaultCenterOptions}
|
||||
margin-left: 4rem;
|
||||
margin-right: 4rem;
|
||||
margin-right: ${cfg.css.window.margin-right}rem;
|
||||
}
|
||||
|
||||
/* make window module transparent when no windows present */
|
||||
|
||||
@@ -1,5 +1,36 @@
|
||||
{ lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
# nord = import ../../desktop/theme/nord.nix;
|
||||
|
||||
# defaultOpacity = "opacity: 0.85;";
|
||||
# defaultBorderRadius = "border-radius: 1rem;";
|
||||
# defaultCenterOptions = ''
|
||||
# padding-top: 0.2rem;
|
||||
# padding-bottom: 0.2rem;
|
||||
# padding-left: 0.5rem;
|
||||
# padding-right: 0.5rem;
|
||||
# margin: 3px 0;
|
||||
# '';
|
||||
# borderRight = ''
|
||||
# padding-top: 0.2rem;
|
||||
# padding-bottom: 0.2rem;
|
||||
# padding-left: 0.5rem;
|
||||
# padding-right: 0.5rem;
|
||||
# margin: 3px 0;
|
||||
# border-radius: 0rem 1rem 1rem 0rem;
|
||||
# margin-right: 0.5rem;
|
||||
# '';
|
||||
# borderLeft = ''
|
||||
# padding-top: 0.2rem;
|
||||
# padding-bottom: 0.2rem;
|
||||
# padding-left: 0.5rem;
|
||||
# padding-right: 0.5rem;
|
||||
# margin: 3px 0;
|
||||
# border-radius: 1rem 0rem 0rem 1rem;
|
||||
# margin-left: 0.5rem;
|
||||
# '';
|
||||
in
|
||||
{
|
||||
options.mjallen.programs.waybar = {
|
||||
enable = mkEnableOption "enable waybar";
|
||||
@@ -28,5 +59,37 @@ with lib;
|
||||
type = types.str;
|
||||
default = "";
|
||||
};
|
||||
|
||||
# Waybar modules config
|
||||
# modules = mkOption {
|
||||
# type = types.submodule {
|
||||
# options = {
|
||||
# # Modules
|
||||
# window = mkOption {
|
||||
# type = types.submodule {
|
||||
# options = {
|
||||
# # Waybar Module CSS
|
||||
# margin-right = mkOption {
|
||||
# type = types.str;
|
||||
# default = "4";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# temperature = mkOption {
|
||||
# type = types.submodule {
|
||||
# options = {
|
||||
# # Waybar Module CSS
|
||||
# margin-right = mkOption {
|
||||
# type = types.str;
|
||||
# default = "4";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# default = { };
|
||||
# };
|
||||
};
|
||||
}
|
||||
@@ -1,9 +1,24 @@
|
||||
{ ... }:
|
||||
{ pkgs, system, lib, ... }:
|
||||
let
|
||||
isArm = ("aarch64-linux" == system);
|
||||
in
|
||||
{
|
||||
boot = {
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
];
|
||||
|
||||
binfmt = lib.mkIf isArm {
|
||||
registrations."x86_64-linux" = {
|
||||
magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00'';
|
||||
mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
|
||||
openBinary = true;
|
||||
interpreter = "${pkgs.box64}/bin/box64";
|
||||
preserveArgvZero = true;
|
||||
matchCredentials = true;
|
||||
fixBinary = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
zramSwap.enable = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, namespace, inputs, ... }:
|
||||
{ config, lib, namespace, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.${namespace}.bootloader.lanzaboote;
|
||||
|
||||
65
modules/nixos/sops/default.nix
Normal file
65
modules/nixos/sops/default.nix
Normal file
@@ -0,0 +1,65 @@
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
# Permission modes are in octal representation (same as chmod),
|
||||
# the digits represent: user|group|others
|
||||
# 7 - full (rwx)
|
||||
# 6 - read and write (rw-)
|
||||
# 5 - read and execute (r-x)
|
||||
# 4 - read only (r--)
|
||||
# 3 - write and execute (-wx)
|
||||
# 2 - write only (-w-)
|
||||
# 1 - execute only (--x)
|
||||
# 0 - none (---)
|
||||
# Either a user id or group name representation of the secret owner
|
||||
# It is recommended to get the user name from `config.users.users.<?name>.name` to avoid misconfiguration
|
||||
# Either the group id or group name representation of the secret group
|
||||
# It is recommended to get the group name from `config.users.users.<?name>.group` to avoid misconfiguration
|
||||
sops = {
|
||||
defaultSopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
|
||||
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||
|
||||
# ------------------------------
|
||||
# Secrets
|
||||
# ------------------------------
|
||||
secrets = {
|
||||
"wifi" = { };
|
||||
|
||||
# ------------------------------
|
||||
# SSH keys
|
||||
# ------------------------------
|
||||
# "ssh-keys-public/desktop-nixos" = {
|
||||
# sopsFile = ../../secrets/secrets.yaml;
|
||||
# mode = "0644";
|
||||
# owner = config.users.users."${user}".name;
|
||||
# group = config.users.users."${user}".group;
|
||||
# restartUnits = [ "sshd.service" ];
|
||||
# };
|
||||
# "ssh-keys-private/desktop-nixos" = {
|
||||
# sopsFile = ../../secrets/secrets.yaml;
|
||||
# mode = "0600";
|
||||
# owner = config.users.users."${user}".name;
|
||||
# group = config.users.users."${user}".group;
|
||||
# restartUnits = [ "sshd.service" ];
|
||||
# };
|
||||
# "ssh-keys-public/desktop-nixos-root" = {
|
||||
# sopsFile = ../../secrets/secrets.yaml;
|
||||
# path = "/root/.ssh/id_ed25519.pub";
|
||||
# mode = "0600";
|
||||
# restartUnits = [ "sshd.service" ];
|
||||
# };
|
||||
# "ssh-keys-private/desktop-nixos-root" = {
|
||||
# sopsFile = ../../secrets/secrets.yaml;
|
||||
# path = "/root/.ssh/id_ed25519";
|
||||
# mode = "0600";
|
||||
# restartUnits = [ "sshd.service" ];
|
||||
# };
|
||||
};
|
||||
|
||||
# ------------------------------
|
||||
# Templates
|
||||
# ------------------------------
|
||||
templates = {
|
||||
# ...
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user