From 5dc85e72a002efce36b440a98b17a6c80234a142 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sat, 5 Mar 2022 00:40:32 -0600 Subject: Restructure flake source hierarchy --- alacritty.nix | 64 ---------------- flake.nix | 10 ++- home.nix | 170 ------------------------------------------- home/alacritty.nix | 64 ++++++++++++++++ home/default.nix | 168 ++++++++++++++++++++++++++++++++++++++++++ home/i3-config.nix | 177 +++++++++++++++++++++++++++++++++++++++++++++ home/path.nix | 25 +++++++ home/unfree.nix | 1 + home/zshrc.nix | 49 +++++++++++++ i3-config.nix | 177 --------------------------------------------- path.nix | 25 ------- pkgs.nix | 3 - pkgs/default.nix | 3 + pkgs/tmux-lift/Makefile | 6 ++ pkgs/tmux-lift/default.nix | 11 +++ pkgs/tmux-lift/lift.c | 139 +++++++++++++++++++++++++++++++++++ pkgs/tmux-lift/lift.h | 9 +++ pkgs/tmux-lift/unlift.c | 41 +++++++++++ tmux-lift/Makefile | 6 -- tmux-lift/default.nix | 11 --- tmux-lift/lift.c | 139 ----------------------------------- tmux-lift/lift.h | 9 --- tmux-lift/unlift.c | 41 ----------- unfree.nix | 1 - zshrc.nix | 49 ------------- 25 files changed, 700 insertions(+), 698 deletions(-) delete mode 100644 alacritty.nix delete mode 100644 home.nix create mode 100644 home/alacritty.nix create mode 100644 home/default.nix create mode 100644 home/i3-config.nix create mode 100644 home/path.nix create mode 100644 home/unfree.nix create mode 100644 home/zshrc.nix delete mode 100644 i3-config.nix delete mode 100644 path.nix delete mode 100644 pkgs.nix create mode 100644 pkgs/default.nix create mode 100644 pkgs/tmux-lift/Makefile create mode 100644 pkgs/tmux-lift/default.nix create mode 100644 pkgs/tmux-lift/lift.c create mode 100644 pkgs/tmux-lift/lift.h create mode 100644 pkgs/tmux-lift/unlift.c delete mode 100644 tmux-lift/Makefile delete mode 100644 tmux-lift/default.nix delete mode 100644 tmux-lift/lift.c delete mode 100644 tmux-lift/lift.h delete mode 100644 tmux-lift/unlift.c delete mode 100644 unfree.nix delete mode 100644 zshrc.nix diff --git a/alacritty.nix b/alacritty.nix deleted file mode 100644 index 7a40b67..0000000 --- a/alacritty.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - window = { - decorations = "none"; - dynamic_title = false; - }; - - font = { - normal = { - family = "Hack"; - style = "Regular"; - }; - - bold = { - family = "Hack"; - style = "Bold"; - }; - - italic = { - family = "Hack"; - style = "Italic"; - }; - - bold_italic = { - family = "Hack"; - style = "Bold Italic"; - }; - - size = 17.0; - }; - - colors = { - primary = { - background = "#000000"; - foreground = "#ffffff"; - }; - - selection = { - text = "CellForeground"; - background = "CellForeground"; - }; - - normal = { - black = "#000000"; - red = "#cc6666"; - green = "#b5bd68"; - yellow = "#f0c674"; - blue = "#81a2be"; - magenta = "#b294bb"; - cyan = "#8abeb7"; - white = "#ffffff"; - }; - - bright = { - black = "#000000"; - red = "#d54e53"; - green = "#b9ca4a"; - yellow = "#e7c547"; - blue = "#7aa6da"; - magenta = "#c397d8"; - cyan = "#70c0b1"; - white = "#ffffff"; - }; - }; -} diff --git a/flake.nix b/flake.nix index 7ac20f1..66f48ee 100644 --- a/flake.nix +++ b/flake.nix @@ -11,12 +11,16 @@ nur.url = "github:nix-community/NUR"; }; - outputs = { home-manager, nur, ... }: { + outputs = { self, home-manager, nur, ... }: { + overlay = self: super: { + local = import ./pkgs self.local super; + }; + homeConfigurations."ale@p-user" = home-manager.lib.homeManagerConfiguration { system = "x86_64-linux"; configuration = { - imports = [ ./home.nix ]; - nixpkgs.overlays = [ nur.overlay ]; + imports = [ ./home ]; + nixpkgs.overlays = [ nur.overlay self.overlay ]; }; username = "ale"; diff --git a/home.nix b/home.nix deleted file mode 100644 index c18e3e5..0000000 --- a/home.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ lib, config, pkgs, ... }: let - local = import ./pkgs.nix pkgs; -in { - imports = [ ./unfree.nix ]; - - home = { - # This value determines the Home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new Home Manager release introduces backwards - # incompatible changes. - # - # You can update Home Manager without changing this value. See - # the Home Manager release notes for a list of state version - # changes in each release. - stateVersion = "21.11"; - - username = "ale"; - homeDirectory = "/home/ale"; - - sessionVariables = { - EDITOR = "nvim"; - LESSHISTFILE = "/dev/null"; - }; - - language.base = "es_CR.UTF-8"; - - file = let - symlink = path: { source = config.lib.file.mkOutOfStoreSymlink path; }; - #TODO: No sirve, creo que por readline - devNull = symlink "/dev/null"; - in { - "vtmp" = symlink "/run/user/1000/vtmp"; - ".calc_history" = devNull; - ".units_history" = devNull; - ".xinitrc".text = "exec ${pkgs.i3-gaps}/bin/i3"; - }; - - packages = import ./path.nix { inherit pkgs local; }; - }; - - fonts.fontconfig.enable = true; - - gtk = { - enable = true; - gtk3.bookmarks = [ "file:///home/ale/vtmp" "file:///home/ale/tmp" ]; - - gtk2.extraConfig = '' - gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ - gtk-menu-images=1 - gtk-button-images=1 - ''; - - font = { - package = pkgs.noto-fonts; - name = "Noto Sans Regular"; - #size = 14; <- caga layout de páginas - }; - - theme = { - package = pkgs.materia-theme; - name = "Materia-dark"; - }; - }; - - qt = { - enable = true; - platformTheme = "gtk"; - }; - - xdg = { - enable = true; - configFile = { - "i3/config".text = import ./i3-config.nix { - inherit (pkgs) i3lock-color xautolock; - inherit (pkgs.xorg) setxkbmap; - inherit (local) tmux-lift; - - alacritty = config.programs.alacritty.package; - i3status-rust = config.programs.i3status-rust.package; - rofi = config.programs.rofi.finalPackage; - }; - }; - }; - - systemd.user.tmpfiles.rules = [ - "d %t/vtmp 0700" - ]; - - programs = { - home-manager.enable = true; - - zsh = { - enable = true; - enableAutosuggestions = true; - enableSyntaxHighlighting = true; - initExtra = import ./zshrc.nix { - inherit (pkgs) grml-zsh-config; - }; - }; - - alacritty = { - enable = true; - settings = import ./alacritty.nix; - }; - - firefox = { - enable = true; - - profiles."main.profile" = { - id = 0; - name = "default"; - }; - - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - decentraleyes - darkreader - keepassxc-browser - old-reddit-redirect - privacy-badger - ublock-origin - umatrix - ]; - }; - - git = { - enable = true; - userName = "Alejandro Soto"; - userEmail = "alejandro@34project.org"; - }; - - i3status-rust = { - enable = true; - }; - - neovim = { - enable = true; - withRuby = false; - withPython3 = false; - - extraConfig = '' - set number " Enable line numbering - set relativenumber " Enable relative line numbering - set tabstop=4 " Set tap stop to 4 - set shiftwidth=4 " Set shift width to 4 (same as tabstop) - set viminfo= " No tracking - ''; - }; - - rofi = { - enable = true; - theme = "DarkBlue"; - }; - - tmux = { - enable = true; - aggressiveResize = true; - clock24 = true; - escapeTime = 10; - terminal = "xterm-256color"; - extraConfig = '' - set -g mouse on - set -ga update-environment " LIFT_PID" - set -g set-titles on - set -g renumber-windows on - set -sa terminal-overrides ',xterm-termite:RGB' - set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,} %H:%M %d-%b-%y" - ''; - }; - }; -} diff --git a/home/alacritty.nix b/home/alacritty.nix new file mode 100644 index 0000000..7a40b67 --- /dev/null +++ b/home/alacritty.nix @@ -0,0 +1,64 @@ +{ + window = { + decorations = "none"; + dynamic_title = false; + }; + + font = { + normal = { + family = "Hack"; + style = "Regular"; + }; + + bold = { + family = "Hack"; + style = "Bold"; + }; + + italic = { + family = "Hack"; + style = "Italic"; + }; + + bold_italic = { + family = "Hack"; + style = "Bold Italic"; + }; + + size = 17.0; + }; + + colors = { + primary = { + background = "#000000"; + foreground = "#ffffff"; + }; + + selection = { + text = "CellForeground"; + background = "CellForeground"; + }; + + normal = { + black = "#000000"; + red = "#cc6666"; + green = "#b5bd68"; + yellow = "#f0c674"; + blue = "#81a2be"; + magenta = "#b294bb"; + cyan = "#8abeb7"; + white = "#ffffff"; + }; + + bright = { + black = "#000000"; + red = "#d54e53"; + green = "#b9ca4a"; + yellow = "#e7c547"; + blue = "#7aa6da"; + magenta = "#c397d8"; + cyan = "#70c0b1"; + white = "#ffffff"; + }; + }; +} diff --git a/home/default.nix b/home/default.nix new file mode 100644 index 0000000..abd034b --- /dev/null +++ b/home/default.nix @@ -0,0 +1,168 @@ +{ lib, config, pkgs, ... }: { + imports = [ ./unfree.nix ]; + + home = { + # This value determines the Home Manager release that your + # configuration is compatible with. This helps avoid breakage + # when a new Home Manager release introduces backwards + # incompatible changes. + # + # You can update Home Manager without changing this value. See + # the Home Manager release notes for a list of state version + # changes in each release. + stateVersion = "21.11"; + + username = "ale"; + homeDirectory = "/home/ale"; + + sessionVariables = { + EDITOR = "nvim"; + LESSHISTFILE = "/dev/null"; + }; + + language.base = "es_CR.UTF-8"; + + file = let + symlink = path: { source = config.lib.file.mkOutOfStoreSymlink path; }; + #TODO: No sirve, creo que por readline + devNull = symlink "/dev/null"; + in { + "vtmp" = symlink "/run/user/1000/vtmp"; + ".calc_history" = devNull; + ".units_history" = devNull; + ".xinitrc".text = "exec ${pkgs.i3-gaps}/bin/i3"; + }; + + packages = import ./path.nix pkgs; + }; + + fonts.fontconfig.enable = true; + + gtk = { + enable = true; + gtk3.bookmarks = [ "file:///home/ale/vtmp" "file:///home/ale/tmp" ]; + + gtk2.extraConfig = '' + gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ + gtk-menu-images=1 + gtk-button-images=1 + ''; + + font = { + package = pkgs.noto-fonts; + name = "Noto Sans Regular"; + #size = 14; <- caga layout de páginas + }; + + theme = { + package = pkgs.materia-theme; + name = "Materia-dark"; + }; + }; + + qt = { + enable = true; + platformTheme = "gtk"; + }; + + xdg = { + enable = true; + configFile = { + "i3/config".text = import ./i3-config.nix { + inherit (pkgs) i3lock-color xautolock; + inherit (pkgs.xorg) setxkbmap; + inherit (pkgs.local) tmux-lift; + + alacritty = config.programs.alacritty.package; + i3status-rust = config.programs.i3status-rust.package; + rofi = config.programs.rofi.finalPackage; + }; + }; + }; + + systemd.user.tmpfiles.rules = [ + "d %t/vtmp 0700" + ]; + + programs = { + home-manager.enable = true; + + zsh = { + enable = true; + enableAutosuggestions = true; + enableSyntaxHighlighting = true; + initExtra = import ./zshrc.nix { + inherit (pkgs) grml-zsh-config; + }; + }; + + alacritty = { + enable = true; + settings = import ./alacritty.nix; + }; + + firefox = { + enable = true; + + profiles."main.profile" = { + id = 0; + name = "default"; + }; + + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + decentraleyes + darkreader + keepassxc-browser + old-reddit-redirect + privacy-badger + ublock-origin + umatrix + ]; + }; + + git = { + enable = true; + userName = "Alejandro Soto"; + userEmail = "alejandro@34project.org"; + }; + + i3status-rust = { + enable = true; + }; + + neovim = { + enable = true; + withRuby = false; + withPython3 = false; + + extraConfig = '' + set number " Enable line numbering + set relativenumber " Enable relative line numbering + set tabstop=4 " Set tap stop to 4 + set shiftwidth=4 " Set shift width to 4 (same as tabstop) + set viminfo= " No tracking + ''; + }; + + rofi = { + enable = true; + theme = "DarkBlue"; + }; + + tmux = { + enable = true; + aggressiveResize = true; + clock24 = true; + escapeTime = 10; + terminal = "xterm-256color"; + extraConfig = '' + set -g mouse on + set -ga update-environment " LIFT_PID" + set -g set-titles on + set -g renumber-windows on + set -sa terminal-overrides ',xterm-termite:RGB' + set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,} %H:%M %d-%b-%y" + ''; + }; + }; +} diff --git a/home/i3-config.nix b/home/i3-config.nix new file mode 100644 index 0000000..846e59a --- /dev/null +++ b/home/i3-config.nix @@ -0,0 +1,177 @@ +{ alacritty, i3lock-color, i3status-rust +, rofi, setxkbmap, tmux-lift, xautolock +}: '' + # 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 ${alacritty}/bin/alacritty -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 + position top + } + + bindsym $mod+Shift+U exec ${setxkbmap}/bin/setxkbmap us + bindsym $mod+Shift+E exec ${setxkbmap}/bin/setxkbmap latam + + 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 + + exec --no-startup-id ${xautolock}/bin/xautolock -time 10 -locker '${i3lock-color}/bin/i3lock-color -fe -c222222' + #exec --no-startup-id /usr/local/bin/platform-graphical-login.sh +'' diff --git a/home/path.nix b/home/path.nix new file mode 100644 index 0000000..31629f5 --- /dev/null +++ b/home/path.nix @@ -0,0 +1,25 @@ +pkgs: let + py = pkgs.python39Packages; +in [ + pkgs.calc + pkgs.cloc + pkgs.file + pkgs.gcc + pkgs.gcc-arm-embedded + pkgs.hack-font + pkgs.i3-gaps + py.ipython + pkgs.jq + pkgs.keepassxc + pkgs.libsForQt5.okular + pkgs.man-pages + pkgs.man-pages-posix + pkgs.pavucontrol + pkgs.rustup + pkgs.signal-desktop + pkgs.tdesktop + pkgs.local.tmux-lift + pkgs.units + pkgs.unzip + pkgs.zip +] diff --git a/home/unfree.nix b/home/unfree.nix new file mode 100644 index 0000000..1bb3788 --- /dev/null +++ b/home/unfree.nix @@ -0,0 +1 @@ +# This file has been lustrated. diff --git a/home/zshrc.nix b/home/zshrc.nix new file mode 100644 index 0000000..134ee5a --- /dev/null +++ b/home/zshrc.nix @@ -0,0 +1,49 @@ +{ grml-zsh-config }: '' + source ${grml-zsh-config}/etc/zsh/zshrc + + #export PATH="$PATH:$HOME/.local/bin:$HOME/System/local/bin:$HOME/System/bin:$HOME/.cargo/bin" + + alias reset='tput reset' + alias reload='exec zsh' + alias py=python + alias py2=python2 + alias py3=python3 + + function spawn() { + if [ ! -x "$(command -v $1)" ]; then + echo "spawn: no such shit: $1" >&2 + return 1 + fi + + $@ >/dev/null 0>&1 2>&1 & + disown + } + + function galias() { + source $HOME/System/dot/git-aliases.zsh + } + + function xseli() { + T=$(mktemp) + $EDITOR -n $T + xsel -b <$T + rm $T + } + + autoload -Uz up-line-or-beginning-search + zle -N up-line-or-beginning-search + autoload -Uz down-line-or-beginning-search + zle -N down-line-or-beginning-search + bindkey '\eOA' up-line-or-beginning-search + bindkey '\e[A' up-line-or-beginning-search + bindkey '\eOB' down-line-or-beginning-search + bindkey '\e[B' down-line-or-beginning-search + + zstyle ':prompt:grml:left:setup' items $([ ''${NO_USERATHOST:-0} -gt 0 ] || echo user at host) path percent + zstyle ':prompt:grml:right:setup' items sad-smiley vcs $([ ''${NO_BATTERY:-0} -gt 0 ] || echo battery) time + zstyle ':prompt:grml:right:items:time' pre ' %F{yellow}' + + unsetopt sharehistory + setopt appendhistory + setopt extendedhistory +'' diff --git a/i3-config.nix b/i3-config.nix deleted file mode 100644 index 846e59a..0000000 --- a/i3-config.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ alacritty, i3lock-color, i3status-rust -, rofi, setxkbmap, tmux-lift, xautolock -}: '' - # 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 ${alacritty}/bin/alacritty -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 - position top - } - - bindsym $mod+Shift+U exec ${setxkbmap}/bin/setxkbmap us - bindsym $mod+Shift+E exec ${setxkbmap}/bin/setxkbmap latam - - 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 - - exec --no-startup-id ${xautolock}/bin/xautolock -time 10 -locker '${i3lock-color}/bin/i3lock-color -fe -c222222' - #exec --no-startup-id /usr/local/bin/platform-graphical-login.sh -'' diff --git a/path.nix b/path.nix deleted file mode 100644 index 016c09a..0000000 --- a/path.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, local }: let - py = pkgs.python39Packages; -in [ - pkgs.calc - pkgs.cloc - pkgs.file - pkgs.gcc - pkgs.gcc-arm-embedded - pkgs.hack-font - pkgs.i3-gaps - py.ipython - pkgs.jq - pkgs.keepassxc - pkgs.libsForQt5.okular - pkgs.man-pages - pkgs.man-pages-posix - pkgs.pavucontrol - pkgs.rustup - pkgs.signal-desktop - pkgs.tdesktop - local.tmux-lift - pkgs.units - pkgs.unzip - pkgs.zip -] diff --git a/pkgs.nix b/pkgs.nix deleted file mode 100644 index 519bd20..0000000 --- a/pkgs.nix +++ /dev/null @@ -1,3 +0,0 @@ -pkgs: { - tmux-lift = pkgs.callPackage ./tmux-lift {}; -} diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..cf752d9 --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,3 @@ +self: super: { + tmux-lift = super.callPackage ./tmux-lift {}; +} diff --git a/pkgs/tmux-lift/Makefile b/pkgs/tmux-lift/Makefile new file mode 100644 index 0000000..eee4dde --- /dev/null +++ b/pkgs/tmux-lift/Makefile @@ -0,0 +1,6 @@ +CFLAGS+=-O3 -s + +all: lift unlift + +%: %.c + $(CC) $(CFLAGS) -o $@ $< diff --git a/pkgs/tmux-lift/default.nix b/pkgs/tmux-lift/default.nix new file mode 100644 index 0000000..9d1adf2 --- /dev/null +++ b/pkgs/tmux-lift/default.nix @@ -0,0 +1,11 @@ +{ stdenv, ... }: stdenv.mkDerivation { + name = "tmux-lift"; + version = "1.0.0"; + + src = ./.; + + installPhase = '' + mkdir -p $out/bin + cp lift unlift $out/bin + ''; +} diff --git a/pkgs/tmux-lift/lift.c b/pkgs/tmux-lift/lift.c new file mode 100644 index 0000000..71d959b --- /dev/null +++ b/pkgs/tmux-lift/lift.c @@ -0,0 +1,139 @@ +#include +#include +#include +#include +#include +#include +#include + + +#include "lift.h" + + +#define STAGES 2 + + +#define FAIL_PAUSE 0x01 +#define FAIL_EXIT 0x02 + + +unsigned failures = 0; +const char* program_name; + + +void fail +( + const char* source, + int mode, + const char* format, + ... +) +{ + va_list args; + va_start( args, format ); + + perror( source ); + if( format != NULL ) + { + fputs( program_name, stderr ); + fputs( ": ", stderr ); + vfprintf( stderr, format, args ); + fputc( '\n', stderr ); + } + + va_end( args ); + + ++failures; + if( failures == STAGES || ( mode & FAIL_PAUSE ) ) + { + pause(); + } + + if( failures == STAGES || ( mode & FAIL_EXIT ) ) + { + exit( EXIT_FAILURE ); + } +} + + +void checked_take_foreground() +{ + signal( SIGTTOU, SIG_IGN ); + if( tcsetpgrp( 0, getpgrp() ) < 0 ) + { + fail( "tcsetpgrp()", FAIL_EXIT, NULL ); + } + + signal( SIGTTOU, SIG_DFL ); +} + + +void checked_exec +( + char *const* command_line +) +{ + execvp( command_line[ 0 ], command_line ); + fail( "execvp()", FAIL_EXIT, "unable to execute %s", command_line[ 0 ] ); +} + + +int main +( + int argc, + char *const argv[] +) +{ + program_name = argv[ 0 ]; + + struct passwd* passwd = getpwuid( getuid() ); + if( passwd == NULL ) + { + fail( "getpwuid()", FAIL_PAUSE | FAIL_EXIT, NULL ); + } + + pid_t pid = fork(); + if( pid < 0 ) + { + fail( "fork()", 0, NULL ); + } else if( pid == 0 ) + { + if( setpgid( 0, 0 ) < 0 ) + { + fail( "setpgid()", FAIL_EXIT, NULL ); + } + + checked_take_foreground(); + + char formatted_pid[ 16 ]; + snprintf( formatted_pid, sizeof formatted_pid, "%d", getpid() ); + + setenv( LIFT_PID_ENV, formatted_pid, 1 ); + checked_exec( argc > 1 ? &argv[ 1 ] : (char *const[]){ DEFAULT_PATH, NULL } ); + } else + { + int status; + pid_t res = wait( &status ); + + checked_take_foreground(); + if( res < 0 ) + { + fail( "wait()", FAIL_PAUSE | FAIL_EXIT, NULL ); + } + + if( WIFEXITED( status ) ) + { + if( status == 0 ) + { + return 0; + } + + fprintf( stderr, "Session unlifted by exit code %d\n", WEXITSTATUS( status ) ); + } else if( WIFSIGNALED( status ) ) + { + fprintf( stderr, "Session unlifted by %s\n", strsignal( WTERMSIG( status ) ) ); + } + } + + checked_exec( (char *const[]){ passwd->pw_shell, NULL } ); +} diff --git a/pkgs/tmux-lift/lift.h b/pkgs/tmux-lift/lift.h new file mode 100644 index 0000000..e09d869 --- /dev/null +++ b/pkgs/tmux-lift/lift.h @@ -0,0 +1,9 @@ +#ifndef LIFT_H +#define LIFT_H + + +#define DEFAULT_PATH "tmux" +#define LIFT_PID_ENV "LIFT_PID" + + +#endif diff --git a/pkgs/tmux-lift/unlift.c b/pkgs/tmux-lift/unlift.c new file mode 100644 index 0000000..d8d3a72 --- /dev/null +++ b/pkgs/tmux-lift/unlift.c @@ -0,0 +1,41 @@ +#include +#include +#include +#include +#include +#include +#include + + +#include "lift.h" + + +int main +( + int argc, + const char* argv[] +) +{ + char* formatted_pid = getenv( LIFT_PID_ENV ); + if( formatted_pid == NULL ) + { + fprintf( stderr, "%s: variable " LIFT_PID_ENV " is not set\n", argv[ 0 ] ); + return EXIT_FAILURE; + } + + char* formatted_end; + long pid = strtol( formatted_pid, &formatted_end, 10 ); + if( *formatted_pid == '\0' || *formatted_end != '\0' ) + { + fprintf( stderr, "%s: invalid value for " LIFT_PID_ENV ": %s\n", argv[ 0 ], formatted_pid ); + return EXIT_FAILURE; + } + + if( kill( (pid_t)pid, SIGTERM ) < 0 ) + { + fprintf( stderr, "kill(%ld): %s\n", pid, strerror( errno ) ); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} diff --git a/tmux-lift/Makefile b/tmux-lift/Makefile deleted file mode 100644 index eee4dde..0000000 --- a/tmux-lift/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -CFLAGS+=-O3 -s - -all: lift unlift - -%: %.c - $(CC) $(CFLAGS) -o $@ $< diff --git a/tmux-lift/default.nix b/tmux-lift/default.nix deleted file mode 100644 index 9d1adf2..0000000 --- a/tmux-lift/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, ... }: stdenv.mkDerivation { - name = "tmux-lift"; - version = "1.0.0"; - - src = ./.; - - installPhase = '' - mkdir -p $out/bin - cp lift unlift $out/bin - ''; -} diff --git a/tmux-lift/lift.c b/tmux-lift/lift.c deleted file mode 100644 index 71d959b..0000000 --- a/tmux-lift/lift.c +++ /dev/null @@ -1,139 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - - -#include "lift.h" - - -#define STAGES 2 - - -#define FAIL_PAUSE 0x01 -#define FAIL_EXIT 0x02 - - -unsigned failures = 0; -const char* program_name; - - -void fail -( - const char* source, - int mode, - const char* format, - ... -) -{ - va_list args; - va_start( args, format ); - - perror( source ); - if( format != NULL ) - { - fputs( program_name, stderr ); - fputs( ": ", stderr ); - vfprintf( stderr, format, args ); - fputc( '\n', stderr ); - } - - va_end( args ); - - ++failures; - if( failures == STAGES || ( mode & FAIL_PAUSE ) ) - { - pause(); - } - - if( failures == STAGES || ( mode & FAIL_EXIT ) ) - { - exit( EXIT_FAILURE ); - } -} - - -void checked_take_foreground() -{ - signal( SIGTTOU, SIG_IGN ); - if( tcsetpgrp( 0, getpgrp() ) < 0 ) - { - fail( "tcsetpgrp()", FAIL_EXIT, NULL ); - } - - signal( SIGTTOU, SIG_DFL ); -} - - -void checked_exec -( - char *const* command_line -) -{ - execvp( command_line[ 0 ], command_line ); - fail( "execvp()", FAIL_EXIT, "unable to execute %s", command_line[ 0 ] ); -} - - -int main -( - int argc, - char *const argv[] -) -{ - program_name = argv[ 0 ]; - - struct passwd* passwd = getpwuid( getuid() ); - if( passwd == NULL ) - { - fail( "getpwuid()", FAIL_PAUSE | FAIL_EXIT, NULL ); - } - - pid_t pid = fork(); - if( pid < 0 ) - { - fail( "fork()", 0, NULL ); - } else if( pid == 0 ) - { - if( setpgid( 0, 0 ) < 0 ) - { - fail( "setpgid()", FAIL_EXIT, NULL ); - } - - checked_take_foreground(); - - char formatted_pid[ 16 ]; - snprintf( formatted_pid, sizeof formatted_pid, "%d", getpid() ); - - setenv( LIFT_PID_ENV, formatted_pid, 1 ); - checked_exec( argc > 1 ? &argv[ 1 ] : (char *const[]){ DEFAULT_PATH, NULL } ); - } else - { - int status; - pid_t res = wait( &status ); - - checked_take_foreground(); - if( res < 0 ) - { - fail( "wait()", FAIL_PAUSE | FAIL_EXIT, NULL ); - } - - if( WIFEXITED( status ) ) - { - if( status == 0 ) - { - return 0; - } - - fprintf( stderr, "Session unlifted by exit code %d\n", WEXITSTATUS( status ) ); - } else if( WIFSIGNALED( status ) ) - { - fprintf( stderr, "Session unlifted by %s\n", strsignal( WTERMSIG( status ) ) ); - } - } - - checked_exec( (char *const[]){ passwd->pw_shell, NULL } ); -} diff --git a/tmux-lift/lift.h b/tmux-lift/lift.h deleted file mode 100644 index e09d869..0000000 --- a/tmux-lift/lift.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LIFT_H -#define LIFT_H - - -#define DEFAULT_PATH "tmux" -#define LIFT_PID_ENV "LIFT_PID" - - -#endif diff --git a/tmux-lift/unlift.c b/tmux-lift/unlift.c deleted file mode 100644 index d8d3a72..0000000 --- a/tmux-lift/unlift.c +++ /dev/null @@ -1,41 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - - -#include "lift.h" - - -int main -( - int argc, - const char* argv[] -) -{ - char* formatted_pid = getenv( LIFT_PID_ENV ); - if( formatted_pid == NULL ) - { - fprintf( stderr, "%s: variable " LIFT_PID_ENV " is not set\n", argv[ 0 ] ); - return EXIT_FAILURE; - } - - char* formatted_end; - long pid = strtol( formatted_pid, &formatted_end, 10 ); - if( *formatted_pid == '\0' || *formatted_end != '\0' ) - { - fprintf( stderr, "%s: invalid value for " LIFT_PID_ENV ": %s\n", argv[ 0 ], formatted_pid ); - return EXIT_FAILURE; - } - - if( kill( (pid_t)pid, SIGTERM ) < 0 ) - { - fprintf( stderr, "kill(%ld): %s\n", pid, strerror( errno ) ); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} diff --git a/unfree.nix b/unfree.nix deleted file mode 100644 index 1bb3788..0000000 --- a/unfree.nix +++ /dev/null @@ -1 +0,0 @@ -# This file has been lustrated. diff --git a/zshrc.nix b/zshrc.nix deleted file mode 100644 index 134ee5a..0000000 --- a/zshrc.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ grml-zsh-config }: '' - source ${grml-zsh-config}/etc/zsh/zshrc - - #export PATH="$PATH:$HOME/.local/bin:$HOME/System/local/bin:$HOME/System/bin:$HOME/.cargo/bin" - - alias reset='tput reset' - alias reload='exec zsh' - alias py=python - alias py2=python2 - alias py3=python3 - - function spawn() { - if [ ! -x "$(command -v $1)" ]; then - echo "spawn: no such shit: $1" >&2 - return 1 - fi - - $@ >/dev/null 0>&1 2>&1 & - disown - } - - function galias() { - source $HOME/System/dot/git-aliases.zsh - } - - function xseli() { - T=$(mktemp) - $EDITOR -n $T - xsel -b <$T - rm $T - } - - autoload -Uz up-line-or-beginning-search - zle -N up-line-or-beginning-search - autoload -Uz down-line-or-beginning-search - zle -N down-line-or-beginning-search - bindkey '\eOA' up-line-or-beginning-search - bindkey '\e[A' up-line-or-beginning-search - bindkey '\eOB' down-line-or-beginning-search - bindkey '\e[B' down-line-or-beginning-search - - zstyle ':prompt:grml:left:setup' items $([ ''${NO_USERATHOST:-0} -gt 0 ] || echo user at host) path percent - zstyle ':prompt:grml:right:setup' items sad-smiley vcs $([ ''${NO_BATTERY:-0} -gt 0 ] || echo battery) time - zstyle ':prompt:grml:right:items:time' pre ' %F{yellow}' - - unsetopt sharehistory - setopt appendhistory - setopt extendedhistory -'' -- cgit v1.2.3