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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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