reescribe configuración de desktop

This commit is contained in:
Fabián Montero 2022-08-05 21:15:35 -06:00
parent 46a4ae95ff
commit 93b4bc06af
8 changed files with 108 additions and 262 deletions

View file

@ -5,7 +5,7 @@
nixpkgs.overlays = [ self.overlay ];
imports = [ ./steam ];
imports = [ ./steam ./desktop ];
home = {
stateVersion = "21.11"; # No tocar esto
@ -21,6 +21,10 @@
keeps = { gcKeep ? [] }: concatStringsSep "\n" (map toString gcKeep);
in keeps (import ../shenvs/config.nix pkgs.local.shenvs);
};
keyboard = {
layout = "us,latam";
options = [ "grp:alt_shift_toggle" ];
};
};
systemd.user.tmpfiles.rules = [
@ -34,13 +38,6 @@
nix.registry."nixpkgs".flake = nixpkgs;
xsession.enable = true;
xsession.windowManager.i3 = {
enable = true;
package = pkgs.i3-gaps;
extraConfig = import ./i3/default.nix pkgs;
};
nixpkgs.config.allowUnfree = true;
programs.home-manager.enable = true;
@ -74,27 +71,8 @@
'';
};
services.betterlockscreen = {
enable = true;
# confiugrar luego
};
# configurable = [ neovim keyboardlayout pulsaudio rofi ];
services.picom = {
enable = true;
};
services.polybar = {
enable = true;
script = import ./i3/polybar/launch.sh.nix;
extraConfig = import ./i3/polybar/config.nix;
};
services.dunst = {
enable = true;
};
programs.vscode = {
enable = true;
package = pkgs.vscodium;
@ -126,6 +104,5 @@
};
programs.steam.enable = true;
}

