README

@@ -9,6 +9,7 @@ SHEPHERD SERVICES!
 
 - Mcron: check and fix missing /var/run/tor. And check for battery - launch i3nagbar.
 
+- Check and look through other/pkill9-desktop-config.scm
 - Fix spelling in emacs and make package for norwegian
 - Fix battery alert using i3-nagbar and potentially upowerd through d-bus
 - change or fix "build system" Now is a disaster of manual operations and failing scripts.

config.scm

@@ -6,13 +6,12 @@
  (gnu system)
  (gnu system nss)
  (gnu packages libusb)
+ (gnu packages cups)
  (guix monads)
  (guix store)
  (ice-9 rdelim)
  (srfi srfi-1)
  (linux-libre)
-;; (i3-battery-warning)
-                                        ;(cronjobs)
  )
 
 (use-service-modules
@@ -24,7 +23,7 @@
  ssh linux disk file gnuzilla version-control maths guile crypto gnupg
  password-utils rsync suckless gnome video xdisorg
  terminals ssh image-viewers web-browsers pulseaudio
- tex tor readline adns fontutils gnunet package-management
+ tor readline adns fontutils gnunet package-management
  networking connman lisp cryptsetup fonts python
  bittorrent engineering graphviz shells compression
  gnome enlightenment dns ghostscript kde-frameworks bash backup nfs)
@@ -63,17 +62,17 @@
 ;;       (built-derivations (list script)))
 ;; then, run the script to do a manual backup.
 
-(define (backup-home-job)
+(define backup-home-job
   #~(job '(next-hour '(18))
          #$(backup-home "ton")
          #:user "ton"))
 
 (define battery-check-job
-  #~(job '(next-minute '(5))
-         (use-modules ((i3-battery-warning) #:prefix i3-battery-warning:))
-         "i3-battery-warning:check&react"
-         #:user "ton"
-         "Checks battery and notifies user if power is needed"))
+  #~(job '(next-minute (range 0 60 5))
+         (lambda ()
+           (use-modules ((i3-battery-warning) #:prefix i3-battery-warning:))
+           i3-battery-warning:check&react)
+         #:user "ton"))
 
 (define updatedb-job
   ;; Run 'updatedb' at 3AM every day.  Here we write the
@@ -82,7 +81,8 @@
          (lambda ()
            (execl (string-append #$findutils "/bin/updatedb")
                   "updatedb"
-                  "--prunepaths=/tmp /var/tmp /gnu/store"))))
+                  "--prunepaths=/tmp /var/tmp /gnu/store"))
+         "Updatedb!"))
 
 ;(define tor-socket-check-job
   ;;  Ensure that /var/run/tor/ exists and is owned by tor.
@@ -93,16 +93,7 @@
 ;             (chown "/var/run/tor" "tor" "tor")))))
 ;; Check? WTF!? Switch to python? or BASH? or wat? dis is silly.
 
-(define wake-up-job
-  ;; Run music to wake me up.
-  #~(job "03 45 * * *"
-         (lambda ()
-           (execl (string-append #$mpv "/bin/mpv")
-                  "mpv"
-                  "/home/ton/disk/music/electroswing/*"))))
-
 (define-public %ton-cronjobs (list updatedb-job
-                                   ;;wake-up-job
                                    battery-check-job
                                    ;;backup-home-job ;; <- causes system build to fail...
                                    ))
@@ -136,7 +127,7 @@
   (timezone "Europe/Oslo")
   (locale "en_US.UTF-8")
 
-  (kernel linux-libre-4.14)
+  (kernel linux-libre);-4.14)
 
   (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)
