Skip to content

Commit

Permalink
global: format
Browse files Browse the repository at this point in the history
  • Loading branch information
brckd committed Sep 23, 2024
1 parent 58bcf38 commit 4ae4fea
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 45 deletions.
6 changes: 5 additions & 1 deletion configs/nixos/desktop/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{pkgs, lib, ...}:
{
pkgs,
lib,
...
}:
with lib; {
imports = [
./configuration.nix
Expand Down
6 changes: 5 additions & 1 deletion configs/nixos/laptop/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{pkgs, lib, ...}:
{
pkgs,
lib,
...
}:
with lib; {
imports = [
./configuration.nix
Expand Down
71 changes: 37 additions & 34 deletions modules/home/dconf/default.nix
Original file line number Diff line number Diff line change
@@ -1,46 +1,49 @@
{
config,
lib,
pkgs,
pkgs,
...
}:
with builtins;
with lib; let
cfg = config.dconf;
extensions = with pkgs.gnomeExtensions; [
launch-new-instance
forge
];
extensions = with pkgs.gnomeExtensions; [
launch-new-instance
forge
];
in {
config = mkIf cfg.enable {
home.packages = extensions;
dconf.settings = mkMerge ([{
"org/gnome/shell" = {
disable-user-extensions = false;
enabled-extensions = map (e: e.extensionUuid) extensions;
};
"org/gnome/mutter" = {
dynamic-workspaces = false;
};
"org/gnome/desktop/wm/preferences" = {
resize-with-right-button = true;
num-workspaces = 9;
};
"org/gnome/desktop/wm/keybindings" = {
close = ["<Super>q"];
};
"org/gnome/shell/extensions/forge" = {
dnd-center-layout = "swap";
};
}] ++ (map (i: {
# See https://unix.stackexchange.com/a/677879
"org/gnome/shell/keybindings" = {
"switch-to-application-${toString i}" = [];
};
"org/gnome/desktop/wm/keybindings" = {
"switch-to-workspace-${toString i}" = ["<Super>${toString i}"];
"move-to-workspace-${toString i}" = ["<Super><Shift>${toString i}"];
};
}) (range 1 9)));
home.packages = extensions;
dconf.settings = mkMerge ([
{
"org/gnome/shell" = {
disable-user-extensions = false;
enabled-extensions = map (e: e.extensionUuid) extensions;
};
"org/gnome/mutter" = {
dynamic-workspaces = false;
};
"org/gnome/desktop/wm/preferences" = {
resize-with-right-button = true;
num-workspaces = 9;
};
"org/gnome/desktop/wm/keybindings" = {
close = ["<Super>q"];
};
"org/gnome/shell/extensions/forge" = {
dnd-center-layout = "swap";
};
}
]
++ (map (i: {
# See https://unix.stackexchange.com/a/677879
"org/gnome/shell/keybindings" = {
"switch-to-application-${toString i}" = [];
};
"org/gnome/desktop/wm/keybindings" = {
"switch-to-workspace-${toString i}" = ["<Super>${toString i}"];
"move-to-workspace-${toString i}" = ["<Super><Shift>${toString i}"];
};
}) (range 1 9)));
};
}
2 changes: 1 addition & 1 deletion modules/home/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
imports = [
nur.hmModules.nur
stylix.homeManagerModules.stylix
./dconf
./dconf
./stylix
./zsh
./starship
Expand Down
2 changes: 1 addition & 1 deletion modules/home/nixvim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ in {
indent-blankline.enable = true;
nvim-autopairs.enable = true;

web-devicons.enable = true;
web-devicons.enable = true;
telescope.enable = true;
nvim-tree.enable = true;
lualine.enable = true;
Expand Down
4 changes: 2 additions & 2 deletions modules/nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
nur.nixosModules.nur
erosanix.nixosModules.protonvpn
stylix.nixosModules.stylix
./xserver
./gnome
./xserver
./gnome
./stylix
./locale
./steam
Expand Down
6 changes: 3 additions & 3 deletions modules/nixos/gnome/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
config,
lib,
pkgs,
pkgs,
...
}:
with lib; let
Expand All @@ -13,8 +13,8 @@ in {
gnome-connections
epiphany
simple-scan
gnome-software
gnome-weather
gnome-software
gnome-weather
];
};
}
4 changes: 2 additions & 2 deletions modules/nixos/xserver/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
config,
lib,
pkgs,
pkgs,
...
}:
with lib; let
cfg = config.services.xserver;
in {
config = mkIf cfg.enable {
services.xserver.excludePackages = with pkgs; [
xterm
xterm
];
};
}

0 comments on commit 4ae4fea

Please sign in to comment.