40
home/desktop/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ config, pkgs, lib, ... }: with lib; {
imports = [ ./i3.nix ];
xsession.enable = true;
services.picom = {
enable = true;
};
services.polybar = {
enable = true;
script = import ./polybar/launch.sh.nix;
extraConfig = import ./polybar/config.nix;
};
services.dunst = {
enable = true;
};
services.betterlockscreen = {
enable = true;
};
xdg.mimeApps = {
enable = true;
defaultApplications = {
"application/pdf" = [ "okular.desktop" ];
"application/x-extension-htm" = [ "firefox.desktop" ];
"application/x-extension-html" = [ "firefox.desktop" ];
"application/x-extension-shtml" = [ "firefox.desktop" ];
"application/x-extension-xht" = [ "firefox.desktop" ];
"application/x-extension-xhtml" = [ "firefox.desktop" ];
"application/xhtml+xml" = [ "firefox.desktop" ];
"text/html" = [ "firefox.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ];
};
};
}

62
home/desktop/i3.nix Normal file
View file

@ -0,0 +1,62 @@
{ config, pkgs, lib, ... }: with lib; {
xsession.windowManager.i3 = {
enable = true;
package = pkgs.i3-gaps;
config = let
mod = "Mod4";
in {
modifier = mod;
# revisar luego si config.bars tiene un default danino
fonts = {
names = [ "JetBrains Mono" ];
style = "Regular";
size = 8.0;
};
gaps = {
inner = 10;
outer = -10;
};
# mkOptionDefault hace que se ponga la config por default
# y se sobreescriba las cosas que pongo acA
# NO QUITARLO. ver man home-configuration.nix
keybindings = mkOptionDefault {
"${mod}+Return" = "exec ${pkgs.kitty}/bin/kitty ${pkgs.tmux}/bin/tmux";
"${mod}+Tab" = "focus right";
"${mod}+Shift+Tab" = "focus left";
"${mod}+Shift+s" = "exec ${pkgs.maim}/bin/maim -s -u | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png -i";
};
# menu = "${pkgs.dmenu}/bin/dmenu_run"
startup = [
{
command = "${pkgs.xss-lock}/bin/xss-lock --transfer-sleep-lock -- ${pkgs.i3lock}/bin/i3lock --nofork";
notification = false;
}
{
command = "${pkgs.networkmanagerapplet}/bin/nm-applet";
notification = false;
}
{
command = "${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-0 --primary --mode 1920x1080 --rate 143.85 --pos 0x0 --rotate normal --output DisplayPort-1 --mode 1920x1080 --rate 59.94 --pos 1920x0 --rotate normal --output HDMI-A-0 --off --output HDMI-A-1 --off --output DVI-D-0 --off";
notification = false;
always = true;
}
{
command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace $ws1; exec ${pkgs.firefox}/bin/firefox'";
}
{
command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace $ws1; exec ${pkgs.tdesktop}/bin/telegram-desktop'";
}
{
command = "${pkgs.i3-gaps}/bin/i3-msg 'workspace $ws1; exec ${pkgs.signal-desktop}/bin/signal-desktop'";
}
];
};
};
}

View file

@ -1,4 +1,5 @@
''
[colors]
;background = ''${xrdb:color0:#222}
background = #AA000000
background-alt = #00000000

View file

@ -1,200 +0,0 @@
{maim, xclip, callPackage, kitty, tmux, ...}: ''
# See https://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:JetBrains Mono 8
# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
# screen before suspend. Use loginctl lock-session to lock your screen.
exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
# NetworkManager is the most popular way to manage wireless networks on Linux,
# and nm-applet is a desktop environment-independent system tray GUI for it.
exec --no-startup-id nm-applet
# autostart
# exec_always --no-startup-id xrandr --output DisplayPort-0 --primary --mode 1920x1080 --rate 143.85 --pos 0x0 --rotate normal --output DisplayPort-1 --mode 1920x1080 --rate 74.92 --pos 1920x0 --rotate normal --output HDMI-A-0 --off --output HDMI-A-1 --off --output DVI-D-0 --off
exec_always --no-startup-id xrandr --output DisplayPort-0 --primary --mode 1920x1080 --rate 143.85 --pos 0x0 --rotate normal --output DisplayPort-1 --off --output HDMI-A-0 --mode 1920x1080 --pos 1920x0 --rotate normal --output HDMI-A-1 --off --output DVI-D-0 --off
exec_always --no-startup-id compton -b
exec_always --no-startup-id $HOME/nix/home/i3/polybar/launch.sh.nix
exec --no-startup-id ${callPackage ./keyboard.nix {}}/bin/setkeyboard
# exec --no-startup-id ./wallpaper.sh
# exec --no-startup-id dunst -config .config/dunst/dunstrc
# Use pactl to adjust volume in PulseAudio.
set $refresh_i3status killall -SIGUSR1 i3status
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
# start a terminal
bindsym $mod+Return exec ${kitty}/bin/kitty ${tmux}/bin/tmux
# kill focused window
bindsym $mod+Shift+q kill
# Menu
bindsym $mod+d exec rofi -lines 12 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns
# 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
# alternatively, you can also use TAB to change focus, for one handed control
bindsym $mod+Tab focus right
bindsym $mod+Shift+Tab focus left
# move focused window
bindsym $mod+Shift+j move left
bindsym $mod+Shift+k move down
bindsym $mod+Shift+l move up
bindsym $mod+Shift+semicolon 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+d focus child
# scratchpad
# Make the currently focused window a scratchpad
bindsym $mod+Shift+minus move scratchpad
# Show the first scratchpad window
bindsym $mod+minus scratchpad show
# Define names for default workspaces for which we configure key bindings later on.
# We use variables to avoid repeating the names in multiple places.
set $ws1 "1"
set $ws2 "2"
set $ws3 "3"
set $ws4 "4"
set $ws5 "5"
set $ws6 "6"
set $ws7 "7"
set $ws8 "8"
set $ws9 "9"
set $ws10 "10"
# switch to workspace
bindsym $mod+1 workspace number $ws1
bindsym $mod+2 workspace number $ws2
bindsym $mod+3 workspace number $ws3
bindsym $mod+4 workspace number $ws4
bindsym $mod+5 workspace number $ws5
bindsym $mod+6 workspace number $ws6
bindsym $mod+7 workspace number $ws7
bindsym $mod+8 workspace number $ws8
bindsym $mod+9 workspace number $ws9
bindsym $mod+0 workspace number $ws10
# move focused container to workspace
bindsym $mod+Shift+1 move container to workspace number $ws1
bindsym $mod+Shift+2 move container to workspace number $ws2
bindsym $mod+Shift+3 move container to workspace number $ws3
bindsym $mod+Shift+4 move container to workspace number $ws4
bindsym $mod+Shift+5 move container to workspace number $ws5
bindsym $mod+Shift+6 move container to workspace number $ws6
bindsym $mod+Shift+7 move container to workspace number $ws7
bindsym $mod+Shift+8 move container to workspace number $ws8
bindsym $mod+Shift+9 move container to workspace number $ws9
bindsym $mod+Shift+0 move container to workspace number $ws10
# 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)
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 windows width.
# Pressing right will grow the windows width.
# Pressing up will shrink the windows height.
# Pressing down will grow the windows 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 or $mod+r
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym $mod+r mode "default"
}
bindsym $mod+r mode "resize"
# Gaps
for_window [class=".*"] border pixel 0
gaps outer -10
gaps inner 10
# screenshot
bindsym $mod+Shift+s exec ${maim}/bin/maim -s -u | ${xclip}/bin/xclip -selection clipboard -t image/png -i
# 2 screens
workspace $ws1 output DisplayPort-0
# workspace $ws10 output DisplayPort-1
workspace $ws10 output HDMI-A-0
# move workspace to another output
bindsym $mod+Shift+w move workspace to output right
# autostart
exec i3-msg 'workspace $ws1; exec firefox'
exec i3-msg 'workspace $ws2; exec telegram-desktop'
exec i3-msg 'workspace $ws2; exec signal-desktop'
''

View file

@ -1,9 +0,0 @@
{setxkbmap, writeShellApplication, ...}:
writeShellApplication {
name = "setkeyboard";
runtimeInputs = [ setxkbmap ];
text = ''
setxkbmap -layout us,latam
setxkbmap -option 'grp:alt_shift_toggle'
'';
}

View file

@ -1,25 +0,0 @@
#!/bin/bash
set -e
pscircle \
--background-color=1e2226 \
--link-color-min=375143a0 \
--link-color-max=375143 \
--dot-color-min=7c762f \
--dot-color-max=b56e46 \
--tree-font-size=18 \
--tree-font-color=94bfd1 \
--tree-font-face="JetBrains Mono" \
--toplists-row-height=35 \
--toplists-font-size=24 \
--toplists-font-color=C8D2D7 \
--toplists-pid-font-color=7B9098 \
--toplists-font-face="JetBrains Mono" \
--toplists-bar-height=7 \
--toplists-bar-background=444444 \
--toplists-bar-color=7d54dd \
--output=/tmp/pscircle.png
feh --bg-fill --randomize /tmp/pscircle.png