@@ -192,6 +183,8 @@
    (cons*      ;desktop environment scrot is "necessary" for i3lock-fancy
     i3-wm i3status i3lock-fancy scrot hicolor-icon-theme
 
+    libvdpau-va-gl
+
                                         ;useful tools
     avahi zip unzip tmux htop tree mosh mcron
     the-silver-searcher psmisc wget file strace
@@ -205,7 +198,11 @@
     dosfstools nfs-utils    
                                         ; X
     xbindkeys xterm  xmodmap setxkbmap  xclip xkill xbacklight
-    xev xdpyinfo xrdb xrandr xfontsel gs-fonts
+    xev xdpyinfo xrdb xrandr xfontsel
+    gs-fonts font-wqy-zenhei
+    font-wqy-microhei
+    font-adobe-source-han-sans
+    font-inconsolata
 
                                         ; audio
     pulseaudio pulsemixer
@@ -221,7 +218,7 @@
     units gnuplot
 
 					; terminals and emulators
-    st termite xonsh fish bash
+    st termite xonsh fish bash bash-completion
 
                                         ; Networking, crypto & security
     ;;tomb
@@ -238,11 +235,12 @@
                                         ; emacs
     emacs emacs-guix emacs-magit-popup emacs-smart-mode-line
     emacs-rainbow-delimiters emacs-rainbow-identifiers
-    emacs-scheme-complete emacs-neotree emacs-ag flycheck
+    emacs-scheme-complete emacs-neotree emacs-ag emacs-flycheck
     emacs-undo-tree emacs-fill-column-indicator
     emacs-yasnippet emacs-yasnippet-snippets
     emacs-scheme-complete emacs-danneskjold-theme
     geiser guile-2.2 paredit emacs-debbugs
+    emacs-bash-completion
 
     %base-packages))
 
@@ -253,7 +251,10 @@
              (cups-configuration
               (web-interface? #t)
               (browsing? #t)
-              (default-paper-size "a4")))
+              (default-paper-size "a4")
+              (extensions
+               (list cups-filters escpr))))
+
     (service connman-service-type
              (connman-configuration
               (disable-vpn? #f)))
@@ -281,6 +282,11 @@
     (service rpcbind-service-type
              (rpcbind-configuration))
 
+    (extra-special-file "/usr/bin/env"
+                        (file-append coreutils "/bin/env"))
+    (extra-special-file "/usr/bin/bash"
+                        (file-append bash "/bin/bash"))
+    
     ; Because i3lock-fancy is a wrapper around i3lock, this is correct...
     (screen-locker-service i3lock-color "i3lock")
 
@@ -327,10 +333,13 @@
                             (time-action 120)
                             (critical-power-action 'hybrid-sleep)))
 
-;;      (guix-service-type config =>
-;;                         (guix-configuration
-;;                          (inherit config)
-;;                          (extra-options '("--max-jobs=2" "--cores=2"))))
+      (guix-service-type config =>
+                         (guix-configuration
+                          (inherit config)
+                          ;;(substitute-urls '("berlin.guixsd.org"
+                                             ;;%default-substitute-urls))
+                          (extra-options '("--max-jobs=3" "--cores=3"
+                                           "--fallback"))))
       )
 
     ))             ; end services

modules/i3-battery-warning.scm

@@ -1,9 +1,18 @@
+#!/run/current-system/profile/bin/guile -s
+!#
+
 (define-module (i3-battery-warning)
   #:use-module (ice-9 rdelim)
   #:use-module (ice-9 regex)
   #:use-module (ice-9 popen)
   #:use-module (srfi srfi-1))
 
+;; TODO!
+;; Make config file to read values.
+;; Package with guix
+;; Add to mcron jobs as a simple program...
+
+
 (define BAT-WARN-LVL 30)
 (define BAT-ERR-LVL 20)
 
@@ -58,3 +67,5 @@
     (unless pc
       (when (< bp BAT-WARN-LVL)
         (notify-usr bp)))))
+
+(check&react)

modules/linux-libre.scm

@@ -30,6 +30,25 @@
          "mirror://gnu/linux-libre/" version "-gnu/linux-libre-"
          version "-gnu.tar.xz")))
 
