diff options
Diffstat (limited to 'users')
-rw-r--r-- | users/fcuny/desktop/default.nix | 2 | ||||
-rw-r--r-- | users/fcuny/desktop/wm/bar.nix (renamed from users/fcuny/desktop/sway/i3status.nix) | 3 | ||||
-rw-r--r-- | users/fcuny/desktop/wm/default.nix (renamed from users/fcuny/desktop/sway/default.nix) | 54 | ||||
-rw-r--r-- | users/fcuny/desktop/wm/gammastep.nix (renamed from users/fcuny/desktop/sway/gammastep.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/desktop/wm/launcher.nix (renamed from users/fcuny/desktop/sway/wofi.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/desktop/wm/screenlock.nix (renamed from users/fcuny/desktop/sway/sway-idle.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/desktop/wm/screenshot.nix | 8 |
7 files changed, 25 insertions, 42 deletions
diff --git a/users/fcuny/desktop/default.nix b/users/fcuny/desktop/default.nix index 2b60b3f..c19eb6f 100644 --- a/users/fcuny/desktop/default.nix +++ b/users/fcuny/desktop/default.nix @@ -6,10 +6,10 @@ ./emacs.nix ./gtk.nix ./media - ./sway ./syncthing.nix ./terminal.nix ./trust + ./wm ./xdg.nix ]; diff --git a/users/fcuny/desktop/sway/i3status.nix b/users/fcuny/desktop/wm/bar.nix index 9eb5733..265513d 100644 --- a/users/fcuny/desktop/sway/i3status.nix +++ b/users/fcuny/desktop/wm/bar.nix @@ -18,9 +18,6 @@ format = "{percentage} {time}"; } { - block = "backlight"; - } - { block = "sound"; on_click = "${pkgs.pavucontrol}/bin/pavucontrol"; } diff --git a/users/fcuny/desktop/sway/default.nix b/users/fcuny/desktop/wm/default.nix index 2aa5731..0880b1c 100644 --- a/users/fcuny/desktop/sway/default.nix +++ b/users/fcuny/desktop/wm/default.nix @@ -2,10 +2,11 @@ { imports = [ - ./i3status.nix - ./sway-idle.nix - ./wofi.nix + ./bar.nix ./gammastep.nix + ./launcher.nix + ./screenlock.nix + ./screenshot.nix ]; home.packages = [ @@ -40,43 +41,10 @@ "Source Code Pro" "Font Awesome 5 Free" ]; - size = 9.0; - style = "Bold"; + size = 10.0; }; - extraConfig = '' - position top - ''; + position = "top"; statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml"; - colors = { - background = "#000000"; - statusline = "#88C0D0"; - separator = "#3B4252"; - focusedWorkspace = { - border = "#88C0D0"; - background = "#88C0D0"; - text = "#2E3440"; - }; - activeWorkspace = { - border = "#4C566ADD"; - background = "#4C566ADD"; - text = "#D8DEE9"; - }; - inactiveWorkspace = { - border = "#000000"; - background = "#000000"; - text = "#E5E9F0"; - }; - urgentWorkspace = { - border = "#B48EAD"; - background = "#B48EAD"; - text = "#ECEFF4"; - }; - bindingMode = { - border = "#BF616A"; - background = "#BF616A"; - text = "#E5E9F0"; - }; - }; } ]; fonts = { @@ -90,7 +58,16 @@ "XF86AudioMicMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle"; "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"; "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +5%"; + "${modifier}+s" = "exec ${pkgs.grim}/bin/grim $(xdg-user-dir DOCUMENTS)/screenshots/$(date +'%Y-%m-%d-%H%M%S_screenshot.png')"; + "${modifier}+Shift+s" = "exec ${pkgs.slurp}/bin/slurp | ${pkgs.grim}/bin/grim -g - $(xdg-user-dir DOCUMENTS)/screenshots/$(date +'%Y-%m-%d-%H%M%S_screenshot.png')"; }; + window.commands = [ + # pavucontrol + { + command = "floating enable"; + criteria.app_id = "pavucontrol"; + } + ]; input = { "*" = { "xkb_layout" = "us,fr"; @@ -101,6 +78,7 @@ output = { "*" = { scale = "1.5"; + bg = "#32324b solid_color"; }; # This is for aptos "eDP-1" = { diff --git a/users/fcuny/desktop/sway/gammastep.nix b/users/fcuny/desktop/wm/gammastep.nix index 510cb10..510cb10 100644 --- a/users/fcuny/desktop/sway/gammastep.nix +++ b/users/fcuny/desktop/wm/gammastep.nix diff --git a/users/fcuny/desktop/sway/wofi.nix b/users/fcuny/desktop/wm/launcher.nix index bc69e0d..bc69e0d 100644 --- a/users/fcuny/desktop/sway/wofi.nix +++ b/users/fcuny/desktop/wm/launcher.nix diff --git a/users/fcuny/desktop/sway/sway-idle.nix b/users/fcuny/desktop/wm/screenlock.nix index 24fde8c..24fde8c 100644 --- a/users/fcuny/desktop/sway/sway-idle.nix +++ b/users/fcuny/desktop/wm/screenlock.nix diff --git a/users/fcuny/desktop/wm/screenshot.nix b/users/fcuny/desktop/wm/screenshot.nix new file mode 100644 index 0000000..e396cb7 --- /dev/null +++ b/users/fcuny/desktop/wm/screenshot.nix @@ -0,0 +1,8 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = [ + pkgs.slurp + pkgs.grim + ]; +} |