diff --git a/Dockerfile b/Dockerfile index bef2cb7..8c6d2e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,6 +35,9 @@ RUN locale-gen en_US.UTF-8 RUN apt install -y git RUN apt install -y curl RUN apt install -y zsh +RUN apt install -y sakura +RUN apt install -y vim +RUN apt install -y figlet ENV LC_ALL=en_US.UTF-8 ENV LANG=en_US.UTF-8 @@ -54,5 +57,18 @@ RUN chown -R glass:users /home/glass RUN chmod -R ugo+rw /InfiniteGlass RUN sed -e "s+\(sudo:.*\)+\1glass+g" /etc/group -i RUN sed -e "s+ALL$+NOPASSWD: ALL+g" /etc/sudoers -i +RUN usermod --shell /usr/bin/zsh glass + +USER glass + +RUN cd /home/glass; \ + set -uex; \ + wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh; \ + sh ./install.sh; \ + rm ./install.sh +RUN sed -i 's/robbyrussell/dieter/g' /home/glass/.zshrc +RUN echo "\nfiglet -f slant InfiniteGlass" >> /home/glass/.zshrc + +USER root CMD /InfiniteGlass/scripts/docker-runner.sh diff --git a/glass-config-init/glass_config_init/ghosts.json b/glass-config-init/glass_config_init/ghosts.json index 9db7813..77c0b68 100644 --- a/glass-config-init/glass_config_init/ghosts.json +++ b/glass-config-init/glass_config_init/ghosts.json @@ -50,15 +50,15 @@ "glass-animator": {"command": ["glass-animator"]}, "glass-renderer": {"command": ["glass-renderer"]}, "xkb": {"command": ["setxkbmap", "-model", "pc101", "-layout", "us"]}, - "panelterm": {"command": ["xterm", "-title", "panelterm", "-xrm", "XTerm.vt100.allowTitleOps: false"]} + "panelterm": {"command": ["sakura", "--title", "panelterm", "-x", "/usr/bin/zsh"]} }, "ghosts": { - "(b'xterm', b'XTerm', b'')/b'panelterm'": { + "sakura-sakura-panelterm": { "IG_COORDS": [0.0, "eq://apply($.root.get_geometry).height/apply($.root.get_geometry).width", 1.0, 0.0576171875], "IG_SIZE": ["eq://apply($.root.get_geometry).width", "eq://int(apply($.root.get_geometry).width*0.0576171875)"], "IG_LAYER": "IG_LAYER_OVERLAY", - "WM_CLASS": [{"__jsonclass__": ["string", "xterm"]}, {"__jsonclass__": ["string", "XTerm"]}, {"__jsonclass__": ["string", ""]}], + "WM_CLASS": [{"__jsonclass__": ["string", "sakura"]}, {"__jsonclass__": ["string", "Sakura"]}], "WM_NAME": {"__jsonclass__": ["string", "panelterm"]}, } } diff --git a/glass-theme/glass_theme/shaders/root/fragment.glsl b/glass-theme/glass_theme/shaders/root/fragment.glsl index 46d4662..359327a 100644 --- a/glass-theme/glass_theme/shaders/root/fragment.glsl +++ b/glass-theme/glass_theme/shaders/root/fragment.glsl @@ -8,5 +8,5 @@ in vec2 px_coord; out vec4 fragColor; void main() { - fragColor = vec4(1., 1., 1., 1.); + fragColor = vec4(237. / 255., 139. / 255., 12. / 255., 1.); } diff --git a/scripts/run-in-docker.sh b/scripts/run-in-docker.sh index 132cf83..b947ee4 100755 --- a/scripts/run-in-docker.sh +++ b/scripts/run-in-docker.sh @@ -21,8 +21,6 @@ if [ ! "$(docker ps -a -q -f name=glass)" ]; then -m 2gb \ -ti \ --ipc=host \ - --cap-drop=ALL \ - --security-opt=no-new-privileges \ -v ~/.config/glass:/home/glass/.config/glass \ -v /tmp/.X11-unix:/tmp/.X11-unix \ -v /tmp/.docker.xauth:/tmp/.docker.xauth \