14 changed files with 47 additions and 165 deletions
--- a/flake.lock
+++ b/flake.lock
@ -8,11 +8,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696985954,
-        "narHash": "sha256-dU1lYBWHqxkvbJV3B9oPeqLL0H8FkSKEqjPie+9xPgQ=",
+        "lastModified": 1695327957,
+        "narHash": "sha256-UsofTHPG8K7UqO0rJGHS2Ecbv+oVOYQ23Zk6SnshfOs=",
        "owner": "jcdickinson",
        "repo": "codeium.nvim",
-        "rev": "822e762567a0bf50b1a4e733c8c93691934d7606",
+        "rev": "b65443d114d3c3c9dcc59ecd8a7dbb3a35320607",
        "type": "github"
      },
      "original": {
@ -136,11 +136,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1698860414,
-        "narHash": "sha256-ejtFTDbo7tT8j8AIQfN9g+4dlQmrUDoC3dEaw77jVcY=",
+        "lastModified": 1696145345,
+        "narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fc2a8842ea5106640eb89ec522dde9120df82d8a",
+        "rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30",
        "type": "github"
      },
      "original": {
@ -154,11 +154,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1698687579,
-        "narHash": "sha256-BWqQQLhpuQolMiLMTcsc8cNlNzI9+MG/uc184IlP2nA=",
+        "lastModified": 1695455081,
+        "narHash": "sha256-AtAMze2J5Maol28OLQoCFgppRWEy06Mn9RhduXNmhiI=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "bfd3e0efc1af9654808e644b157eb3c170c26fa1",
+        "rev": "33663f663e07b4ca52c9165f74e3d793f08b15e7",
        "type": "github"
      },
      "original": {
@ -176,11 +176,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1698802123,
-        "narHash": "sha256-Tpx1U6IlnD+wrSvUrBwEvwvK5D8cifIdppB9CwpVQdo=",
+        "lastModified": 1696165790,
+        "narHash": "sha256-18Yt3o3sjieqgOSjUXW8Apn6JuHLTKEJDt5k40sAf2A=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "7b32b4214d028a173c8192bddaa9e43503326080",
+        "rev": "9ec656a37df103edc111e8e48cdfe89528dfe92e",
        "type": "github"
      },
      "original": {
@ -320,11 +320,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1698134075,
-        "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
+        "lastModified": 1694767346,
+        "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
+        "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
        "type": "github"
      },
      "original": {
@ -336,11 +336,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1698611440,
-        "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
+        "lastModified": 1696019113,
+        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
+        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
        "type": "github"
      },
      "original": {
@ -423,18 +423,18 @@
      "flake": false,
      "locked": {
        "host": "gitlab.freedesktop.org",
-        "lastModified": 1697909146,
-        "narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=",
+        "lastModified": 1695919988,
+        "narHash": "sha256-4RBgIZHaVqH0m1POnfzYRzwCWxifIKH4xQ0kCn2LGkA=",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2",
+        "rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e",
        "type": "gitlab"
      },
      "original": {
        "host": "gitlab.freedesktop.org",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2",
+        "rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e",
        "type": "gitlab"
      }
    },
