feat: switch apache to sway

main
mandlm 2023-09-24 21:56:38 +02:00
parent 0ad53ebb02
commit 1f447a4b56
Signed by: mandlm
GPG Key ID: 4AA25D647AA54CC7
15 changed files with 105 additions and 222 deletions

View File

@ -43,31 +43,6 @@
zsh.enable = true; zsh.enable = true;
}; };
services.xserver = {
enable = true;
windowManager.i3.enable = true;
layout = "de";
xkbVariant = "nodeadkeys";
xkbModel = "pc105";
libinput = {
enable = true;
touchpad = {
horizontalScrolling = false;
naturalScrolling = true;
};
};
displayManager = {
defaultSession = "none+i3";
autoLogin = {
enable = true;
user = "mandlm";
};
};
};
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@ -82,14 +57,21 @@
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
(nerdfonts.override { fonts = [ "DejaVuSansMono" "FiraCode" ]; }) (nerdfonts.override { fonts = [ "DejaVuSansMono" "FiraCode" ]; })
font-awesome font-awesome
dejavu_fonts
]; ];
hardware.pulseaudio.enable = true; hardware = {
pulseaudio.enable = true;
hardware.sane = { opengl.enable = true;
sane = {
enable = true; enable = true;
extraBackends = [ pkgs.sane-airscan ]; extraBackends = [ pkgs.sane-airscan ];
}; };
};
security.polkit.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
neovim neovim

View File

@ -53,6 +53,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
./greetd.nix
./users.nix ./users.nix
./machines/apache/configuration.nix ./machines/apache/configuration.nix
./machines/apache/hardware-configuration.nix ./machines/apache/hardware-configuration.nix

19
greetd.nix Normal file
View File

@ -0,0 +1,19 @@
{ config, pkgs, ... }:
{
services.greetd = {
enable = true;
settings = {
default_session.command = ''
${pkgs.greetd.tuigreet}/bin/tuigreet \
--time \
--asterisks \
--user-menu \
--cmd sway
'';
};
};
environment.etc."greetd/environments".text = ''
sway
'';
}

View File

@ -1,136 +0,0 @@
{ config, lib, pkgs, user, ... }:
let
cfg = config.xsession.windowManager.i3;
font.name = "DejaVu Sans Mono";
font.size = 12.0;
in
{
imports = [
./i3status-rust.nix
];
home.file = {
workspaces = {
source = ./workspaces;
target = ".config/i3/workspaces";
recursive = true;
};
wallpapers = {
source = ./wallpapers;
target = ".config/i3/wallpapers";
recursive = true;
};
};
xsession.windowManager.i3 = {
enable = true;
config = {
modifier = "Mod4";
terminal = "${pkgs.kitty}/bin/kitty";
fonts = {
names = [ font.name ];
size = font.size;
};
window = {
titlebar = false;
border = 0;
};
floating = {
titlebar = false;
border = 0;
};
menu = "${pkgs.rofi}/bin/rofi -show drun";
bars = [{
mode = "hide";
position = "top";
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml";
fonts = {
names = [ font.name ];
size = font.size * 1.1;
};
}];
defaultWorkspace = "workspace number 1";
keybindings = lib.mkOptionDefault {
"${cfg.config.modifier}+Shift+o" = "exec xdg-open \"zoommtg://zoom.us/join?action=join&confno=4861587170&pwd=ZVk3aHphcWppY21ONjZOMVh6STN6dz09\"";
"${cfg.config.modifier}+Shift+s" = "exec flameshot gui";
};
startup = [
{ command = "i3-msg 'workspace 1; append_layout ~/.config/i3/workspaces/workspace-1.json'"; }
{ command = "i3-msg 'workspace 2; append_layout ~/.config/i3/workspaces/workspace-2.json'"; }
{ command = "i3-msg 'workspace 4; append_layout ~/.config/i3/workspaces/workspace-4.json'"; }
{ command = "i3-msg 'workspace 5; append_layout ~/.config/i3/workspaces/workspace-5.json'"; }
{ command = "kitty"; notification = false; }
{ command = "firefox"; notification = false; }
{ command = "element-desktop"; notification = false; }
{ command = "keepassxc"; notification = false; }
{ command = "nextcloud"; notification = false; }
{ command = "thunderbird"; notification = false; }
];
assigns = {
"6" = [{ class = "^\.zoom $"; }];
};
};
};
services = {
betterlockscreen = {
enable = true;
arguments = [ "--update /home/mandlm/.config/i3/wallpapers/nix-wallpaper-dracula.png" ];
};
flameshot = {
enable = true;
settings = {
General = {
showStartupLaunchMessage = false;
};
};
};
unclutter.enable = true;
dunst = {
enable = true;
settings = {
global = {
follow = "keyboard";
font = "DejaVu Sans Mono 11";
frame_width = 1;
};
urgency_low = {
frame_color = "#268bd2";
foreground = "#eee8d5";
background = "#002b36";
timeout = 4;
};
urgency_normal = {
frame_color = "#859900";
foreground = "#eee8d5";
background = "#002b36";
timeout = 6;
};
urgency_critical = {
frame_color = "#dc322f";
foreground = "#eee8d5";
background = "#002b36";
timeout = 8;
};
};
};
};
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

View File

@ -1,10 +0,0 @@
// vim:ts=4:sw=4:et
{
"name": "Terminal",
"swallows": [
{
"class": "^kitty$"
}
],
"type": "con"
}

View File

@ -1,10 +0,0 @@
// vim:ts=4:sw=4:et
{
"name": "Element",
"swallows": [
{
"class": "^Element$"
}
],
"type": "con"
}

View File

@ -1,10 +0,0 @@
// vim:ts=4:sw=4:et
{
"name": "Email",
"swallows": [
{
"class": "^thunderbird$"
}
],
"type": "con"
}

View File

@ -1,10 +0,0 @@
// vim:ts=4:sw=4:et
{
"name": "Browser",
"swallows": [
{
"class": "^firefox$"
}
],
"type": "con"
}

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, user, theme, ... }: { theme, ... }:
let let
theme_name = if theme == "light" then "Solarized Light" else "Solarized Dark"; theme_name = if theme == "light" then "Solarized Light" else "Solarized Dark";

