diff options
-rw-r--r-- | users/fcuny/desktop/default.nix | 1 | ||||
-rw-r--r-- | users/fcuny/desktop/sway.nix | 40 | ||||
-rw-r--r-- | users/fcuny/desktop/sway/default.nix | 39 | ||||
-rw-r--r-- | users/fcuny/desktop/sway/wofi.nix | 19 | ||||
-rw-r--r-- | users/fcuny/desktop/wofi.nix | 5 |
5 files changed, 59 insertions, 45 deletions
diff --git a/users/fcuny/desktop/default.nix b/users/fcuny/desktop/default.nix index 65542e8..10eea44 100644 --- a/users/fcuny/desktop/default.nix +++ b/users/fcuny/desktop/default.nix @@ -5,6 +5,7 @@ ./browser.nix ./gtk.nix ./media.nix + ./sway ./terminal.nix ./trust ./xdg.nix diff --git a/users/fcuny/desktop/sway.nix b/users/fcuny/desktop/sway.nix deleted file mode 100644 index 0f1631e..0000000 --- a/users/fcuny/desktop/sway.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imorts = [ - ./swayidle.nix - ./wofi.nix - ] - - home.packages = with pkgs; [ - pavucontrol - wofi - wl-clipboard - wf-recorder - ]; - - home.sessionVariables = { - MOZ_ENABLE_WAYLAND = true; - LIBSEAT_BACKEND = "logind"; - }; - - wayland.windowManager.sway = { - enable = true; - systemdIntegration = true; - wrapperFeatures.gtk = true; - config = rec { - modifier = "Mod4"; - terminal = "${config.programs.alacritty.package}/bin/alacritty"; - menu = "${pkgs.wofi}/bin/wofi -S run"; - }; - defaultWorkspace = "workspace number 1"; - startup = [ - # Initial lock - { command = "${pkgs.swaylock-effects}/bin/swaylock"; } - # Start idle daemon - { command = "${pkgs.swayidle}/bin/swayidle -w"; } - # Start waybar - { command = "${pkgs.waybar}/bin/waybar"; } - ]; - }; -} diff --git a/users/fcuny/desktop/sway/default.nix b/users/fcuny/desktop/sway/default.nix new file mode 100644 index 0000000..d4d9093 --- /dev/null +++ b/users/fcuny/desktop/sway/default.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: + +{ + imorts = [ + ./wofi.nix + ]; + + home.packages = [ + pkgs.pavucontrol + pkgs.wofi + pkgs.wl-clipboard + pkgs.wf-recorder + ]; + + home.sessionVariables = { + MOZ_ENABLE_WAYLAND = true; + LIBSEAT_BACKEND = "logind"; + }; + + wayland.windowManager.sway = { + enable = true; + systemdIntegration = true; + config = rec { + modifier = "Mod4"; + terminal = "${config.programs.alacritty.package}/bin/alacritty"; + menu = "${pkgs.wofi}/bin/wofi -S run"; + defaultWorkspace = "workspace number 1"; + startup = [ + # Initial lock + { command = "${pkgs.swaylock-effects}/bin/swaylock"; } + # Start idle daemon + { command = "${pkgs.swayidle}/bin/swayidle -w"; } + # Start waybar + { command = "${pkgs.waybar}/bin/waybar"; } + ]; + bars = [ ]; + }; + }; +} diff --git a/users/fcuny/desktop/sway/wofi.nix b/users/fcuny/desktop/sway/wofi.nix new file mode 100644 index 0000000..6368a7a --- /dev/null +++ b/users/fcuny/desktop/sway/wofi.nix @@ -0,0 +1,19 @@ +{ pkgs, config, ... }: + +{ + home.packages = with pkgs; [ + wofi + ]; + + xdg.configFile."wofi/config".text = '' + image_size=48 + columns=3 + allow_images=true + insensitive=true + term=${config.wayland.windowManager.sway.config.terminal} + + run-always_parse_args=true + run-cache_file=/dev/null + run-exec_search=true + ''; +} diff --git a/users/fcuny/desktop/wofi.nix b/users/fcuny/desktop/wofi.nix deleted file mode 100644 index efdf3fd..0000000 --- a/users/fcuny/desktop/wofi.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, config, ... }: { - home.packages = with pkgs; [ - wofi - ]; -} |