Merge pull request #5 from kllemen/main

Nekaj sprememb za predmete PPJ, FP in KIRV

roles/KRV-63528/meta/main.yml

@@ -1,7 +1,8 @@
 # Kriptografija in računalniška varnost
-# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
+# Klemen.Klanjscek@fri.uni-lj.si
 # GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
-dependencies:
+
-  - role: sagemath
+# SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
-  - role: jupyter
+# - include_tasks: sagemath.yml
-  - role: openssl
+- include_tasks: jupyter.yml
+- include_tasks: openssl.yml

roles/haskell/tasks/main_win.yml

@@ -1,25 +1,25 @@
-- name: Check Haskell install status
+# - name: Check Haskell install status
-  win_stat:
+#   win_stat:
-    path: C:\ghcup\bin\ghc.exe
+#     path: C:\ghcup\bin\ghc.exe
-  register: file
+#   register: file
 
-- when: not file.stat.exists
+# - when: not file.stat.exists
-  block:
+#   block:
-    - name: Download Haskell
+#     - name: Download Haskell
-      win_get_url:
+#       win_get_url:
-        url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
+#         url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
-        dest: 'C:\'
+#         dest: 'C:\'
-      register: download
+#       register: download
     
-    - name: Install Haskell
+#     - name: Install Haskell
-      win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
+#       win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
 
-    - name: Add Haskell to PATH
+#     - name: Add Haskell to PATH
-      win_path:
+#       win_path:
-        elements:
+#         elements:
-          C:\ghcup\bin
+#           C:\ghcup\bin
 
-    - name: Remove temporary files
+#     - name: Remove temporary files
-      win_file:
+#       win_file:
-        path: "{{ download.dest }}"
+#         path: "{{ download.dest }}"
-        state: absent
+#         state: absent

roles/linroom/tasks/DF-63530.yml

@@ -1,5 +1,5 @@
 # Digitalna forenzika
 # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 # Windows, GNU/Linux, GNS3, VirtualBox
-- include_tasks: GNS3.yml
+- include_tasks: gns3.yml
 - include_tasks: virtualbox.yml

roles/linroom/tasks/GNS3.yml

@@ -1,15 +0,0 @@
-- name: Add GNS3 repository
-  apt_repository:
-    repo: ppa:gns3/ppa
-    state: present
-    update_cache: True
-    validate_certs: False
-- name: Install gns3 server
-  ansible.builtin.apt:
-    name: gns3-server
-    state: latest
-- name: Install gns3 GUI
-  ansible.builtin.apt:
-    name: gns3-gui
-    state: latest
-

roles/linroom/tasks/KPOV-63716.yml

@@ -1,5 +1,5 @@
 # Komunikacijski protokoli in omrežna varnost
 # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 # Windows, GNU/Linux, GNS3, VirtualBox
-- include_tasks: GNS3.yml
+- include_tasks: gns3.yml
 - include_tasks: virtualbox.yml

roles/linroom/tasks/KRV-63528.yml

@@ -1,7 +1,8 @@
 # Kriptografija in računalniška varnost
-# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
+# Klemen.Klanjscek@fri.uni-lj.si
 # GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
 
-- include_tasks: sagemath.yml
+# SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
+# - include_tasks: sagemath.yml
 - include_tasks: jupyter.yml
 - include_tasks: openssl.yml

roles/linroom/tasks/PPJ-63220.yml

@@ -5,7 +5,7 @@
 - include_tasks: vscode.yml
 - include_tasks: ocaml.yml
 - include_tasks: eclipse.yml
-- include_tasks: haskell.yml
 - include_tasks: swi-prolog.yml
 - include_tasks: rlwrap.yml
+- include_tasks: utop.yml
 

roles/linroom/tasks/sagemath.yml

@@ -1,9 +1,10 @@
-- name: Install SageMath
+# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
-  apt:
+# - name: Install SageMath
-    name: sagemath
+#   apt:
-    state: latest
+#     name: sagemath
+#     state: latest
 
