From bf22f31b5ac6b2cb38dd7288ebd8841bb8222c0a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 12 Feb 2025 23:09:47 +0000 Subject: [PATCH] Remove i3 configuration Remove my i3 configuration as I've been using dwm as my daily driver for a few weeks. --- nix/hosts/t490/configuration.nix | 1 - nix/modules/nixos/default.nix | 1 - nix/modules/nixos/i3.nix | 140 ------------------------------- nix/pkgs/default.nix | 1 - nix/pkgs/i3-battery-popup.nix | 23 ----- 5 files changed, 166 deletions(-) delete mode 100644 nix/modules/nixos/i3.nix delete mode 100644 nix/pkgs/i3-battery-popup.nix diff --git a/nix/hosts/t490/configuration.nix b/nix/hosts/t490/configuration.nix index be44923..ce37b14 100644 --- a/nix/hosts/t490/configuration.nix +++ b/nix/hosts/t490/configuration.nix @@ -20,7 +20,6 @@ autorandr.enable = true; dwm.enable = true; gaming.enable = true; - i3.enable = true; thunar.enable = true; peek.enable = true; }; diff --git a/nix/modules/nixos/default.nix b/nix/modules/nixos/default.nix index 7fc8e31..86974cc 100644 --- a/nix/modules/nixos/default.nix +++ b/nix/modules/nixos/default.nix @@ -5,7 +5,6 @@ ./features/gaming.nix ./features/homelab ./fonts.nix - ./i3.nix ./rofi.nix ./rsnapshot.nix ./xbanish.nix diff --git a/nix/modules/nixos/i3.nix b/nix/modules/nixos/i3.nix deleted file mode 100644 index b300f22..0000000 --- a/nix/modules/nixos/i3.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ - config, - inputs, - lib, - pkgs, - username, - ... -}: - -with lib; - -let - modifier = "Mod4"; -in -{ - options.features.desktop.i3.enable = mkEnableOption "Enable i3"; - - config = mkIf config.features.desktop.i3.enable { - services = { - displayManager.ly.enable = true; - - xserver.windowManager.i3 = { - enable = true; - - extraPackages = with pkgs; [ - i3status - i3lock - i3blocks - ]; - }; - }; - - home-manager.users.${username} = { - xsession.windowManager.i3 = { - enable = true; - - config = { - assigns = { - "7" = [ { class = "vlc"; } ]; - "8" = [ { class = "0ad"; } ]; - "9" = [ - { class = "Slack"; } - { class = "discord"; } - ]; - }; - - defaultWorkspace = "workspace number 1"; - - modifier = modifier; - - keybindings = inputs.nixpkgs.lib.mkOptionDefault { - "${modifier}+d" = "exec rofi -show drun"; - - "${modifier}+Shift+b" = "exec ${pkgs.brave}/bin/brave"; - "${modifier}+Shift+f" = "exec ${pkgs.xfce.thunar}/bin/thunar"; - - # Change focus. - "${modifier}+h" = "focus left"; - "${modifier}+j" = "focus down"; - "${modifier}+k" = "focus up"; - "${modifier}+l" = "focus right"; - - # Move focused window. - "${modifier}+Shift+h" = "move left"; - "${modifier}+Shift+j" = "move down"; - "${modifier}+Shift+k" = "move up"; - "${modifier}+Shift+l" = "move right"; - - "${modifier}+Shift+s" = "exec ${pkgs.flameshot}/bin/flameshot gui"; - "${modifier}+Shift+p" = "exec ${pkgs.autorandr}/bin/autorandr --change"; - "${modifier}+Shift+y" = "exec ${pkgs.copyq}/bin/copyq toggle"; - - "XF86AudioRaiseVolume" = "exec pamixer -ui 2 && pamixer --get-volume"; - "XF86AudioLowerVolume" = "exec pamixer -ud 2 && pamixer --get-volume"; - "XF86AudioMute" = - ''exec pamixer --toggle-mute && ( [ "$(pamixer --get-mute)" = "true" ] && echo 0''; - - "XF86MonBrightnessDown" = "exec brightnessctl set 5%- | sed -En 's/.*(([0-9]+)%).*/1/p'"; - "XF86MonBrightnessUp" = "exec brightnessctl set +5% | sed -En 's/.*(([0-9]+)%).*/1/p'"; - }; - - terminal = "alacritty"; - }; - - extraConfig = '' - set $laptop eDP-1 - bindswitch --reload --locked lid:on output $laptop disable - bindswitch --reload --locked lid:off output $laptop enable - - exec_always --no-startup-id caffeine - exec_always --no-startup-id ${pkgs.autorandr}/bin/autorandr --change - exec_always --no-startup-id ${pkgs.i3-battery-popup}/bin/i3-battery-popup -n - - smart_borders on - smart_gaps on - - for_window [class="copyq"] floating enable - for_window [class="zoom"] floating enable - # xprop | grep -i class - ''; - - config = { - bars = [ - { - position = "bottom"; - statusCommand = "${pkgs.i3status}/bin/i3status"; - trayOutput = "none"; - } - ]; - - gaps = { - smartBorders = "on"; - smartGaps = true; - }; - }; - }; - - programs.i3status = { - enable = true; - - general.colors = false; - - modules = { - "battery all".settings.last_full_capacity = true; - - "tztime local".settings.format = "%d-%m-%Y %H:%M:%S"; - cpu_temperature.enable = false; - ipv6.enable = false; - load.enable = false; - }; - }; - - services.dunst = { - enable = true; - - settings.global.follow = "keyboard"; - }; - }; - }; -} diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 48ed2e4..6821efd 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -8,7 +8,6 @@ in { build-glove80 = callPackage ./build-glove80.nix { }; notes = callPackage ./notes { }; - i3-battery-popup = callPackage ./i3-battery-popup.nix { }; tmux-sessionizer = callPackage ./tmux-sessionizer { }; upload-to-files = callPackage ./upload-to-files.nix { }; diff --git a/nix/pkgs/i3-battery-popup.nix b/nix/pkgs/i3-battery-popup.nix deleted file mode 100644 index 82de995..0000000 --- a/nix/pkgs/i3-battery-popup.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, ... }: - -with pkgs; - -stdenv.mkDerivation rec { - pname = "i3-battery-popop"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "rjekker"; - repo = "i3-battery-popup"; - rev = "v${version}"; - sha256 = "s6jZCkB0Z8dtnBG2p1NJIUY1fV4urEp4w6wFzxFNlqg="; - }; - - buildInputs = [ bash ]; - - installPhase = '' - mkdir -p $out/bin - cp $src/i3-battery-popup $out/bin/i3-battery-popup - chmod +x $out/bin/i3-battery-popup - ''; -}