diff --git a/hosts/vali/mars/awesome/awesome.nix b/hosts/vali/mars/awesome/awesome.nix new file mode 100644 index 0000000..b9c2f20 --- /dev/null +++ b/hosts/vali/mars/awesome/awesome.nix @@ -0,0 +1,23 @@ +{ pkgs, lib, config, callPackage, ... }: +with lib; let + username = config.modules.other.system.username; + cfg = config.modules.programs.awesome; +in { + options.modules.programs.dwm.enable = mkEnableOption "awesome"; + + config = mkIf cfg.enable { + services.xserver = { + enable = true; + layout = "de, de"; + xkbVariant = ",neo "; + xkbOptions = "grp:alt_space_toggle"; + windowManager.awesome = { + enable = true; + }; + displayManager = { + sddm.enable = true; + setupCommands = "${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1"; + }; + }; + }; +} diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index 55ac9b4..a2a90da 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -56,6 +56,7 @@ mpv.enable = true; kitty.enable = true; dwm.enable = true; + awesome.enable = true; newsboat.enable = true; #git = { # enable = true; diff --git a/hosts/vali/mars/default.nix b/hosts/vali/mars/default.nix index acef5b9..c1106bb 100644 --- a/hosts/vali/mars/default.nix +++ b/hosts/vali/mars/default.nix @@ -6,6 +6,7 @@ _: { ./profile.nix ./i3 ./dwm/dwm.nix + ./awesome/awesome.nix ]; } diff --git a/hosts/vali/mars/dwm/dwm.nix b/hosts/vali/mars/dwm/dwm.nix index bc7670e..3de5554 100644 --- a/hosts/vali/mars/dwm/dwm.nix +++ b/hosts/vali/mars/dwm/dwm.nix @@ -1,9 +1,9 @@ { pkgs, lib, config, callPackage, ... }: with lib; let username = config.modules.other.system.username; - cfg = config.modules.programs.dwm; + cfg = config.modules.programs.awesome; in { - options.modules.programs.dwm.enable = mkEnableOption "dwm"; + options.modules.programs.awesome.enable = mkEnableOption "awesome"; config = mkIf cfg.enable { services.xserver = { @@ -11,7 +11,7 @@ in { layout = "de, de"; xkbVariant = ",neo "; xkbOptions = "grp:alt_space_toggle"; - windowManager.dwm = { + windowManager.awesome= { enable = true; }; displayManager = { @@ -19,14 +19,5 @@ in { setupCommands = "${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1"; }; }; - nixpkgs.overlays = [ - (final: prev: { - dwm = prev.dwm.overrideAttrs (old: {src = ./dwm-6.5;}); - dmenu = prev.dmenu.overrideAttrs (old: {src = ./dmenu-5.3;}); - }) - ]; - environment.systemPackages = with pkgs; [ - # (dmenu.overrideAttrs (oldAttrs: rec { src = ./dmenu-5.3; })) - ]; }; } diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix index 9c50ac6..338b094 100644 --- a/hosts/vali/mars/programs.nix +++ b/hosts/vali/mars/programs.nix @@ -6,9 +6,11 @@ in { environment.systemPackages = with pkgs; [ alacritty alsa-utils + android-tools asciinema bibata-cursors blanket + blugon dig dmenu easyeffects @@ -47,15 +49,16 @@ in { networkmanagerapplet nextcloud-client nicotine-plus + nitrogen pamixer pavucontrol + picom pcmanfm pdfarranger pfetch playerctl polkit python3 - python311Packages.pygame qbittorrent ripgrep rustdesk @@ -65,9 +68,11 @@ in { signal-desktop-beta smartmontools spotube + steam strawberry telegram-desktop texliveFull + trilium-desktop thunderbird tor-browser-bundle-bin trash-cli @@ -84,6 +89,7 @@ in { xorg.libX11.dev xorg.libXft xorg.libXinerama + xournalpp yt-dlp zathura zip