-- name: Install SageMath - Jupyter
+# - name: Install SageMath - Jupyter
-  apt:
+#   apt:
-    name: sagemath-jupyter
+#     name: sagemath-jupyter
-    state: latest
+#     state: latest

roles/linroom/tasks/smlnj.yml

@@ -11,3 +11,8 @@
     name: elpa-sml-mode
     state: latest
 
+# - name: Readline for SML
+#   lineinfile:
+#     dest: "$HOME/.bashrc"
+#     line: "alias smlnj='rlwrap sml'"
+#     insertafter: EOF

roles/linroom/tasks/utop.yml

@@ -0,0 +1,4 @@
+- name: Install utop
+  apt:
+    name: utop
+    state: latest

roles/linroom/tasks/vscode_extensions.yml

@@ -1,9 +1,7 @@
 VSCode_Extensions:
   - VisualStudioExptTeam.vscodeintellicode
-  - arthurwang.vsc-prolog
+  - AmauryRabouan.new-vsc-prolog
-  - dramforever.vscode-ghc-simple
   - eamodio.gitlens
-  - justusadam.language-haskell
   - ms-dotnettools.csdevkit # IS-63714
   - ms-python.python
   - ms-vscode.cpptools

roles/sagemath/tasks/main_lin.yml

@@ -1,9 +1,10 @@
-- name: Install SageMath
+# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
-  apt:
+# - name: Install SageMath
-    name: sagemath
+#   apt:
-    state: latest
+#     name: sagemath
+#     state: latest
 
-- name: Install SageMath - Jupyter
+# - name: Install SageMath - Jupyter
-  apt:
+#   apt:
-    name: sagemath-jupyter
+#     name: sagemath-jupyter
-    state: latest
+#     state: latest

roles/sagemath/tasks/main_win.yml

@@ -1 +0,0 @@
-# TODO

roles/vscode/tasks/vscode_extensions.yml

@@ -1,16 +1,14 @@
 VSCode_Extensions:
   - VisualStudioExptTeam.vscodeintellicode
-  - arthurwang.vsc-prolog
+  - AmauryRabouan.new-vsc-prolog
-  - dramforever.vscode-ghc-simple
   - eamodio.gitlens
-  - justusadam.language-haskell
   - ms-dotnettools.csdevkit # IS-63714
   - ms-python.python
   - ms-vscode.cpptools
   - franneck94.c-cpp-runner
   - ritwickdey.LiveServer
   - ms-toolsai.jupyter
-  - vscodevim.vim
+  # - vscodevim.vim
   - ocamllabs.ocaml-platform
   - stonebuddha.vscode-better-sml
   - vscode-icons-team.vscode-icons
@@ -22,4 +20,4 @@ VSCode_Extensions:
   - platformio.platformio-ide # ORS-63218
   - stmicroelectronics.stm32-vscode-extension # RA-63703
   - danielpinto8zz6.c-cpp-compile-run
-  - vadimcn.vscode-lldb
+  # - vadimcn.vscode-lldb

roles/winroom/tasks/DF-63530.yml

@@ -1,5 +1,5 @@
 # Digitalna forenzika
 # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 # Windows, GNU/Linux, GNS3, VirtualBox
-- include_tasks: GNS3.yml
+- include_tasks: gns3.yml
 - include_tasks: virtualbox.yml

roles/winroom/tasks/GNS3.yml

@@ -1,4 +0,0 @@
-- name: GNS3 na Windows ne deluje
-  debug:
-    msg: "GNS3 na Windows zaenkrat ne vklapljamo"
-

roles/winroom/tasks/KPOV-63716.yml

@@ -1,5 +1,5 @@
 # Komunikacijski protokoli in omrežna varnost
 # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 # Windows, GNU/Linux, GNS3, VirtualBox