@ -454,11 +454,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1697981233,
-        "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=",
+        "lastModified": 1694628480,
+        "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2",
+        "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2",
        "type": "github"
      },
      "original": {
--- a/system/kernighan/kernighan.nix
+++ b/system/kernighan/kernighan.nix
@ -2,13 +2,6 @@
 { config, pkgs, inputs, ... }:

 {
-
-  virtualisation.docker = {
-    enable = true;
-    storageDriver = "btrfs";
-    logDriver = "json-file";
-  };
-
  imports =
    [
      ../shared/shared-configuration.nix
@ -18,8 +11,6 @@
      ../shared/services/miniflux.nix
      ../shared/services/nginx.nix
      ../shared/services/radicale.nix
-      ../shared/services/redmine.nix
-      ../shared/services/wallabag.nix
    ];

  networking = {
@ -45,6 +36,12 @@
    vim
  ];

+  virtualisation.docker = {
+    enable = true;
+    storageDriver = "btrfs";
+    logDriver = "json-file";
+  };
+
  users.users.kamal = {
    isNormalUser = true;
    extraGroups = [
--- a/system/shared/desktop-configuration.nix
+++ b/system/shared/desktop-configuration.nix
@ -44,6 +44,9 @@
    pkgs.pciutils
    pkgs.pinentry-curses
    pkgs.pulseaudio
+    pkgs.xdg-desktop-portal
+    pkgs.xdg-desktop-portal-gtk
+    pkgs.xdg-desktop-portal-kde
    inputs.devenv.packages.x86_64-linux.devenv
    pkgs.gst_all_1.gstreamer
    pkgs.gst_all_1.gst-plugins-base
@ -52,22 +55,12 @@
    pkgs.gst_all_1.gst-plugins-ugly
  ];

-  xdg = {
-    mime.enable = true;
-    mime.defaultApplications = {
-      "text/html" = "org.qutebrowser.qutebrowser.desktop";
-      "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
-      "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
-      "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
-      "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
-    };
-    portal = {
-      enable = true;
-      extraPortals = with pkgs; [
-        xdg-desktop-portal-wlr
-        xdg-desktop-portal-gtk
-      ];
-      gtkUsePortal = true;
-    };
+  xdg.mime.enable = true;
+  xdg.mime.defaultApplications = {
+    "text/html" = "org.qutebrowser.qutebrowser.desktop";
+    "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
+    "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
+    "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
+    "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
  };
 }
--- a/system/shared/services/nginx.nix
+++ b/system/shared/services/nginx.nix
@ -34,7 +34,6 @@
      };
    };

-    # Syncthing
    virtualHosts."syncthing.tsvallender.co.uk" = {
      forceSSL = true;
      enableACME = true;
@ -43,7 +42,6 @@
      };
    };

-    # Miniflux
    virtualHosts."feeds.tsvallender.co.uk" = {
      forceSSL = true;
      enableACME = true;
@ -52,7 +50,6 @@
      };
    };

-    # Radicale
    virtualHosts."cal.tsvallender.co.uk" = {
      forceSSL = true;
      enableACME = true;
@ -60,23 +57,6 @@
        proxyPass = "http://127.0.0.1:5232";
      };
    };