+(define-public linux-libre-4.16-ton
+  (let* ((version "4.16"))
+    (package
+      (inherit linux-libre)
+      (name "linux-libre-ton")
+      (version version)
+      (source (origin
+                (method url-fetch)
+                (uri (linux-libre-urls version))
+                (sha256
+                 (base32
+                  "04xrp6dd5wjrv65bps1nl7shf6s49dl4nkshcbwx5mx9l2ayxm2v"))))
+      (native-inputs `(("bison" ,bison)
+                       ("openssl" ,openssl)
+                       ("bc" ,bc)
+                       ("flex" ,flex)
+                       ("libelf" ,libelf)
+                       ,@(package-inputs linux-libre))))))
+
 (define-public linux-libre-4.16-rc7
   (let* ((version "4.16-rc7"))
     (package
@@ -48,3 +67,4 @@
                        ("flex" ,flex)
                        ("libelf" ,libelf)
                        ,@(package-inputs linux-libre))))))
+

modules/ton-haskell.scm

@@ -119,7 +119,7 @@ spaces")
              ("ghc-exceptions" ,ghc-exceptions)
              ("ghc-text" ,ghc-text)
              ("ghc-opengl" ,ghc-opengl)
-             ("ghc-linear" ,ghc-linear)
+;;             ("ghc-linear" ,ghc-linear)
              ("ghc-vector" ,ghc-vector)))
    (synopsis "Haskell sdl2: high- and low-level bindings to the SDL2 library")
    (description "Haskell bindings to the SDL 2 library, in both high-

modules/ton-tull.scm

@@ -3,13 +3,17 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix utils)
+  #:use-module (guix gexp)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system haskell)
   #:use-module (guix build-system trivial)
+  #:use-module (guix build-system python)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages aspell)
   #:use-module (gnu packages tor)
   #:use-module (gnu packages image)
@@ -25,6 +29,7 @@
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages web-browsers)
   #:use-module (gnu packages python)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages logging)
@@ -32,9 +37,22 @@
   #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages crypto)
+  #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages xorg)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xiph)
+  #:use-module (gnu packages upnp)
+  #:use-module (gnu packages audio)
+  #:use-module (gnu packages python-web)
   #:use-module (gnu packages php)
+  #:use-module (gnu packages assembly)
   #:use-module (gnu packages networking)
+  #:use-module (gnu packages wm)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages glib))
 
 (define-public httpd-ton
@@ -178,7 +196,7 @@
       (base32
        "11wi17bh2br1hp8gmq40b1hm5drm6h969505f7432zam3cm8mc8q"))))
    (build-system gnu-build-system)
-   (inputs `(("libpci" ,libpci)
+   (inputs `(("libpciaccess" ,libpciaccess)
              ;; libconfuse - libasound - libaudiofile - eject - zlib
              ("glibc" ,glibc)))
    (synopsis "TODO")
@@ -346,3 +364,257 @@
     (description "")
     (home-page "")
     (license license:mpl2.0)))
+
+(define-public p7zip-nonfree
+  (package
+    (name "p7zip-t")
+    (version "16.02")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/p7zip/p7zip/"
+                                  version "/p7zip_" version
+                                  "_src_all.tar.bz2"))
+              (sha256
+               (base32
+                "07rlwbbgszq8i7m8jh3x6j2w2hc9a72dc7fmqawnqkwlwb00mcjy"))
+              (modules '((guix build utils)))
+              ))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags
+       (list (string-append "DEST_HOME=" (assoc-ref %outputs "out")) "all3")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key system outputs #:allow-other-keys)
+             (invoke "cp"
+                     (let ((system ,(or (%current-target-system)
+                                        (%current-system))))
+                       (cond
+                        ((string-prefix? "x86_64" system)
+                         "makefile.linux_amd64_asm")
+                        ((string-prefix? "i686" system)
+                         "makefile.linux_x86_asm_gcc_4.X")
+                        (else
+                         "makefile.linux_any_cpu_gcc_4.X")))
+                     "makefile.machine")))
+         (replace 'check
+           (lambda _
+             (invoke "make" "test")
+             (invoke "make" "test_7z")
+             (invoke "make" "test_7zr"))))))
+    (inputs
+     (let ((system (or (%current-target-system)
+                       (%current-system))))
+       `(,@(cond ((string-prefix? "x86_64" system)
+                  `(("yasm" ,yasm)))
+                 ((string-prefix? "i686" system)
+                  `(("nasm" ,nasm)))
+                 (else '())))))
+    (home-page "http://p7zip.sourceforge.net/")
+    (synopsis "Command-line file archiver with high compression ratio")
+    (description "p7zip is a command-line port of 7-Zip, a file archiver that
+handles the 7z format which features very high compression ratios.")
+    (license (list license:lgpl2.1+
+                   license:gpl2+
+                   license:public-domain))))
+
+(define-public i3-battery-warning
+  (package
+    (name "i3-battery-warning")
+    (version "0.1")
+    (source (local-file "/home/ton/guixsd/modules/i3-battery-warning.scm"))
+    (build-system trivial-build-system)
+    (propagated-inputs `(("guile" ,guile)))
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let ((out (assoc-ref %outputs "out"))
+               (mkdir out))
+           (copy-tree %build-inputs out)
+           ))))
+    (synopsis "Notifications for low battery")
+    (description "Checks battery levels and shows a warning if it is low.")
+    (home-page "")
+    (license license:gpl3+)))
+
+(define-public qtwebengine
+  (package
+    (name "qtwebengine")
+    (version "5.12.0-beta2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://github.com/qt/archive/v"
+                            version ".tar.gz"))
+        (sha256
+         (base32
+          "1316wcsa2vg9dsbxj0ik0b2bd1h2lbjl243kv0bjxlhjwqbk6llr"))))
+    (build-system cmake-build-system)
+
+    (native-inputs
+     `(
+       ;("perl" ,perl)
+       ("python" ,python)
+       ;("ruby" ,ruby)
+       ;("bison" ,bison)
+       ;("flex" ,flex)
+       ;("gperf" ,gperf)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(
+       ;("icu" ,icu4c)
+       ;("glib" ,glib)
+       ;("gst-plugins-base" ,gst-plugins-base)
+       ;("libjpeg" ,libjpeg)
+       ;("libpng" ,libpng)
+       ;("libwebp" ,libwebp)
+       ;("sqlite" ,sqlite)
+       ;("fontconfig" ,fontconfig)
+       ;("libxrender" ,libxrender)
+       ("qtbase" ,qtbase)
+       ("qttools" ,qttools)
+       ;("qtdeclarative" ,qtdeclarative)
+       ;("qtlocation" ,qtlocation)
+       ;("qtmultimedia" ,qtmultimedia)
+       ;("qtsensors" ,qtsensors)
+       ;("qtwebchannel" ,qtwebchannel)
+       ;("libxml2" ,libxml2)
+       ;("libxslt" ,libxslt)
+       ;("libx11" ,libx11)
+       ;("libxcomposite" ,libxcomposite)
+       ))
+
+    (arguments
+     '(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           ;; Use lrelease to convert TS translation files into QM files.
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (invoke "qmake"
+                     (string-append "PREFIX="
+                                    (assoc-ref outputs "out"))))))))
+    
+    (home-page "")
+    (synopsis "")
+    (description "")
+    (license license:lgpl2.1+)))
+
+(define-public qutebrowser-1.5.1
+  (package
+    ;(inherit qutebrowser)
+    (name "qutebrowser")
+    (version "1.5.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://github.com/" name "/" name
+                                 "archive/v" version ".tar.gz"))
+             (sha256
+              (base32
+               "16q3dd9cffqlmh6c304jn3j8j7zdkwirmysjpaaxdqbg73rqxrjm"))))
+
+    (build-system python-build-system)
+    (native-inputs
+     `(("asciidoc" ,asciidoc)))
+    (inputs
+     `(("python-colorama" ,python-colorama)
+       ("python-cssutils" ,python-cssutils)
+       ("python-jinja2" ,python-jinja2)
+       ("python-markupsafe" ,python-markupsafe)
+       ("python-pygments" ,python-pygments)
+       ("python-pypeg2" ,python-pypeg2)
+       ("python-pyyaml" ,python-pyyaml)
+       ("python-attrs" ,python-attrs)
+       ("python-pyqt" ,python-pyqt)))
+    (propagated-inputs
+       `(("qtwebengine" ,qtwebengine)))
+
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-more
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (app (string-append out "/share/applications"))
+                    (hicolor (string-append out "/share/icons/hicolor")))
+               (invoke "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc")
+               (install-file "doc/qutebrowser.1"
+                             (string-append out "/share/man/man1"))
+
+               (for-each
+                (lambda (i)
+                  (let ((src  (format #f "icons/qutebrowser-~dx~d.png" i i))
+                        (dest (format #f "~a/~dx~d/apps/qutebrowser.png"
+                                      hicolor i i)))
+                    (mkdir-p (dirname dest))
+                    (copy-file src dest)))
+                '(16 24 32 48 64 128 256 512))
+               (install-file "icons/qutebrowser.svg"
+                             (string-append hicolor "/scalable/apps"))
+
+               #t))))))
+    
+    (home-page "https://qutebrowser.org/")
+    (synopsis "Minimal, keyboard-focused, vim-like web browser")
+    (description "qutebrowser is a keyboard-focused browser with a minimal
+GUI.  It is based on PyQt5 and QtWebKit.")
+    (license license:gpl3+)))
+
+
+(define-public openclonk
+  (package
+    (name "openclonk")
+    (version "8.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://github.com/" name "/" name
+                                 "archive/v" version ".tar.gz"))
+             (sha256
+              (base32
+               "01h559yy0409f1m9frz2an9fphmqg0nc8c499bvsvj9l6d3wv87y"))))
+
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("python" ,python)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("zlib" ,zlib)
+       ("libpng" ,libpng)
+       ("glew" ,glew)
+       ("libvorbis" ,libvorbis)
+       ("qtbase" ,qtbase) ;qt-base?
+       ("sdl2" ,sdl2)
+       ("mesa" ,mesa)
+       ("libxrandr" ,libxrandr)
+       ("miniupnpc" ,miniupnpc)
+       ("openal" ,openal)
+       ("libogg" ,libogg)
+       ("freealut" ,freealut)
+       ("freetype" ,freetype)
+       ("tinyxml" ,tinyxml)
+       ("readline" ,readline)
+       ("libjpeg-turbo" ,libjpeg-turbo)))
+    (propagated-inputs
+     `(("mesa-headers" ,mesa-headers)))
+
+    (arguments
+     `(#:configure-flags
+       (list
+        "-DCMAKE_THREAD_PREFER_PTHREAD=TRUE"
+;        (string-append "-DCMAKE_AR="
+;                       (assoc-ref %build-inputs "binutils")
+;                       "/bin/gcc-ar")
+;        (string-append "-DCMAKE_RANLIB="
+;                       (assoc-ref %build-inputs "binutils")
+;                       "/bin/gcc-ranlib")
+        )))
+    
+    (home-page "")
+    (synopsis "")
+    (description "")
+    (license license:isc)))
+

modules/wkhtmltopdf.scm

@@ -12,6 +12,90 @@
   #:use-module (gnu packages qt)
   #:use-module (srfi srfi-1))
 
+(define qt-for-wkhtmltopdf
+  (package
+    (inherit qt-4)
+    (arguments
+     `(#:configure-flags
+       (list
+        "-dbus-linked"
+        "-glib"
+        "-no-separate-debug-info"
+        "-openssl-linked"
+        "-qdbus"
+        "-v"
+        "-confirm-license"
+        "-exceptions"
+        "-fast"
+        "-graphicssystem raster"
+        "-iconv"
+        "-largefile"
+        "-no-3dnow"
+        "-no-accessibility"
+        "-no-audio-backend"
+        "-no-avx"
+        "-no-cups"
+        "-no-dbus"
+        "-no-declarative"
+        "-no-glib"
+        "-no-gstreamer"
+        "-no-gtkstyle"
+        "-no-icu"
+        "-no-javascript-jit"
+        "-no-libmng"
+        "-no-libtiff"
+        "-nomake demos"
+        "-nomake docs"
+        "-nomake examples"
+        "-nomake tests"
+        "-nomake tools"
+        "-nomake translations"
+        "-no-mitshm"
+        "-no-mmx"
+        "-no-multimedia"
+        "-no-nas-sound"
+        "-no-neon"
+        "-no-nis"
+        "-no-opengl"
+        "-no-openvg"
+        "-no-pch"
+        "-no-phonon"
+        "-no-phonon-backend"
+        "-no-qt3support"
+        "-no-rpath"
+        "-no-scripttools"
+        "-no-sm"
+        "-no-sql-ibase"
+        "-no-sql-mysql"
+        "-no-sql-odbc"
+        "-no-sql-psql"
+        "-no-sql-sqlite"
+        "-no-sql-sqlite2"
+        "-no-sse"
+        "-no-sse2"
+        "-no-sse3"
+        "-no-sse4.1"
+        "-no-sse4.2"
+        "-no-ssse3"
+        "-no-stl"
+        "-no-xcursor"
+        "-no-xfixes"
+        "-no-xinerama"
+        "-no-xinput"
+        "-no-xkb"
+        "-no-xrandr"
+        "-no-xshape"
+        "-no-xsync"
+        "-opensource"
+        "-release"
+        "-static"
+        "-system-libjpeg"
+        "-system-libpng"
+        "-system-zlib"
+        "-webkit"
+        "-xmblpatterns"
+        )))))
+
 (define-public wkhtmltopdf
   (package
     (name "wkhtmltopdf")
@@ -27,7 +111,8 @@
     (build-system python-build-system)
     (inputs `(("fontconfig" ,fontconfig)
               ("freetype" ,freetype)
-              ("qtwebkit" ,qtwebkit)
+              ("qt" ,qt-for-wkhtmltopdf)
+              ;;("qtwebkit" ,qtwebkit)
               ("libpng" ,libpng)
               ("zlib" ,zlib)
               ("libjpeg" ,libjpeg)

testing/config-minimal-ton.scm

@@ -1,98 +0,0 @@
-
-(add-to-load-path "/home/ton/guixsd/modules/")
-(setenv "GUIX_PACKAGE_PATH" "/home/ton/guixsd/modules/:$GUIX_PACKAGE_PATH")
-(use-modules
- (gnu)
- (gnu system)
- (gnu system nss)
- (gnu packages libusb)
- (guix monads)
- (guix store)
- (ice-9 rdelim)
- (srfi srfi-1)
-; (linux-nonfree)
- (xf86-input-mtrack)
-; (wkhtmltopdf)
-; (etc-symlinks)
-; (fpm2)
- )
-
-(use-service-modules
- desktop base xorg ssh avahi dbus networking cups mcron virtualization
- web pm)
-
-(use-package-modules
- avahi xorg certs wm code wget admin emacs tmux
- ssh linux disk file gnuzilla version-control maths guile crypto gnupg
- password-utils rsync suckless gnome video xdisorg
- terminals ssh image-viewers web-browsers pulseaudio
- tex tor readline adns fontutils gnunet package-management
- networking connman lisp cryptsetup fonts python
- bittorrent engineering graphviz shells compression
- gnome enlightenment dns ghostscript kde-frameworks bash backup)
-
-(operating-system
-  (host-name "httpd-test")
-  (timezone "Europe/Oslo")
-  (locale "en_US.UTF-8")
-
-  (kernel linux-libre)
-
-  (bootloader (bootloader-configuration
-                (bootloader grub-efi-bootloader)
-                (target "/boot/efi")))
-
-  (swap-devices '())
-  (file-systems (cons* (file-system
-                         (device "root")
-                         (title 'label)
-                         (mount-point "/")
-                         (type "ext4"))
-                       %base-file-systems))
-
-  (issue "Mercury.\n")
-
-  (users (list (user-account
-                (name "ton")
-                (comment "El brownie de casa Merlin")
-                (group "users")
-                (shell #~(string-append #$bash "/bin/bash"))
-                ;;(shell #~(string-append #$fish "/bin/fish"))
-                (supplementary-groups '("wheel" "netdev" "audio" "video"
-                                        "users"
-                                        ))
-                (home-directory "/home/ton"))))
-
-;;; Maybe use or adapt alezost-guile al/places.scm?
-;;; Add visudo check into sudoers-file PROC - patch into GuixSD?
-  (sudoers-file (local-file "/home/ton/guixsd/dotfiles/etc/sudoers"))
-  (hosts-file (local-file "/home/ton/guixsd/dotfiles/etc/hosts"))
-
-  (setuid-programs (cons* #~(string-append #$wireshark "/usr/bin/dumpcap") %setuid-programs))
-
-  (packages
-   (cons*
-                                        ;useful tools
-    tmux htop tree
-    the-silver-searcher psmisc wget file strace
-
-                                        ;for HTTPS access
-    nss-certs
-
-    %base-packages))
-
-  (services
-   (cons*
-    (console-keymap-service "us")
-
-    (service httpd-service-type
-             (httpd-configuration
-              (config
-               (httpd-config-file
-                (server-name "www.example.com")
-                (document-root "/srv/http/www.example.com")))))
-
-    ))             ; end services
-  ;; Allow resolution of '.local' host names with mDNS.
-  (name-service-switch %mdns-host-lookup-nss)
-  )

usr-pkg-manifest.scm

@@ -4,12 +4,12 @@
  (map (compose list specification->package+output)
       '("wcalc" "make" "nss-certs" "xlockmore"
         "netcat" "password-store" "bind:utils"
-        "font-inconsolata" "scrot" "fpm2" "screen-message"
+        "scrot" "fpm2" "screen-message"
         "glibc-locales" "wdiff" "curl" "recutils" "lsof"
         "borg"
 
                                         ; Shell
-        "fish"
+        ;;"fish"
 
                                         ; file browser
         "pcmanfm"
@@ -18,34 +18,44 @@
         "zip" "unzip"
         
                                         ; dev
-        "jupyter" "python-ipython" "elfutils" "direnv" "nss-certs"
-        "git" "git:send-email" "guile-readline"
+        ;"jupyter"
+        "python-ipython" "elfutils" "direnv" "nss-certs"
+        "git" "git:send-email" "guile-readline" "entr"
 
                                         ; security
         "wireshark" "aircrack-ng" "john-the-ripper-jumbo" "gnupg"
 
                                         ; cad
-        "fritzing" "libfive" ;;"librecad"
+        ;;"fritzing" "libfive" "librecad"
 
                                         ; networking
-        "vinagre" "netcat" "sshfs-fuse"
+        ;;"vinagre"
+        "netcat" "sshfs-fuse" "iptables"
 
 
                                         ; virtualization
         ;;"virt-manager"
 
-                                        ; media
-        "mps-youtube" "mpv" "perl-image-exiftool" "ncmpcpp"
-        "mpd" "vlc" "pavucontrol" "ffmpeg" "pulsemixer" "lollypop"
+                                        ; video and audio
+        ;;"mps-youtube"
+        "mpv" "perl-image-exiftool" "ncmpcpp"
+        "mpd" "vlc" "pavucontrol" "ffmpeg" "pulsemixer"
+        "youtube-dl"
+
+                                        ; images
+        ;; "imagemagick"
+        "gimp" "krita" 
 
                                         ; webbrowsing
-        "icecat" "conkeror" "dillo" "qutebrowser" "eolie" "w3m"
+        "icecat" "conkeror" "dillo" "qutebrowser" "w3m" "netsurf"
 
-                                        ; email
+                                        ; email & xmpp/jabber
         "claws-mail" ;"notmuch"
+        "gajim"
 
                                         ; documents & office
-        "ghc-pandoc" "libreoffice" "texlive" ;"scribus" "gimp"
+        "ghc-pandoc" "libreoffice" "texlive"
+
         "aspell" "aspell-dict-no" "aspell-dict-en"
 
                                         ; pdf
@@ -60,10 +70,10 @@
         ;;man-pages is linux userspace manuals
 
                                         ; games
-        "cataclysm-dda:tiles" "crawl-tiles"
+        "cataclysm-dda:tiles" "crawl-tiles" "openmw" "wine"
         ;;"hyperrogue" "minetest" "laby" "manaplus" "angband"
         ;"mars" "kobodeluxe" 
         )))
 
 ;; Maybe split this into two files, one for smaller and more essential
-;; packages and one for bigger and less important packages?
+;; packages and one for bigger and less important packages? But how to merge them?