nixos: bumped to HEAD of 22.11

resolves #16

default.nix

@@ -14,6 +14,7 @@ with import ./nix args; {
       cardanoNodeProject.cardano-cli # required for KES key rotation
       niv
       nixopsUnstable # work around for issue #127423
+      tea # Gitea official CLI client
       treefmt # one CLI to format the code tree
     ];
     NIX_PATH = "nixpkgs=${sources.nixpkgs}";

hardware/eeepc701.nix

@@ -64,5 +64,5 @@
   swapDevices = [{device = "/dev/disk/by-label/swap";}];
 
   networking.wireless.enable = true; # Enable wireless via wpa_supplicant.
-  nix.maxJobs = lib.mkDefault 1;
+  nix.settings.max-jobs = lib.mkDefault 1;
 }

hardware/lenovo_x201.nix

@@ -20,7 +20,7 @@
   swapDevices = [{device = "/dev/disk/by-label/swap";}];
 
   hardware.opengl.extraPackages = with pkgs; [vaapiIntel];
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
 
   services.thinkfan = {
     enable = true;

hardware/lenovo_yoga7i.nix

@@ -39,5 +39,5 @@
   ];
 
   hardware.opengl.extraPackages = with pkgs; [vaapiIntel];
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
 }

hardware/linode_vm-encrypted.nix

@@ -50,5 +50,5 @@
 
   swapDevices = [{device = "/dev/disk/by-label/swap";}];
 
-  nix.maxJobs = lib.mkDefault 8;
+  nix.settings.max-jobs = lib.mkDefault 8;
 }

hardware/linode_vm.nix

@@ -35,5 +35,5 @@
 
   swapDevices = [{device = "/dev/sdb";}];
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
 }

hardware/purism_librem_15.nix

@@ -37,5 +37,5 @@
 
   swapDevices = [{device = "/dev/disk/by-uuid/ac308d76-cc12-4a73-83ee-64a2ad07b91e";}];
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
 }

hosts/cuallaidh.nix

@@ -9,8 +9,8 @@
     ../modules/tmate-ssh-server.nix
     ../networks/linode.nix
     ../profiles/coturn.nix
-    ../profiles/cryptpad.nix
-    ../profiles/gitea.nix
+    #../profiles/cryptpad.nix
+    ../profiles/forgejo.nix
     #../profiles/hydra.nix
     ../profiles/iog.nix
     ../profiles/ipv6.nix
@@ -22,7 +22,7 @@
     ../profiles/nixpkgs-dev.nix
     ../profiles/taskserver.nix
     ../profiles/tt-rss.nix
-    ../secrets/gitea.nix
+    ../secrets/forgejo.nix
     ../secrets/tt-rss.nix
   ];
 

hosts/dionach.nix

@@ -82,7 +82,7 @@
     exiftool # A tool to read, write and edit EXIF meta information
     ffmpeg-full # record, convert and stream audio and video
     file
-    firefox
+    librewolf # Firefox fork, focused on privacy, security and freedom
     gcc
     gimp
     gnome2.gvfs
@@ -129,7 +129,6 @@
     tcpdump # tcpdump
     tectonic
     tdesktop # Telegram Desktop messaging app
-    termonad-with-packages
     texlive.combined.scheme-full
     tmate # Instant Terminal Sharing
     tpm-tools
@@ -139,7 +138,6 @@
     unrar
     unzip
     vcsh
-    vgo2nix # Required for packaging Golang applications
     wget
     wesnoth # Turn-based strategy game
     xorg.xev

nix/sources.json

