diff options
Diffstat (limited to '')
| -rw-r--r-- | home/desktop.nix | 105 | ||||
| -rw-r--r-- | home/i3-config.nix | 180 | ||||
| -rw-r--r-- | pkgs/tmux-lift/default.nix | 9 |
3 files changed, 100 insertions, 194 deletions
diff --git a/home/desktop.nix b/home/desktop.nix index 0d19de0..f372a69 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -33,8 +33,6 @@ with lib; { }; }; - i3status-rust.enable = true; - rofi = { enable = true; theme = "DarkBlue"; @@ -73,17 +71,102 @@ with lib; { }; }; - xdg.configFile."i3/config".text = pkgs.callPackage ./i3-config.nix { - inherit (pkgs.local) st tmux-lift; - - i3status-rust = config.programs.i3status-rust.package; - rofi = config.programs.rofi.finalPackage; - }; - xsession = { enable = true; - # Cambiar por windowManager.i3.enable al migrar - windowManager.command = "${pkgs.i3-gaps}/bin/i3"; + + windowManager.i3 = { + enable = true; + package = pkgs.i3-gaps; + + config = { + modifier = "Mod4"; + focus.followMouse = false; + + bars = singleton { + mode = "dock"; + hiddenState = "hide"; + position = "top"; + workspaceButtons = true; + workspaceNumbers = true; + statusCommand = getExe pkgs.i3status; + trayOutput = "primary"; + colors = { + background = "#000000"; + statusline = "#ffffff"; + separator = "#666666"; + focusedWorkspace = { + border = "#4c7899"; + background = "#285577"; + text = "#ffffff"; + }; + activeWorkspace = { + border = "#333333"; + background = "#5f676a"; + text = "#ffffff"; + }; + inactiveWorkspace = { + border = "#333333"; + background = "#222222"; + text = "#888888"; + }; + urgentWorkspace = { + border = "#2f343a"; + background = "#900000"; + text = "#ffffff"; + }; + bindingMode = { + border = "#2f343a"; + background = "#900000"; + text = "#ffffff"; + }; + }; + }; + + fonts = { + size = 11.0; + names = [ "DejaVu Sans Mono" ]; + style = "Bold Semi-Condensed"; + }; + + keybindings = + let + mod = config.xsession.windowManager.i3.config.modifier; + rofi = config.programs.rofi.finalPackage; + + inherit (pkgs.local) st tmux-lift; + in + mkOptionDefault { + "${mod}+a" = "focus parent"; + "${mod}+c" = "focus child"; + "${mod}+d" = "exec --no-startup-id ${getExe rofi} -show run"; + "${mod}+i" = "exec ${getExe pkgs.xcalib} -invert -alter"; + "${mod}+o" = "exec ${getExe pkgs.xautolock} -locknow"; + "${mod}+Return" = "exec ${getExe st} -e ${getExe tmux-lift}"; + "${mod}+Shift+e" = "exec ${getExe pkgs.xorg.setxkbmap} latam"; + "${mod}+Shift+u" = "exec ${getExe pkgs.xorg.setxkbmap} us"; + }; + + startup = [ + { + command = "${getExe pkgs.xautolock} -time 10 -locker '${pkgs.i3lock-color}/bin/i3lock-color -fe -c222222'"; + notification = false; + } + ]; + + window.commands = [ + # (No) Title Bars + { + command = "border pixel 5"; + criteria.class = "^.*"; + } + + { + command = "floating enabled"; + criteria.class = "floating"; + } + ]; + }; + }; }; }; diff --git a/home/i3-config.nix b/home/i3-config.nix deleted file mode 100644 index 88a3d14..0000000 --- a/home/i3-config.nix +++ /dev/null @@ -1,180 +0,0 @@ -{ i3lock-color, i3status-rust, rofi, st, tmux-lift, xautolock, xcalib, xorg }: -'' - # This file has been auto-generated by i3-config-wizard(1).# It will not be overwritten, so edit it as you like. - # - # Should you change your keyboard layout some time, delete - # this file and re-run i3-config-wizard(1). - # - - # i3 config file (v4) - # - # Please see http://i3wm.org/docs/userguide.html for a complete reference! - - set $mod Mod4 - - # Font for window titles. Will also be used by the bar unless a different font - # is used in the bar {} block below. - font pango:monospace 8 - - # This font is widely installed, provides lots of unicode glyphs, right-to-left - # text rendering and scalability on retina/hidpi displays (thanks to pango). - font pango:DejaVu Sans Mono 8 - - # Before i3 v4.8, we used to recommend this one as the default: - # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 - # The font above is very space-efficient, that is, it looks good, sharp and - # clear in small sizes. However, its unicode glyph coverage is limited, the old - # X core fonts rendering does not support right-to-left and this being a bitmap - # font, it doesn’t scale on retina/hidpi displays. - - # Use Mouse+$mod to drag floating windows to their wanted position - floating_modifier $mod - - # start a terminal - bindsym $mod+Return exec ${st}/bin/st -e ${tmux-lift}/bin/lift - - # kill focused window - bindsym $mod+Shift+q kill - - bindsym $mod+d exec --no-startup-id ${rofi}/bin/rofi -show run - - # change focus - bindsym $mod+j focus left - bindsym $mod+k focus down - bindsym $mod+l focus up - bindsym $mod+semicolon focus right - - # alternatively, you can use the cursor keys: - bindsym $mod+Left focus left - bindsym $mod+Down focus down - bindsym $mod+Up focus up - bindsym $mod+Right focus right - - # move focused window - bindsym $mod+Shift+j move left - bindsym $mod+Shift+k move down - bindsym $mod+Shift+l move up - bindsym $mod+Shift+colon move right - - # alternatively, you can use the cursor keys: - bindsym $mod+Shift+Left move left - bindsym $mod+Shift+Down move down - bindsym $mod+Shift+Up move up - bindsym $mod+Shift+Right move right - - # split in horizontal orientation - bindsym $mod+h split h - - # split in vertical orientation - bindsym $mod+v split v - - # enter fullscreen mode for the focused container - bindsym $mod+f fullscreen toggle - - # change container layout (stacked, tabbed, toggle split) - bindsym $mod+s layout stacking - bindsym $mod+w layout tabbed - bindsym $mod+e layout toggle split - - # toggle tiling / floating - bindsym $mod+Shift+space floating toggle - - # change focus between tiling / floating windows - bindsym $mod+space focus mode_toggle - - # focus the parent container - bindsym $mod+a focus parent - - # focus the child container - bindsym $mod+c focus child - - # switch to workspace - bindsym $mod+1 workspace 1 - bindsym $mod+2 workspace 2 - bindsym $mod+3 workspace 3 - bindsym $mod+4 workspace 4 - bindsym $mod+5 workspace 5 - bindsym $mod+6 workspace 6 - bindsym $mod+7 workspace 7 - bindsym $mod+8 workspace 8 - bindsym $mod+9 workspace 9 - bindsym $mod+0 workspace 10 - - # move focused container to workspace - bindsym $mod+Shift+1 move container to workspace 1 - bindsym $mod+Shift+2 move container to workspace 2 - bindsym $mod+Shift+3 move container to workspace 3 - bindsym $mod+Shift+4 move container to workspace 4 - bindsym $mod+Shift+5 move container to workspace 5 - bindsym $mod+Shift+6 move container to workspace 6 - bindsym $mod+Shift+7 move container to workspace 7 - bindsym $mod+Shift+8 move container to workspace 8 - bindsym $mod+Shift+9 move container to workspace 9 - bindsym $mod+Shift+0 move container to workspace 10 - - # Move focus between screens - bindsym $mod+Alt+h focus output left - bindsym $mod+Alt+Left focus output left - bindsym $mod+Alt+l focus output right - bindsym $mod+Alt+Right focus output right - - # reload the configuration file - bindsym $mod+Shift+c reload - # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) - bindsym $mod+Shift+r restart - # exit i3 (logs you out of your X session) (in conflict with latam shortcut) - #bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" - - # resize window (you can also use the mouse for that) - mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym semicolon resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" - } - - bindsym $mod+r mode "resize" - - # Start i3bar to display a workspace bar (plus the system information i3status - # finds out, if available) - bar { - status_command ${i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml - position top - } - - bindsym $mod+Shift+U exec ${xorg.setxkbmap}/bin/setxkbmap us - bindsym $mod+Shift+E exec ${xorg.setxkbmap}/bin/setxkbmap latam - bindsym $mod+I exec ${xcalib}/bin/xcalib -invert -alter - bindsym $mod+O exec ${xautolock}/bin/xautolock -locknow - - focus_follows_mouse no - - gaps inner 0 - gaps outer 0 - smart_gaps on - smart_borders on - - # (No) Title Bars - for_window [class="^.*"] border pixel 5 - - # i3-msg exec --no-startup-id --class floating - for_window [class="floating"] floating enabled - - exec --no-startup-id ${xautolock}/bin/xautolock -time 10 -locker '${i3lock-color}/bin/i3lock-color -fe -c222222' -'' diff --git a/pkgs/tmux-lift/default.nix b/pkgs/tmux-lift/default.nix index e353494..3c86176 100644 --- a/pkgs/tmux-lift/default.nix +++ b/pkgs/tmux-lift/default.nix @@ -1,11 +1,14 @@ -{ stdenv, ... }: stdenv.mkDerivation { +{ stdenv, ... }: +stdenv.mkDerivation { name = "tmux-lift"; version = "1.0.0"; src = ./.; installPhase = '' - mkdir -p $out/bin - cp lift unlift $out/bin + mkdir -p $out/bin + cp lift unlift $out/bin ''; + + meta.mainProgram = "lift"; } |