View File

@ -1,13 +0,0 @@
{ config, lib, pkgs, user, ... }:
{
programs.rofi = {
enable = true;
font = "DejaVu Sans Mono 12";
terminal = "${pkgs.kitty}/bin/kitty";
extraConfig = {
show-icons = true;
matching = "fuzzy";
};
};
}

View File

@ -0,0 +1,71 @@
{ config, lib, pkgs, user, ... }:
let
font.name = "DejaVu Sans Mono";
font.size = 12.0;
in
{
imports = [
./i3status-rust.nix
];
programs.fuzzel = {
enable = true;
settings = {
main = {
terminal = "${pkgs.kitty}/bin/kitty";
layer = "overlay";
font = "DejaVu Sans Mono:size=10";
};
colors.background = "55000000";
};
};
wayland.windowManager.sway = {
enable = true;
config = rec {
modifier = "Mod4";
terminal = "${pkgs.kitty}/bin/kitty";
input = {
"type:keyboard" = {
xkb_layout = "de";
};
"type:touchpad" = {
natural_scroll = "enabled";
tap = "enabled";
accel_profile = "flat";
dwt = "enabled";
};
};
seat = {
"*" = {
hide_cursor = "1000";
};
};
fonts = {
names = [ font.name ];
size = font.size;
};
bars = [{
mode = "hide";
position = "top";
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml";
fonts = {
names = [ font.name ];
size = font.size;
};
}];
menu = "${pkgs.fuzzel}/bin/fuzzel";
};
extraConfig = ''
'';
};
}

View File

@ -44,8 +44,7 @@
./home-manager/gpg ./home-manager/gpg
./home-manager/zsh.nix ./home-manager/zsh.nix
./home-manager/starship.nix ./home-manager/starship.nix
./home-manager/i3 ./home-manager/sway
./home-manager/rofi.nix
./home-manager/direnv.nix ./home-manager/direnv.nix
./home-manager/bat.nix ./home-manager/bat.nix
]; ];

View File

@ -3,6 +3,6 @@
{ {
networking.hostName = "apache"; networking.hostName = "apache";
boot.loader.grub.enableCryptodisk = true; boot.loader.grub.enableCryptodisk = true;
services.xserver.videoDrivers = [ "intel" "nvidia" ]; # services.xserver.videoDrivers = [ "intel" "nvidia" ];
} }