Fixing stuff with bootstrap and gampo setup

This commit is contained in:
Lucien Cartier-Tilet 2020-02-17 20:28:40 +01:00
parent 95b022c44e
commit e2b8720c44
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
4 changed files with 31 additions and 14 deletions

View File

@ -79,7 +79,7 @@ golangci-lint-bin graphviz htop i3-gaps-rounded-git i3lock-blur i3status \
igdm-bin inetutils j4-dmenu-desktop javascript-typescript-langserver \ igdm-bin inetutils j4-dmenu-desktop javascript-typescript-langserver \
js-beautify jfsutils jmtpfs lastpass-cli less linux-headers lldb logrotate \ js-beautify jfsutils jmtpfs lastpass-cli less linux-headers lldb logrotate \
lvm2 ly meson minted man-db man-pages mpc mpd mpd-rich-presence-discord-git \ lvm2 ly meson minted man-db man-pages mpc mpd mpd-rich-presence-discord-git \
mpv mupdf-tools nano ncdu ncmpcpp nemo-fileroller nemo-preview neofetch neovim \ mpv mupdf-tools nano ncdu ncmpcpp nemo-fileroller nemo-preview neofetch \
netctl networkmanager networkmanager-openvpn nm-connection-editor nnn \ netctl networkmanager networkmanager-openvpn nm-connection-editor nnn \
nodejs-vmd nomacs nordvpn-bin noto-fonts-emoji npm ntfs-3g numlockx openssh \ nodejs-vmd nomacs nordvpn-bin noto-fonts-emoji npm ntfs-3g numlockx openssh \
otf-fandol otf-ipafont p7zip pacman-contrib pandoc-bin pavucontrol pciutils \ otf-fandol otf-ipafont p7zip pacman-contrib pandoc-bin pavucontrol pciutils \
@ -103,7 +103,9 @@ xorg-server xorg-xinit xss-lock xvkbd yaml-language-server-bin yapf
printf "\n# Installing needed packages ##################################################\n\n" printf "\n# Installing needed packages ##################################################\n\n"
sudo pacman -Syu sudo pacman -Syu
yay -S --needed $PACKAGES for pkg in $PACKAGES
yay -S --needed $pkg
end
printf "\n# Tangling org files ##########################################################\n\n" printf "\n# Tangling org files ##########################################################\n\n"
printf "\n\n==== Tangling bin.org\n\n" printf "\n\n==== Tangling bin.org\n\n"
@ -196,7 +198,7 @@ cd polybar_another_battery
go get -u github.com/distatus/battery/cmd/battery go get -u github.com/distatus/battery/cmd/battery
make build make build
ln -s polybar-ab ~/.local/bin/polybar-ab ln -s ~/fromGIT/polybar_another_battery/polybar-ab ~/.local/bin/polybar-ab
printf "\n# Install Reveal.JS ###########################################################\n\n" printf "\n# Install Reveal.JS ###########################################################\n\n"
cd ~/fromGIT cd ~/fromGIT

View File