-- include_tasks: GNS3.yml
+- include_tasks: gns.yml
 - include_tasks: virtualbox.yml

roles/winroom/tasks/KRV-63528.yml

@@ -1,7 +0,0 @@
-# Kriptografija in računalniška varnost
-# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
-# GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
-
-- include_tasks: sagemath.yml
-- include_tasks: jupyter.yml
-- include_tasks: openssl.yml

roles/winroom/tasks/PPJ-63220.yml

@@ -1,11 +0,0 @@
-# Principi programskih jezikov
-# Klemen.Klanjscek@fri.uni-lj.si
-# Windows, GNU/Linux, VS Code, Ocaml, Eclipse, Haskell, SWI-Prolog, rlwrap
-
-- include_tasks: vscode.yml
-- include_tasks: ocaml.yml
-- include_tasks: eclipse.yml
-- include_tasks: haskell.yml
-- include_tasks: swi-prolog.yml
-- include_tasks: rlwrap.yml
-

roles/winroom/tasks/all_classes.yml

@@ -13,7 +13,6 @@
 - import_tasks: IVZ-63521.yml
 - import_tasks: KCR-63550.yml
 - import_tasks: KPOV-63716.yml
-- import_tasks: KRV-63528.yml
 - import_tasks: MRO-63257.yml
 - import_tasks: MV-63288.yml
 - import_tasks: NDN-63729.yml
@@ -32,7 +31,6 @@
 - import_tasks: PB-63707.yml
 - import_tasks: PB2-63713.yml
 - import_tasks: PJC-63769.yml
-- import_tasks: PPJ-63220.yml
 - import_tasks: PS-63261.yml
 - import_tasks: PSP-63287.yml
 - import_tasks: PUI-63768.yml

roles/winroom/tasks/haskell.yml

@@ -1,25 +1,25 @@
-- name: Check Haskell install status
+# - name: Check Haskell install status
-  win_stat:
+#   win_stat:
-    path: C:\ghcup\bin\ghc.exe
+#     path: C:\ghcup\bin\ghc.exe
-  register: file
+#   register: file
 
-- when: not file.stat.exists
+# - when: not file.stat.exists
-  block:
+#   block:
-    - name: Download Haskell
+#     - name: Download Haskell
-      win_get_url:
+#       win_get_url:
-        url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
+#         url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
-        dest: 'C:\'
+#         dest: 'C:\'
-      register: download
+#       register: download
     
-    - name: Install Haskell
+#     - name: Install Haskell
-      win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
+#       win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
 
-    - name: Add Haskell to PATH
+#     - name: Add Haskell to PATH
-      win_path:
+#       win_path:
-        elements:
+#         elements:
-          C:\ghcup\bin
+#           C:\ghcup\bin
 
-    - name: Remove temporary files
+#     - name: Remove temporary files
-      win_file:
+#       win_file:
-        path: "{{ download.dest }}"
+#         path: "{{ download.dest }}"
-        state: absent
+#         state: absent

roles/winroom/tasks/openssl.yml

@@ -1,4 +0,0 @@
-# We have it at least in git and msys2 but what the hell.
-- name: Install OpenSSL
-  win_chocolatey:
-    name: openssl

roles/winroom/tasks/sagemath.yml

@@ -1 +0,0 @@
-# TODO

roles/winroom/tasks/vscode_extensions.yml

@@ -1,13 +1,9 @@
 VSCode_Extensions:
   - VisualStudioExptTeam.vscodeintellicode
-  - arthurwang.vsc-prolog
-  - dramforever.vscode-ghc-simple
   - eamodio.gitlens
-  - justusadam.language-haskell
   - ms-dotnettools.csdevkit # IS-63714
   - ms-python.python
   - ms-vscode.cpptools
-  - ocamllabs.ocaml-platform
   - stonebuddha.vscode-better-sml
   - vscode-icons-team.vscode-icons
   - vscjava.vscode-java-pack