Move dconf setup to desktop/default.nix, make some more sway options sensible defaults

This commit is contained in:
Evie Litherland-Smith 2023-06-19 06:53:21 +01:00
parent 7b9d922b29
commit da03f96878
10 changed files with 28 additions and 31 deletions

0
.gitmodules vendored
View file

View file

@ -2,4 +2,3 @@
.pre-commit-config.yaml .pre-commit-config.yaml
.stylua.toml .stylua.toml
Makefile Makefile
nvim/

4
desktop/default.nix Normal file
View file

@ -0,0 +1,4 @@
{...}: {
console.keyMap = "uk";
programs.dconf.enable = true;
}

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [./default.nix];
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
waybar = super.waybar.overrideAttrs (oldAttrs: { waybar = super.waybar.overrideAttrs (oldAttrs: {

View file

@ -1,8 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [ imports = [./sddm.nix];
./xserver.nix
./sddm.nix
];
services.xserver = { services.xserver = {
enable = true; enable = true;
desktopManager = { desktopManager = {

View file

@ -1,8 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [ imports = [./sddm.nix];
./xserver.nix
./sddm.nix
];
services.xserver = { services.xserver = {
enable = true; enable = true;
desktopManager.xfce.enable = true; desktopManager.xfce.enable = true;

View file

@ -1,9 +1,8 @@
{...}: { {...}: {
imports = [./default.nix];
services.xserver = { services.xserver = {
enable = true; enable = true;
layout = "gb"; layout = "gb";
xkbVariant = ""; xkbVariant = "";
}; };
console.keyMap = "uk";
programs.dconf.enable = true;
} }

View file

@ -8,7 +8,7 @@
term = config.wayland.windowManager.sway.config.terminal; term = config.wayland.windowManager.sway.config.terminal;
in { in {
imports = [ imports = [
# ./swaylock.nix ./swaylock.nix
# ./eww.nix # ./eww.nix
./waybar.nix ./waybar.nix
./gtk.nix ./gtk.nix
@ -27,11 +27,18 @@ in {
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
config = { config = {
input."*".xkb_layout = "gb";
output."*".bg = "~/nixos/wallpaper.jpg fill";
fonts = { fonts = {
names = ["FiraCode Nerd Font" "FiraCode Nerd Font Mono"]; names = ["FiraCode Nerd Font" "FiraCode Nerd Font Mono"];
size = 12.0; size = 12.0;
}; };
gaps = {
inner = lib.mkDefault 5;
outer = lib.mkDefault 20;
};
bars = []; bars = [];
startup = [{command = "dunst";} {command = "waybar";}];
modifier = lib.mkDefault "Mod4"; modifier = lib.mkDefault "Mod4";
terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm"; terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm";
keybindings = lib.mkOptionDefault { keybindings = lib.mkOptionDefault {

View file

@ -1,5 +1,9 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [../../home/work.nix ../../home/gui ../../home/desktop/hyprland.nix]; imports = [
../../home/work.nix
../../home/gui
../../home/desktop/hyprland.nix
];
home.username = "elitherl"; home.username = "elitherl";
home.homeDirectory = "/home/elitherl"; home.homeDirectory = "/home/elitherl";
home.stateVersion = "22.11"; home.stateVersion = "22.11";
@ -11,9 +15,11 @@
zoom-us zoom-us
]; ];
wayland.windowManager.hyprland.extraConfig = ''source=./common.conf wayland.windowManager.hyprland.extraConfig = ''
source=./common.conf
monitor=eDP-1,preferred,auto,1.00 monitor=eDP-1,preferred,auto,1.00
''; '';
# wayland.windowManager.sway.config.output.eDP-1.scale = "1.0";
programs.waybar.settings.main = { programs.waybar.settings.main = {
"modules-left" = ["wlr/workspaces"]; "modules-left" = ["wlr/workspaces"];
"modules-center" = ["clock"]; "modules-center" = ["clock"];

View file

@ -12,22 +12,9 @@
# source=./common.conf # source=./common.conf
# monitor=HDMI-A-2,preferred,auto,2.00 # monitor=HDMI-A-2,preferred,auto,2.00
# ''; # '';
wayland.windowManager.sway = { wayland.windowManager.sway.config = {
config = { output.HDMI-A-2.scale = "2.0";
input = {"*" = {xkb_layout = "gb";};}; startup = [{command = "steam";}];
modifier = "Mod4";
output = {
HDMI-A-2 = {
scale = "2.0";
bg = "~/nixos/wallpaper.jpg fill";
};
};
gaps = {
inner = 5;
outer = 20;
};
startup = [{command = "dunst";} {command = "waybar";} {command = "steam";}];
};
}; };
programs.waybar.settings.main = { programs.waybar.settings.main = {
"modules-left" = ["sway/workspaces"]; "modules-left" = ["sway/workspaces"];