-
-    # Redmine
-    virtualHosts."redmine.tsvallender.co.uk" = {
-      forceSSL = true;
-      enableACME = true;
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:3000";
-      };
-    };
-    # Wallabag
-    virtualHosts."wb.tsvallender.co.uk" = {
-      forceSSL = true;
-      enableACME = true;
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:8485";
-      };
-    };
  };

  security.acme = {
--- a/system/shared/services/redmine.nix
+++ b/system/shared/services/redmine.nix
@ -1,8 +0,0 @@
-{ config, pkgs, inputs, ... }:
-
-{
-  services.redmine = {
-    enable = true;
-  };
-}
-
--- a/system/shared/services/wallabag.nix
+++ b/system/shared/services/wallabag.nix
@ -1,21 +0,0 @@
-{ config, pkgs, inputs, ... }:
-
-{
-  virtualisation.oci-containers.backend = "docker";
-  virtualisation.oci-containers.containers = {
-    wallabag = {
-      autoStart = true;
-      image = "wallabag/wallabag";
-      environment = {
-        SYMFONY__ENV__DOMAIN_NAME = "https://wb.tsvallender.co.uk";
-      };
-      volumes = [
-        "wallabag_data:/var/www/wallabag/data"
-      ];
-      ports = [
-        "8485:80"
-      ];
-    };
-  };
-}
-
--- a/users/foxsoft/authorized_keys
+++ b/users/foxsoft/authorized_keys
@ -5,4 +5,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3SCbRzbJolhjy/TMFLMcDlzO+pFvPat/mZP/BosY3
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmWUGjQ6EMNP0sqwF0XTnL58I8dKqlPIMgpOeTFVCCW8+6A4XRuTlx0uVt96d49lwvEuSn5Mft7oMNEL0O+zFMYFru9s786Lpvd7iI7kwEIARgcHeVLifTbYd+N85G2ILKCsPHqcRJPmcbG2wASZOJEFn0Ngs5cf+/lXnISEyAHUmltVDM0V0Ne20oMcZcztaBzaASHcHGlJCGUQuScag0kPljKiWKbOVvA6hGVYwuhr/G+6vPTfml18p3KHsAIOLZaK7DsYwgHGPSu38YbHL60iz6iBn9GcEaUcWIgtqamSAfhq+cFPjzySCLmSa5rJ0Y2mNPk/YiZTSfQpIDpNAWKq+fmWg3zx/g28nN06HL9eHhTzG7VRW+CXaX67Xc6tg8I+kqF6722TEtFZ74wXBmMsn+JCn6CDtxSUtK1of8xTAO7Bl4Uq/hQ8KsdeO8J4XfRaFjiSLqiU+WcyibLkFDnW+g8sR0shOJi5Kl3ES3xgvdrxLcODKzDBHKm+jiIzVJICqPbXrzOtoXWd4xD79rGeYVrx72J8HiY6zokgUYpkVFgwzxe6OVRCQ0dfPsRtj/Mr2KAyDkRsdyeR5QhDDePoNBw5y3IbN/MB4lwOYO3mMqg589f4cUTxOQy+i7sRHVVdzdf22LdP0Kc/d9iH8lkpt7V7sn8Di3AZ/Y+NEBMw== trevor@foxsoft.co.uk
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCkSdF9P7+XgUt44TQUpudEdyAo3k5O3OzIlNSljgPyAdT8sD6RTa/w6sY7K2APnkkuDkeoUWKmeG1l/LuULvd3RoimheoQ+6IwARwp56nBPJ+D/VpxfFGUrXXoaIj86E2F3+03v3I+MfhCNKPzYpRJxJ0+lOwE3NKfe6bjBTQSNmLz5Sd8M4SjDiJyDYVL9ncvvwxyoZHPQtA08D/GXmUjMz5a2fCGEQm6Z42VvQYHoCsC95t8IozyiHUP/C3EskvpQbh1zI+n7nOv788SxgQp2TGvv2FnuhoS7R+dvzriqlLPykc6vsa9XsUuI317pprl7nlCZaA2MQMAFgH4GyzlaqjI1B8jAIqNjvR5MwgR4AgKBBMJ1PxbbtZPUNBs1GRe36F6mg24rOAiBrRTjbEHAG2pauxWrxxg4zXGIHOvp1o+zkvqMWQ3ELy8EnQt3Pa0mj7fFfcO9WmrUr1uExCEthss1sifEOSP1I3QFsRUNvFxft53om8Zlbn+16dnd+s= conan@conan-XPS-15-9530
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHvk0w2nbaaVinqZLd+fRsZIZTMyaY7g1CT43ys+Pthi sebastian@foxsoft.co.uk
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFb1xF8bgVM2Ipc0KD02g2ppE/urf21ay6x+cfmEwiVcCvJuRrLLd4SZdoi+CeoaMu6bkBtRdyvfTMMJl7R7rrXTXfearazJXWi5MLFCCKsfAd3K4fPA8oCYsJ0VyRkqxJmq9dd24rcaQuM8v8ZoJ9bqh7NsSpEdTC6xjyeyKEN8YxEtdeXVwCYuH+UDBBD1nl8mg9VS/EmxHDW01KvEs5Frxap5FdAiJBwK9XDHdQDJlUbzzzkWkG3gFk8Ub2Cem7efGOSb31VF+/aSPVCdHn28NlJ69jGD6ZQR1+hrfr4npOpklZyrWIJ9cvJpqXenEcc1z9F/8RFkO4EJ7UzTwx/9SGpEEfxKHKtzmGvcHwxQlVxtG9wGGvkZW5BbJkuJ19k13NMYUVwhWIhK694bZT5jMdU/6plL27KRa+IXUINICQ5i75j9/0CjxZoFdqZjUu8O2T1w1aZB7So0sIDZX02x49o2SfJeOBxKDzIPdvN2ceg9WwCb/+i73ZX9ln6eZM8C76kD0Xd2LEqX7oS1DEXN6pZIFzBuft+Eu38Xm8GRkXVeuNxvbaZ2DBo1p8pu5JyHJUULW+KQAQlX+mKkUq97xzgDQGG20Vkgx03Ftvis2ifDbfUD2wHOOx+453t/GbmmasmydqvvqRPBUWy2DbKERdjjws7jIXjlGqz8mGKQ== jon.sayer1@gmail.com
--- a/users/tsv/emacs/init.el
+++ b/users/tsv/emacs/init.el
@ -1,4 +0,0 @@
-(menu-bar-mode -1)
-(tool-bar-mode -1)
-
-
--- a/users/tsv/git/config_foxsoft
+++ b/users/tsv/git/config_foxsoft
@ -1,4 +1,2 @@
 [user]
  email = trevor@foxsoft.co.uk
-[commit]
-  template = ~/fs/git_template
--- a/users/tsv/home.nix
+++ b/users/tsv/home.nix
@ -65,7 +65,6 @@
  home.file.".tmux.conf".source = ./tmux.conf;
  home.file.".psqlrc".source = ./psqlrc;
  home.file.".w3m/config".source = ./w3m/config;
-  xdg.configFile."emacs/init.el".source = ./emacs/init.el;
  xdg.configFile."git/config".source = ./git/config;
  xdg.configFile."git/config_foxsoft".source = ./git/config_foxsoft;
  xdg.configFile."nvim/init.lua".source = ./nvim/init.lua;
--- a/users/tsv/hyprland/hyprpaper.conf
+++ b/users/tsv/hyprland/hyprpaper.conf
@ -1,5 +1,4 @@
 preload = ~/img/wallpaper/carina_nebula.jpg
-preload = ~/img/wallpaper/golden_ratio.jpg
-wallpaper = eDP-1,~/img/wallpaper/golden_ratio.jpg
+wallpaper = eDP-1,~/img/wallpaper/carina_nebula.jpg
 wallpaper = DP-2,~/img/wallpaper/carina_nebula.jpg

--- a/users/tsv/nvim/init.lua
+++ b/users/tsv/nvim/init.lua
@ -79,54 +79,7 @@ cmp.setup {
  })
 }
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
-
-- textDocument/diagnostic support until 0.10.0 is released
-_timers = {}
-local function setup_diagnostics(client, buffer)
-  if require("vim.lsp.diagnostic")._enable then
-    return
-  end
-
-  local diagnostic_handler = function()
-    local params = vim.lsp.util.make_text_document_params(buffer)
-    client.request("textDocument/diagnostic", { textDocument = params }, function(err, result)
-      if err then
-        local err_msg = string.format("diagnostics error - %s", vim.inspect(err))
-        vim.lsp.log.error(err_msg)
-      end
-      local diagnostic_items = {}
-      if result then
-        diagnostic_items = result.items
-      end
-      vim.lsp.diagnostic.on_publish_diagnostics(
-        nil,
-        vim.tbl_extend("keep", params, { diagnostics = diagnostic_items }),
-        { client_id = client.id }
-      )
-    end)
-  end
-
-  diagnostic_handler() -- to request diagnostics on buffer when first attaching
-
-  vim.api.nvim_buf_attach(buffer, false, {
-    on_lines = function()
-      if _timers[buffer] then
-        vim.fn.timer_stop(_timers[buffer])
-      end
-      _timers[buffer] = vim.fn.timer_start(200, diagnostic_handler)
-    end,
-    on_detach = function()
-      if _timers[buffer] then
-        vim.fn.timer_stop(_timers[buffer])
-      end
-    end,
-  })
-end
-require("lspconfig").ruby_ls.setup({
-  on_attach = function(client, buffer)
-    setup_diagnostics(client, buffer)
-  end,
-})
+require'lspconfig'.solargraph.setup {}

 -- Vimwiki
 vim.cmd([[
--- a/users/tsv/packages.nix
+++ b/users/tsv/packages.nix
@ -17,10 +17,8 @@
    chromium
    delta                                  # Nice diffing pager for Git
    docker-compose
-    dogdns
    duf
    dunst
-    emacs
    ethtool
    feh
    firefox
@ -30,7 +28,6 @@
    git-crypt
    gnumake
    gnupg
-    go
    gimp
    grimblast                             # Screenshotter by the hyprland devs
    groff
@ -60,13 +57,14 @@
    qutebrowser
    ripgrep
    rpi-imager
-    ruby_3_2
-    rubyPackages_3_2.dip
-    rubyPackages_3_2.ruby-lsp
+    ruby_3_1
+    rubyPackages_3_1.dip
+    rubyPackages_3_1.solargraph
    rofi-wayland
    sshfs
    smartmontools                         # HDD health
    spotify
+    termpdfpy
    texlive.combined.scheme-full
    thunderbird
    timg
--- a/users/tsv/work-packages.nix
+++ b/users/tsv/work-packages.nix
@ -8,6 +8,5 @@
    heroku
    libreoffice
    microsoft-edge
-    slack
  ];
 }