formatting

This commit is contained in:
Daylin Morgan 2024-01-28 17:39:10 -06:00
parent 6f00b5f93c
commit d10d80bcc6
Signed by: daylin
GPG Key ID: C1E52E7DD81DF79F
9 changed files with 81 additions and 88 deletions

View File

@ -6,11 +6,11 @@
...
}: {
imports = with inputs.self.nixosModules; [
desktop
nix-ld
];
desktop.enable = true;
cli.enable = true;
# Enable the X11 windowing system.
services.xserver = {
enable = true;
@ -18,12 +18,9 @@
windowManager.qtile.enable = true;
};
cli.enable = true;
users.users.daylin.extraGroups = ["docker"];
programs.gnupg.agent = {
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
}
}

View File

@ -5,7 +5,6 @@
...
}: {
imports = with inputs.self.nixosModules; [
nix-ld
virtualbox
restic
@ -14,7 +13,7 @@
cli.enable = true;
desktop.enable = true;
languages = {
languages = {
misc = true;
python = true;
nim = true;
@ -43,6 +42,6 @@
};
users.users.daylin.extraGroups = [
"audio"
"audio"
];
}

View File

@ -1,4 +1,8 @@
{inputs, lib, ...}: {
{
inputs,
lib,
...
}: {
imports = with inputs.self.nixosModules; [
users
nix
@ -27,4 +31,3 @@
options.desktop.enable = lib.mkEnableOption "is desktop";
}

View File

@ -4,14 +4,14 @@
config,
lib,
...
}: let
}: let
inherit (lib) mkIf;
cfg = config.desktop;
in {
config = mkIf cfg.enable {
fonts.fontconfig.enable = true;
fonts.packages = with pkgs; [
(nerdfonts.override {fonts = ["FiraCode"];})
];
};
fonts.fontconfig.enable = true;
fonts.packages = with pkgs; [
(nerdfonts.override {fonts = ["FiraCode"];})
];
};
}

View File

@ -9,22 +9,22 @@
cfg = config.desktop;
in {
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
inputs.wezterm.packages.${pkgs.system}.default
alacritty
environment.systemPackages = with pkgs; [
inputs.wezterm.packages.${pkgs.system}.default
alacritty
inkscape
gimp
inkscape
gimp
libreoffice-qt
hunspell # spell check for libreoffice
libreoffice-qt
hunspell # spell check for libreoffice
(vivaldi.override {
commandLineArgs = [
"--force-dark-mode"
];
proprietaryCodecs = true;
})
];
};
(vivaldi.override {
commandLineArgs = [
"--force-dark-mode"
];
proprietaryCodecs = true;
})
];
};
}

View File

@ -8,30 +8,27 @@
inherit (lib) mkIf;
cfg = config.services.xserver.windowManager.qtile;
lock = pkgs.writeShellApplication {
name = "lock";
runtimeInputs = with pkgs; [i3lock-color figlet procps];
text = builtins.readFile ./lock.sh;
};
name = "lock";
runtimeInputs = with pkgs; [i3lock-color figlet procps];
text = builtins.readFile ./lock.sh;
};
in {
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
xss-lock
lock
];
environment.systemPackages = with pkgs; [
xss-lock
lock
];
systemd.services.i3lock = {
wantedBy = ["sleep.target"];
description = "Lock the screen using a custom lock script";
before = ["suspend.target"];
serviceConfig = {
User = "daylin";
Type = "forking";
Environment = "DISPLAY=:0";
ExecStart = "${lock}/bin/lock";
};
systemd.services.i3lock = {
wantedBy = ["sleep.target"];
description = "Lock the screen using a custom lock script";
before = ["suspend.target"];
serviceConfig = {
User = "daylin";
Type = "forking";
Environment = "DISPLAY=:0";
ExecStart = "${lock}/bin/lock";
};
};
}
};
}

View File

@ -9,7 +9,6 @@
cfg = config.programs.hyprland;
in {
config = mkIf cfg.enable {
security.pam.services.swaylock = {};
programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.default;
# Optional, hint electron apps to use wayland:

View File

@ -9,33 +9,31 @@
cfg = config.services.xserver.windowManager.qtile;
in {
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
brightnessctl
environment.systemPackages = with pkgs; [
brightnessctl
picom
# xorg utils
xdotool
xclip
picom
# xorg utils
xdotool
xclip
# xrandr friends
autorandr
arandr
# xrandr friends
autorandr
arandr
# notifications
libnotify
dunst
# notifications
libnotify
dunst
# qtile & friends
# qtile
eww
feh
rofi
# qtile & friends
# qtile
eww
feh
rofi
flameshot
catppuccin-cursors.mochaDark
pavucontrol
];
flameshot
catppuccin-cursors.mochaDark
pavucontrol
];
};
}

View File

@ -12,18 +12,18 @@ in {
default = true;
type = types.bool;
description = ''
include default user "daylin"
include default user "daylin"
'';
};
config = mkIf cfg {
users.users.daylin = {
isNormalUser = true;
shell = pkgs.zsh;
extraGroups = [
"wheel" # sudo
];
initialPassword = "nix";
};
users.users.daylin = {
isNormalUser = true;
shell = pkgs.zsh;
extraGroups = [
"wheel" # sudo
];
initialPassword = "nix";
};
};
}