diff --git a/lib/nixos/default.nix b/lib/nixos/default.nix
index 38216598..b38695a0 100644
--- a/lib/nixos/default.nix
+++ b/lib/nixos/default.nix
@@ -38,6 +38,8 @@ inputs.nixpkgs.lib.nixosSystem {
};
}
+ (import ./modules/autorandr.nix)
+
(import ./modules/awesome.nix {
inherit
inputs
@@ -46,9 +48,6 @@ inputs.nixpkgs.lib.nixosSystem {
username
;
})
- (import ./modules/autorandr.nix)
- (import ./modules/gnome.nix)
- # (import ./modules/sway.nix { inherit inputs username; })
configuration
hardwareConfiguration
diff --git a/lib/nixos/home-manager/desktop.nix b/lib/nixos/home-manager/desktop.nix
index 0bcb550b..d8d7a892 100644
--- a/lib/nixos/home-manager/desktop.nix
+++ b/lib/nixos/home-manager/desktop.nix
@@ -7,15 +7,10 @@
{
imports = [
./modules/alacritty.nix
- # ./modules/awesome.nix
./modules/copyq.nix
- ./modules/dunst.nix
./modules/espanso.nix
- ./modules/gtk.nix
./modules/feh.nix
./modules/flameshot.nix
- ./modules/kanshi.nix
- # ./modules/sway.nix
./modules/mpv.nix
];
}
diff --git a/lib/nixos/home-manager/modules/dunst.nix b/lib/nixos/home-manager/modules/dunst.nix
deleted file mode 100644
index 27792de2..00000000
--- a/lib/nixos/home-manager/modules/dunst.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- services.dunst = {
- enable = true;
-
- settings = {
- global = {
- follow = "keyboard";
- };
- };
- };
-}
diff --git a/lib/nixos/home-manager/modules/gtk.nix b/lib/nixos/home-manager/modules/gtk.nix
deleted file mode 100644
index bce482cc..00000000
--- a/lib/nixos/home-manager/modules/gtk.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
- gtk = {
- enable = true;
- theme.package = pkgs.arc-theme;
- theme.name = "Arc-Dark";
- iconTheme.package = pkgs.arc-icon-theme;
- iconTheme.name = "Arc";
- };
-}
diff --git a/lib/nixos/home-manager/modules/kanshi.nix b/lib/nixos/home-manager/modules/kanshi.nix
deleted file mode 100644
index 76559e5f..00000000
--- a/lib/nixos/home-manager/modules/kanshi.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- systemd.user.services.kanshi = {
- serviceConfig = {
- StartLimitBurst = 5;
- StartLimitIntervalSec = 30;
- };
- };
-
- services.kanshi = {
- enable = true;
-
- # swaymsg -t get_outputs
- settings = [
- {
- profile.name = "undocked";
- profile.outputs = [
- {
- criteria = "eDP-1";
- status = "enable";
- mode = "1920x1080";
- position = "0,0";
- }
- ];
- }
- {
- profile.name = "docked";
- profile.outputs = [
- {
- criteria = "eDP-1";
- status = "disable";
- }
-
- {
- criteria = "Samsung Electric Company LU28R55 H4ZRA00128";
- mode = "3840x2160";
- position = "0,0";
- scale = 1.5;
- }
- ];
- }
- ];
- };
-}
diff --git a/lib/nixos/home-manager/modules/sway.nix b/lib/nixos/home-manager/modules/sway.nix
deleted file mode 100644
index bf6ea6a4..00000000
--- a/lib/nixos/home-manager/modules/sway.nix
+++ /dev/null
@@ -1,163 +0,0 @@
-{
- config,
- inputs,
- pkgs,
- ...
-}:
-
-{
- programs.i3status-rust = {
- enable = true;
-
- bars = {
- default = {
- blocks = [
- {
- block = "net";
- format = " $ip ";
- }
- {
- block = "battery";
- format = " $icon $percentage $time ";
- }
- { block = "cpu"; }
- {
- block = "memory";
- format = " $icon $mem_total_used_percents.eng(w:2) ";
- format_alt = " $icon_swap $swap_used_percents.eng(w:2) ";
- }
- {
- block = "disk_space";
- path = "/";
- info_type = "available";
- alert_unit = "GB";
- interval = 20;
- warning = 20.0;
- alert = 10.0;
- format = " $icon $available.eng(w:2) ";
- }
- {
- block = "time";
- interval = 1;
- format = " $timestamp.datetime(f:'%d-%m-%Y %T') ";
- }
- ];
-
- settings = {
- theme = {
- theme = "plain";
- overrides = {
- critical_bg = "#111111";
- good_bg = "#111111";
- good_fg = "#ffffff";
- idle_bg = "#111111";
- idle_fg = "#ffffff";
- info_bg = "#111111";
- info_fg = "#ffffff";
- separator_bg = "#111111";
- warning_bg = "#111111";
- warning_fg = "#ffffff";
- };
- };
- };
- };
- };
- };
-
- wayland.windowManager.sway = {
- enable = true;
- xwayland = true;
-
- config = {
- bars = [
- {
- colors.background = "#111111";
-
- fonts = {
- names = [ "JetBrainsMono Nerd Font Mono" ];
- size = 12.0;
- };
-
- statusCommand = "i3status-rs ~/.config/i3status-rust/config-default.toml";
- trayPadding = 5;
- }
- ];
-
- defaultWorkspace = "workspace number 1";
-
- gaps = {
- inner = 0;
- smartBorders = "on";
- };
-
- input = {
- "*" = {
- xkb_layout = "gb";
- };
-
- "type:touchpad" = {
- dwt = "enabled";
- tap = "enabled";
- };
- };
-
- keybindings =
- 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";
- "${modifier}+Shift+period" = "exec systemctl suspend";
- "${modifier}+Shift+s" = "exec ${pkgs.flameshot}/bin/flameshot gui";
- "${modifier}+Shift+y" = "exec ${pkgs.copyq}/bin/copyq toggle";
- };
-
- menu = "wofi --show run";
- modifier = "Mod4";
-
- output = {
- # "*" = {
- # bg = "~/.config/wallpaper/wallpaper.jpg fill";
- # };
-
- eDP-1 = {
- scale = "1.0";
- };
- };
-
- terminal = "wezterm";
-
- window.border = 3;
- };
-
- extraConfig = ''
- exec_always ${pkgs.kanshi}/bin/kanshi
-
- set $laptop eDP-1
- bindswitch --reload --locked lid:on output $laptop disable
- bindswitch --reload --locked lid:off output $laptop enable
-
- set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock
- exec rm -f $WOBSOCK && mkfifo $WOBSOCK && tail -f $WOBSOCK | wob
-
- bindsym XF86AudioRaiseVolume exec pamixer -ui 2 && pamixer --get-volume > $WOBSOCK
- bindsym XF86AudioLowerVolume exec pamixer -ud 2 && pamixer --get-volume > $WOBSOCK
- bindsym XF86AudioMute exec pamixer --toggle-mute && ( [ "$(pamixer --get-mute)" = "true" ] && echo 0 > $WOBSOCK ) || pamixer --get-volume > $WOBSOCK
-
- # TODO: light?
- bindsym XF86MonBrightnessDown exec brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $WOBSOCK
- bindsym XF86MonBrightnessUp exec brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $WOBSOCK
-
- for_window [app_id="flameshot"] floating enable
- for_window [app_id="pavucontrol"] floating enable
- for_window [class="copyq"] floating enable
- for_window [class="zoom"] floating enable
- # swaymsg -t get_tree
-
- seat seat0 hide_cursor 1000
- seat seat0 hide_cursor when-typing enable
- '';
- };
-}
diff --git a/lib/nixos/modules/gnome.nix b/lib/nixos/modules/gnome.nix
deleted file mode 100644
index a98d0957..00000000
--- a/lib/nixos/modules/gnome.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
- services = {
- displayManager.sddm.enable = true;
-
- xserver.desktopManager.gnome.enable = true;
- };
-
- environment.systemPackages = with pkgs; [ networkmanagerapplet ];
-}
diff --git a/lib/nixos/modules/sway.nix b/lib/nixos/modules/sway.nix
deleted file mode 100644
index a3c69816..00000000
--- a/lib/nixos/modules/sway.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ inputs, username, ... }:
-{ pkgs, ... }:
-{
- services.displayManager.defaultSession = "sway";
-
- programs.sway.enable = true;
-
- xdg.portal = {
- enable = true;
- extraPortals = with pkgs; [ xdg-desktop-portal-wlr ];
- };
-
- home-manager.users.${username} =
- { pkgs, ... }:
- {
- home.sessionVariables = {
- MOZ_ENABLE_WAYLAND = "1";
- MOZ_USE_XINPUT2 = "1";
- QT_QPA_PLATFORM = "wayland";
- SDL_VIDEODRIVER = "wayland";
- XDG_CURRENT_DESKTOP = "sway";
- XDG_SESSION_TYPE = "wayland";
- };
-
- home.packages = with pkgs; [
- i3status
- swaybg
- wdisplays
- wl-clipboard
- wofi
- ];
- };
-}