@ -5,7 +5,7 @@
#+HTML_HEAD_EXTRA: <meta name="description" content="Phundrak's i3 config" /> #+HTML_HEAD_EXTRA: <meta name="description" content="Phundrak's i3 config" />
#+HTML_HEAD_EXTRA: <meta property="og:title" content="Phundrak's i3 config" /> #+HTML_HEAD_EXTRA: <meta property="og:title" content="Phundrak's i3 config" />
#+HTML_HEAD_EXTRA: <meta property="og:description" content="Description of the i3 config file of Phundrak" /> #+HTML_HEAD_EXTRA: <meta property="og:description" content="Description of the i3 config file of Phundrak" />
#+PROPERTY: header-args :noweb yes :exports code :tangle ~/.config/i3/config #+PROPERTY: header-args :noweb yes :exports code :tangle ~/.config/i3/config :comments link
#+PROPERTY: header-args:python :exports none :tangle no #+PROPERTY: header-args:python :exports none :tangle no
#+PROPERTY: header-args:emacs-lisp :exports code :tangle no #+PROPERTY: header-args:emacs-lisp :exports code :tangle no
@ -313,13 +313,24 @@
#+END_SRC #+END_SRC
#+NAME: generate-workspaces #+NAME: generate-workspaces
#+BEGIN_SRC python :var workspaces=assignment-table #+BEGIN_SRC python :var workspaces=assignment-table :cache yes
results = '' results = ''
for line in workspaces: for line in workspaces:
results += 'assign [class="{0}"] {1}\n'.format(line[1],line[2]) results += 'assign [class="{0}"] {1}\n'.format(line[1],line[2])
return results return results
#+END_SRC #+END_SRC
#+RESULTS[bf7a728d0284d143edef023333680052cf1ff328]: generate-workspaces
: assign [class="Emacs"] 2
: assign [class="Chromium"] 3
: assign [class="firefox"] 3
: assign [class="Nemo"] 4
: assign [class="Godot"] 5
: assign [class="Gimp*"] 6
: assign [class="gnome-boxes"] 8
: assign [class="Steam"] 9
: assign [class="discord"] 10
Here is the configuration: Here is the configuration:
#+BEGIN_SRC conf :noweb yes #+BEGIN_SRC conf :noweb yes
<<generate-workspaces()>> <<generate-workspaces()>>
@ -334,7 +345,8 @@
#+NAME: ws10-output-edp1 #+NAME: ws10-output-edp1
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(if (string= system-name "Marpa") (if (string= system-name "Marpa")
"workspace 10 output eDP-1") "workspace 10 output eDP-1"
"")
#+END_SRC #+END_SRC
Now Ill call the above code as a noweb reference that should be executed. Now Ill call the above code as a noweb reference that should be executed.
@ -887,7 +899,7 @@
#+NAME: hostname-screen-management #+NAME: hostname-screen-management
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(cond ((string= system-name "Marpa") "bindsym $mod+Ctrl+p xrandr --output HDMI-1 --mode 1024x768 --right-of eDP-1") (cond ((string= system-name "Marpa") "bindsym $mod+Ctrl+p xrandr --output HDMI-1 --mode 1024x768 --right-of eDP-1")
((string= system-name "Gampo") "bindsym $mod+Ctrl+p xrandr --output VGA1 --mode 1024x768 --right-of LVDS1")) ((string= system-name "gampo") "bindsym $mod+Ctrl+p xrandr --output VGA1 --mode 1024x768 --right-of LVDS1"))
#+END_SRC #+END_SRC
Now, we just have to call this Emacs Lisp code as a noweb reference and Now, we just have to call this Emacs Lisp code as a noweb reference and
@ -920,7 +932,7 @@
| no | redshift-gtk -O 3200 -t 1.0:0.8 | Blue light filter | | no | redshift-gtk -O 3200 -t 1.0:0.8 | Blue light filter |
#+NAME: generate-autolaunch #+NAME: generate-autolaunch
#+BEGIN_SRC python :exports none :tangle no :var table=autolaunch #+BEGIN_SRC python :var table=autolaunch
results = '' results = ''
for line in table: for line in table:
results += 'exec_always ' if line[0] == 'yes' else 'exec ' results += 'exec_always ' if line[0] == 'yes' else 'exec '
@ -933,7 +945,7 @@
policy kit manager if that is the case: policy kit manager if that is the case:
#+NAME: fingerprint-thinkpad #+NAME: fingerprint-thinkpad
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(if (string= system-name "Gampo") (if (string= system-name "gampo")
"exec --no-startup-id /usr/lib/mate-polkit/polkit-mate-authentication-agent-1" "exec --no-startup-id /usr/lib/mate-polkit/polkit-mate-authentication-agent-1"
"") "")
#+END_SRC #+END_SRC

View File