@@ -1,26 +1,26 @@
 {
     "cardano-node": {
-        "branch": "refs/tags/1.35.3",
+        "branch": "refs/tags/1.35.7",
         "description": "The core component that is used to participate in a Cardano decentralised blockchain.",
         "homepage": "https://cardano.org",
         "owner": "input-output-hk",
         "repo": "cardano-node",
-        "rev": "950c4e222086fed5ca53564e642434ce9307b0b9",
-        "sha256": "020fwimsm24yblr1fmnwx240wj8r3x715p89cpjgnnd8axwf32p0",
+        "rev": "f0b4ac897dcbefba9fa0d247b204a24543cf55f6",
+        "sha256": "0s2jkj4mwl03hxg4ff9kyw41s32xbf31rnhag2m1qrglgsh8wzw9",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-node/archive/950c4e222086fed5ca53564e642434ce9307b0b9.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-node/archive/f0b4ac897dcbefba9fa0d247b204a24543cf55f6.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "daedalus": {
-        "branch": "release/4.11.0",
+        "branch": "release/5.2.0",
         "description": "The open source cryptocurrency wallet for ada, built to grow with the community",
         "homepage": "https://daedaluswallet.io/",
         "owner": "input-output-hk",
         "repo": "daedalus",
-        "rev": "478ec558705cebfc660b7b4ebba3aa20c6bfb6b6",
-        "sha256": "124a2v2kjgzlh77f879xbnz2bkgi4vykrqjjcycxh9xyyyfpgfzv",
+        "rev": "2990f5a44189097b3de2e7e7a19caa8062a8ae7b",
+        "sha256": "1w2w7qfashbqimcywzvhh0z5jrlfaja04sgi6p5hp08adwad6r92",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/daedalus/archive/478ec558705cebfc660b7b4ebba3aa20c6bfb6b6.tar.gz",
+        "url": "https://github.com/input-output-hk/daedalus/archive/2990f5a44189097b3de2e7e7a19caa8062a8ae7b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "iohk-nix": {
@@ -68,16 +68,16 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-22.05",
+        "branch": "nixos-22.11",
         "builtin": false,
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9a91318fffec81ad009b73fd3b640d2541d87909",
-        "sha256": "16j9il4a540ihz16dz8bzsxxqwiiyy1i2c1xvs5y7qm9s6v3dr4b",
+        "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b",
+        "sha256": "1fn2yj5hs8jcnlqq63jnz4kqpfbi15gjgsa8grl5wpnhlhzc3dgh",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/9a91318fffec81ad009b73fd3b640d2541d87909.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/c8a17ce7abc03c50cd072e9e6c9b389c5f61836b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgsUnstable": {
@@ -86,10 +86,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c",
-        "sha256": "1jgcsgzvxnc27wby4n7jyp5w67461qm5x519xkpz2h14zbjjndm7",
+        "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
+        "sha256": "0f4f9xh4rkgk9in2hzwm371vahppdixbdb73ki1v5dq1r2iv015h",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/7b9be38c7250b22d829ab6effdee90d5e40c6e5c.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/da45bf6ec7bbcc5d1e14d3795c025199f28e0de0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

profiles/desktopCraige.nix

@@ -16,6 +16,8 @@
     caprine-bin # an elegant Facebook Messenger desktop app
     gopass # password file manager
     shared-mime-info # A database of common MIME types
+    sweethome3d.application # design and visualise homes
+    termonad # Terminal emulator configurable in Haskell
     yt-dlp # Command-line tool to download videos
     whalebird # Mastodon, Pleroma and Misskey client
   ];

profiles/desktop_common.nix

@@ -24,7 +24,7 @@
     brave # Privacy-oriented browser
     chromium
     element-desktop # A feature-rich client for Matrix.org
-    firefox # install Firefox with support for plugins
+    librewolf # Firefox fork, focused on privacy, security and freedom
     gnome.gnome-tweaks # A tool to customize advanced GNOME 3 options
     google-chrome # A freeware web browser developed by Google
     libreoffice-fresh

profiles/forgejo.nix

@@ -1,13 +1,18 @@
-# NixOps configuration for the hosts running Gitea
+# NixOps configuration for the hosts running Forgejo
 {
   config,
   pkgs,
   lib,
+  sources,
   ...
-}: {
+}: let
+  sources = import ../nix/sources.nix;
+  unstable = import sources.nixpkgsUnstable {};
+in {
+
   services.gitea = {
-    enable = true; # Enable Gitea
-    appName = "mcwhirter.io: Gitea Service"; # Give the site a name
+    enable = true; # Enable Forgejo
+    appName = "mcwhirter.io: Forgejo Service"; # Give the site a name
     database = {
       type = "postgres"; # Database type
       passwordFile = "/run/keys/gitea-dbpass"; # Where to find the password
@@ -16,6 +21,7 @@
     domain = "source.mcwhirter.io"; # Domain name
     rootUrl = "https://source.mcwhirter.io/"; # Root web URL
     httpPort = 3002; # Provided unique port
+    package = unstable.forgejo; # a soft fork of gitea
     settings = let
       docutils = pkgs.python37.withPackages (ps:
         with ps; [
@@ -36,7 +42,8 @@
         IS_INPUT_FILE = false;
       };
       ui = {
-        DEFAULT_THEME = "gitea"; # Set the default theme
+        DEFAULT_THEME = "forgejo-auto"; # Set the default theme
+        THEMES = "forgejo-auto,forgejo-light,forgejo-dark,auto,arc-green,gitea";
       };
     };
   };
@@ -83,23 +90,23 @@
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
     virtualHosts."source.mcwhirter.io" = {
-      # Gitea hostname
+      # Forgejo hostname
       enableACME = true; # Use ACME certs
       forceSSL = true; # Force SSL
-      locations."/".proxyPass = "http://localhost:3002/"; # Proxy Gitea
+      locations."/".proxyPass = "http://localhost:3002/"; # Proxy Forgejo
     };
     virtualHosts."git.mcwhirter.io" = {
       # Hostname to be redirected
       enableACME = true; # Use ACME certs
       forceSSL = true; # Force SSL
-      locations."/".proxyPass = "http://localhost:3002/"; # Proxy Gitea
+      locations."/".proxyPass = "http://localhost:3002/"; # Proxy Forgejo
       globalRedirect = "source.mcwhirter.io"; # Redirect permanently to the host
     };
     virtualHosts."code.mcwhirter.io" = {
       # Hostname to be redirected
       enableACME = true; # Use ACME certs
       forceSSL = true; # Force SSL
-      locations."/".proxyPass = "http://localhost:3002/"; # Proxy Gitea
+      locations."/".proxyPass = "http://localhost:3002/"; # Proxy Forgejo
       globalRedirect = "source.mcwhirter.io"; # Redirect permanently to the host
     };
   };

profiles/haskell-dev.nix

@@ -7,6 +7,8 @@
   environment.systemPackages = with pkgs.haskellPackages; [
     cabal-install # Haskell software automation
     ghc # Glasgow Haskell Compiler
+    haskell-language-server # LSP server for GHC
     hlint # Haskell source linter
+    stylish-haskell # simple Haskell code prettifier
   ];
 }

profiles/host_common.nix

@@ -66,12 +66,14 @@
       dates = "weekly";
       options = "--delete-older-than 90d";
     };
-    autoOptimiseStore = true;
     extraOptions = ''
       show-trace = true                 # Enable --show-trace by default for nix
       builders-use-substitutes = true   # Set builders to use caches
     '';
-    trustedUsers = ["craige"];
+    settings = {
+      trusted-users = ["craige"];
+      auto-optimise-store = true;
+    };
   };
 
   networking = {enableIPv6 = true;};
