Run nix fmt

Format using `nixfmt-rfc-style`.
This commit is contained in:
Oliver Davies 2024-06-10 09:31:28 +01:00
parent 14a1f177a0
commit 7f2df5f726
24 changed files with 317 additions and 162 deletions

View file

@ -1,34 +1,60 @@
{ config, desktop, inputs, pkgs, self, username, ... }:
{
config,
desktop,
inputs,
pkgs,
self,
username,
...
}:
let
desktop-config =
import ./desktop.nix { inherit config inputs pkgs username; };
desktop-config = import ./desktop.nix {
inherit
config
inputs
pkgs
username
;
};
shared-config = import "${self}/lib/shared/home-manager.nix" {
inherit inputs pkgs self username;
inherit
inputs
pkgs
self
username
;
};
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
inherit inputs pkgs;
};
in {
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" { inherit inputs pkgs; };
in
{
imports =
if desktop then [ desktop-config shared-config ] else [ shared-config ];
if desktop then
[
desktop-config
shared-config
]
else
[ shared-config ];
home.packages = shared-packages ++ pkgs.lib.optionals desktop [
pkgs.discord
pkgs.gimp
pkgs.gscan2pdf
pkgs.kdenlive
pkgs.meslo-lg
pkgs.obs-studio
pkgs.okular
pkgs.pamixer
pkgs.pass
pkgs.pavucontrol
pkgs.pinentry
pkgs.via
pkgs.xsel
pkgs.xcape
pkgs.zoom-us
];
home.packages =
shared-packages
++ pkgs.lib.optionals desktop [
pkgs.discord
pkgs.gimp
pkgs.gscan2pdf
pkgs.kdenlive
pkgs.meslo-lg
pkgs.obs-studio
pkgs.okular
pkgs.pamixer
pkgs.pass
pkgs.pavucontrol
pkgs.pinentry
pkgs.via
pkgs.xsel
pkgs.xcape
pkgs.zoom-us
];
home.sessionVariables = {
EDITOR = "nvim";

View file

@ -1,4 +1,10 @@
{ config, inputs, pkgs, username, }: {
{
config,
inputs,
pkgs,
username,
}:
{
imports = [
./modules/copyq.nix
./modules/dunst.nix

View file

@ -2,6 +2,10 @@
services.dunst = {
enable = true;
settings = { global = { follow = "keyboard"; }; };
settings = {
global = {
follow = "keyboard";
};
};
};
}

View file

@ -1,9 +1,15 @@
let baseUrl = "https://www.oliverdavies.uk";
in {
let
baseUrl = "https://www.oliverdavies.uk";
in
{
services.espanso = {
enable = true;
configs = { default = { show_notifications = false; }; };
configs = {
default = {
show_notifications = false;
};
};
matches = {
base = {

View file

@ -1,4 +1,5 @@
{ username, ... }: {
{ username, ... }:
{
services.flameshot = {
enable = true;

View file

@ -1,4 +1,9 @@
{ config, inputs, pkgs, ... }:
{
config,
inputs,
pkgs,
...
}:
{
programs.i3status-rust = {
@ -64,18 +69,19 @@
xwayland = true;
config = {
bars = [{
colors.background = "#111111";
bars = [
{
colors.background = "#111111";
fonts = {
names = [ "JetBrainsMono Nerd Font Mono" ];
size = 12.0;
};
fonts = {
names = [ "JetBrainsMono Nerd Font Mono" ];
size = 12.0;
};
statusCommand =
"i3status-rs ~/.config/i3status-rust/config-default.toml";
trayPadding = 5;
}];
statusCommand = "i3status-rs ~/.config/i3status-rust/config-default.toml";
trayPadding = 5;
}
];
defaultWorkspace = "workspace number 1";
@ -85,7 +91,9 @@
};
input = {
"*" = { xkb_layout = "gb"; };
"*" = {
xkb_layout = "gb";
};
"type:touchpad" = {
dwt = "enabled";
@ -94,8 +102,10 @@
};
keybindings =
let modifier = config.wayland.windowManager.sway.config.modifier;
in inputs.nixpkgs.lib.mkOptionDefault {
let
modifier = config.wayland.windowManager.sway.config.modifier;
in
inputs.nixpkgs.lib.mkOptionDefault {
"${modifier}+Escape" = "exec swaylock --daemonize";
"${modifier}+Shift+b" = "exec ${pkgs.firefox}/bin/firefox";
"${modifier}+Shift+f" = "exec ${pkgs.xfce.thunar}/bin/thunar";
@ -112,7 +122,9 @@
# bg = "~/.config/wallpaper/wallpaper.jpg fill";
# };
eDP-1 = { scale = "1.0"; };
eDP-1 = {
scale = "1.0";
};
};
terminal = "wezterm";