@ -301,7 +301,7 @@
igdm-bin inetutils j4-dmenu-desktop javascript-typescript-langserver \ igdm-bin inetutils j4-dmenu-desktop javascript-typescript-langserver \
js-beautify jfsutils jmtpfs lastpass-cli less linux-headers lldb logrotate \ js-beautify jfsutils jmtpfs lastpass-cli less linux-headers lldb logrotate \
lvm2 ly meson minted man-db man-pages mpc mpd mpd-rich-presence-discord-git \ lvm2 ly meson minted man-db man-pages mpc mpd mpd-rich-presence-discord-git \
mpv mupdf-tools nano ncdu ncmpcpp nemo-fileroller nemo-preview neofetch neovim \ mpv mupdf-tools nano ncdu ncmpcpp nemo-fileroller nemo-preview neofetch \
netctl networkmanager networkmanager-openvpn nm-connection-editor nnn \ netctl networkmanager networkmanager-openvpn nm-connection-editor nnn \
nodejs-vmd nomacs nordvpn-bin noto-fonts-emoji npm ntfs-3g numlockx openssh \ nodejs-vmd nomacs nordvpn-bin noto-fonts-emoji npm ntfs-3g numlockx openssh \
otf-fandol otf-ipafont p7zip pacman-contrib pandoc-bin pavucontrol pciutils \ otf-fandol otf-ipafont p7zip pacman-contrib pandoc-bin pavucontrol pciutils \
@ -323,12 +323,15 @@
x11-ssh-askpass xclip xdg-user-dirs-gtk xfsprogs xorg-apps xorg-drivers \ x11-ssh-askpass xclip xdg-user-dirs-gtk xfsprogs xorg-apps xorg-drivers \
xorg-server xorg-xinit xss-lock xvkbd yaml-language-server-bin yapf xorg-server xorg-xinit xss-lock xvkbd yaml-language-server-bin yapf
#+END_SRC #+END_SRC
These are the minimum I would have in my own installation. You can edit it These are the minimum I would have in my own installation. You can edit it
however you want. Lets install those. however you want. Lets install those.
#+BEGIN_SRC fish #+BEGIN_SRC fish
printf "\n# Installing needed packages ##################################################\n\n" printf "\n# Installing needed packages ##################################################\n\n"
sudo pacman -Syu sudo pacman -Syu
yay -S --needed $PACKAGES for pkg in $PACKAGES
yay -S --needed $pkg
end
#+END_SRC #+END_SRC
** Tangle configuration files from Org files ** Tangle configuration files from Org files
@ -615,7 +618,7 @@
Now, we have our binary, lets symlink it in our local binary directory, Now, we have our binary, lets symlink it in our local binary directory,
=~/.local/bin=. =~/.local/bin=.
#+BEGIN_SRC fish #+BEGIN_SRC fish
ln -s polybar-ab ~/.local/bin/polybar-ab ln -s ~/fromGIT/polybar_another_battery/polybar-ab ~/.local/bin/polybar-ab
#+END_SRC #+END_SRC
*** Reveal.JS *** Reveal.JS

View File

@ -678,7 +678,7 @@
#+NAME: name-wlan-interface #+NAME: name-wlan-interface
#+BEGIN_SRC emacs-lisp :exports code :tangle no #+BEGIN_SRC emacs-lisp :exports code :tangle no
(cond ((string= system-name "Marpa") "wlp8s0") (cond ((string= system-name "Marpa") "wlp8s0")
((string= system-name "Gampo") "wlp3s0")) ((string= system-name "gampo") "wlp3s0"))
#+END_SRC #+END_SRC
#+BEGIN_SRC conf-windows #+BEGIN_SRC conf-windows
@ -715,7 +715,7 @@
#+NAME: name-eth-interface #+NAME: name-eth-interface
#+BEGIN_SRC emacs-lisp :exports code :tangle no #+BEGIN_SRC emacs-lisp :exports code :tangle no
(cond ((string= system-name "Marpa") "enp9s0") (cond ((string= system-name "Marpa") "enp9s0")
((string= system-name "Gampo") "enp0s25")) ((string= system-name "gampo") "enp0s25"))
#+END_SRC #+END_SRC
#+BEGIN_SRC conf-windows #+BEGIN_SRC conf-windows