@@ -89,9 +91,11 @@
       bat # cat clone with syntax highlighting & Git integration
       dnsutils # Bind DNS utilities
       fd # A simple, fast and user-friendly alternative to find
-      (if config.services.xserver.enable
-      then gitAndTools.gitFull
-      else git) # Distributed version control system
+      (
+        if config.services.xserver.enable
+        then gitAndTools.gitFull
+        else git
+      ) # Distributed version control system
       htop # interactive process viewer
       hwinfo # Hardware detection tool
       killall # kill processes by name

profiles/matrix.nix

@@ -9,8 +9,8 @@
 
   i18n = {
     extraLocaleSettings = {
-      LC_COLLATE = "C"; # Ensure correct locale for postgres
-      LC_CTYPE = "C"; # Ensure correct locale for postgres
+      LC_COLLATE = "C.UTF-8"; # Ensure correct locale for postgres
+      LC_CTYPE = "C.UTF-8"; # Ensure correct locale for postgres
     };
   };
 
@@ -141,8 +141,8 @@
         CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
         CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
           TEMPLATE template0
-          LC_COLLATE = "C"
-          LC_CTYPE = "C";
+          LC_COLLATE = "C.UTF-8"
+          LC_CTYPE = "C.UTF-8";
       '';
     };
   };

profiles/minecraftClient.nix

@@ -11,6 +11,6 @@
   environment.systemPackages = with pkgs; [
     jre # Required by Minecraft (via polymc)
     minecraft # Official launcher for Minecraft
-    polymc # A free, open source launcher for Minecraft
+    prismlauncher # A free, open source launcher for Minecraft
   ];
 }

profiles/neomutt.nix

@@ -7,7 +7,9 @@
   # Install other packages that I require to be used with neomutt.
   environment.systemPackages = with pkgs; [
     isync # My mail fetcher
+    khal # CLI calendar application
     khard # Console carddav client
+    libnotify # Notification client for my neomutt setup
     lynx # My HTML email viewer
     msmtp # My mail sender
     neomutt # My MUA

profiles/neovim.nix

@@ -14,7 +14,7 @@
             formatter-nvim # A format runner for neovim
             fugitive # Vim Git wrapper
             fzf-vim # Full path fuzzy file, buffer, mru, tag, finder for Vim
-            haskell-vim # Syntax Highlighting and Indentation for Haskell
+            #haskell-vim # Syntax Highlighting and Indentation for Haskell
             indentLine # Display thin vertical lines at each indentation level
             lualine-nvim
             YouCompleteMe # A code-completion engine for Vim
@@ -193,6 +193,13 @@
               set shiftwidth=2
               set expandtab
               set textwidth=79
+              "let g:haskell_enable_quantification = 1   " to enable highlighting of `forall`
+              "let g:haskell_enable_recursivedo = 1      " to enable highlighting of `mdo` and `rec`
+              "let g:haskell_enable_arrowsyntax = 1      " to enable highlighting of `proc`
+              "let g:haskell_enable_pattern_synonyms = 1 " to enable highlighting of `pattern`
+              "let g:haskell_enable_typeroles = 1        " to enable highlighting of type roles
+              "let g:haskell_enable_static_pointers = 1  " to enable highlighting of `static`
+              "let g:haskell_backpack = 1
           endfunction
           autocmd BufNewFile,BufFilePre,BufRead *.hs :call HaskellSettings()
 
@@ -313,6 +320,7 @@
                 crystal = treefmt,
                 cue = treefmt,
                 go = treefmt,
+                haskell = treefmt,
                 javascript = treefmt,
                 lua = treefmt,
                 mint = treefmt,

profiles/nextcloud.nix

@@ -27,7 +27,8 @@
       enable = true; # Run regular auto update of all apps installed
       startAt = "01:00:00"; # When to run the update
     };
-    package = pkgs.nextcloud24;
+    enableBrokenCiphersForSSE = false; # force upgrade to SSL v3
+    package = pkgs.nextcloud25;
   };
 
   systemd = {