emacs: Add QML mode and tree-sitter

flake.lock: Update
Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/2e9b88f02ec166b1c3f0a638688f8e4ef444de32' (2024-02-05) → 'github:nix-community/disko/d07de570ba05cec2807d058daaa044f6955720c7' (2024-02-10) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/552a5b1fbcde5557b2a011956fa36fdef056fdb7' (2024-02-07) → 'github:nix-community/emacs-overlay/0f7f3b39157419f3035a2dad39fbaf8a4ba0448d' (2024-02-13) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/9f2ee8c91ac42da3ae6c6a1d21555f283458247e' (2024-02-05) → 'github:NixOS/nixpkgs/809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6' (2024-02-11) • Updated input 'home-manager': 'github:nix-community/home-manager/f99eace7c167b8a6a0871849493b1c613d0f1b80' (2024-02-05) → 'github:nix-community/home-manager/21b078306a2ab68748abf72650db313d646cf2ca' (2024-02-11) • Updated input 'microvm': 'github:astro/microvm.nix/c5074bb6d328a6071a70dcb097f8bcd208fce80a' (2024-02-04) → 'github:astro/microvm.nix/d227a91e7524db9367d0c4f2ed0656ea944bcbe7' (2024-02-10) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/6e5cc385fc8cf5ca6495d70243074ccdea9f64c7' (2024-02-06) → 'github:NixOS/nixos-hardware/2b68ccd7475362b8c8d6a1805b403033ba6273a8' (2024-02-13) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/faf912b086576fd1a15fca610166c98d47bc667e' (2024-02-05) → 'github:nixos/nixpkgs/f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8' (2024-02-11) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28) → 'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/7a94fe7690d2bdfe1aab475382a505e14dc114a6' (2024-02-07) → 'github:oxalica/rust-overlay/8dfbe2dffc28c1a18a29ffa34d5d0b269622b158' (2024-02-13) • Updated input 'sops': 'github:Mic92/sops-nix/23f61b897c00b66855074db471ba016e0cda20dd' (2024-02-04) → 'github:Mic92/sops-nix/695275c349bb27f91b2b06cb742510899c887b81' (2024-02-12) • Updated input 'sops/nixpkgs-stable': 'github:NixOS/nixpkgs/9a333eaa80901efe01df07eade2c16d183761fa3' (2024-01-22) → 'github:NixOS/nixpkgs/d8cd80616c8800feec0cab64331d7c3d5a1a6d98' (2024-02-10)
2024-02-15 08:36:05 +01:00 · 2024-02-13 14:59:29 +01:00 · 2024-02-09 20:43:09 +01:00 · 2024-02-09 20:39:15 +01:00 · 2024-02-09 20:38:40 +01:00 · 2024-02-09 20:37:41 +01:00
8 changed files with 129 additions and 90 deletions
--- a/flake.lock
+++ b/flake.lock
@ -124,11 +124,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707095972,
-        "narHash": "sha256-iQ2jpCCwYWpk4UcPEgQqRSOVsY2p8GkPmz/lJw47Cvo=",
+        "lastModified": 1707524024,
+        "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "2e9b88f02ec166b1c3f0a638688f8e4ef444de32",
+        "rev": "d07de570ba05cec2807d058daaa044f6955720c7",
        "type": "github"
      },
      "original": {
@ -148,11 +148,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1707270264,
-        "narHash": "sha256-iyC5FzxzLob9PU6/K2n0J5MG/6b5k2dYRnP+I2WRnDk=",
+        "lastModified": 1707815184,
+        "narHash": "sha256-WFoDXgaPdhjgQB3ut+ZN+VT7e60Yw+KUyvUkOSu5Wto=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "552a5b1fbcde5557b2a011956fa36fdef056fdb7",
+        "rev": "0f7f3b39157419f3035a2dad39fbaf8a4ba0448d",
        "type": "github"
      },
      "original": {
@ -414,11 +414,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707175763,
-        "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=",
+        "lastModified": 1707683400,
+        "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80",
+        "rev": "21b078306a2ab68748abf72650db313d646cf2ca",
        "type": "github"
      },
      "original": {
@ -438,11 +438,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1707084830,
-        "narHash": "sha256-550b8OUt8j5G3tC4MgCfc+sHAAxARXzWYcYpfhNDhUc=",
+        "lastModified": 1707575232,
+        "narHash": "sha256-jQ69oDRIIC0LCRKKAIZT0f9KnDQQWq2LhiOwCmtiN7I=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "c5074bb6d328a6071a70dcb097f8bcd208fce80a",
+        "rev": "d227a91e7524db9367d0c4f2ed0656ea944bcbe7",
        "type": "github"
      },
      "original": {
@ -521,11 +521,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1707211557,
-        "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=",
+        "lastModified": 1707821782,
+        "narHash": "sha256-j5fSpKvEUNkELEQXnQbJHGa5QI7ChbMqWMsyUjc/Bo8=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7",
+        "rev": "2b68ccd7475362b8c8d6a1805b403033ba6273a8",
        "type": "github"
      },
      "original": {
@ -586,11 +586,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1707091808,
-        "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
+        "lastModified": 1707650010,
+        "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
+        "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
        "type": "github"
      },
      "original": {
@ -618,27 +618,27 @@
    },
    "nixpkgs-stable_4": {
      "locked": {
-        "lastModified": 1705957679,
-        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
+        "lastModified": 1707603439,
+        "narHash": "sha256-LodBVZ3+ehJP2azM5oj+JrhfNAAzmTJ/OwAIOn0RfZ0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
+        "rev": "d8cd80616c8800feec0cab64331d7c3d5a1a6d98",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1707092692,
-        "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
+        "lastModified": 1707689078,
+        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
+        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
        "type": "github"
      },
      "original": {
@ -689,11 +689,11 @@
        "nixpkgs-stable": "nixpkgs-stable_3"
      },
      "locked": {
-        "lastModified": 1706424699,
-        "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=",
+        "lastModified": 1707297608,
+        "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf",
+        "rev": "0db2e67ee49910adfa13010e7f012149660af7f0",
        "type": "github"
      },
      "original": {
@ -762,11 +762,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707271822,
-        "narHash": "sha256-/DZsoPH5GBzOpVEGz5PgJ7vh8Q6TcrJq5u8FcBjqAfI=",
+        "lastModified": 1707790272,
+        "narHash": "sha256-KQXPNl3BLdRbz7xx+mwIq/017fxLRk6JhXHxVWCKsTU=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "7a94fe7690d2bdfe1aab475382a505e14dc114a6",
+        "rev": "8dfbe2dffc28c1a18a29ffa34d5d0b269622b158",
        "type": "github"
      },
      "original": {
@ -783,11 +783,11 @@
        "nixpkgs-stable": "nixpkgs-stable_4"
      },
      "locked": {
-        "lastModified": 1707015547,
-        "narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=",
+        "lastModified": 1707748232,
+        "narHash": "sha256-o9L8jrOemQl/5cYp++0cWdfMLzVljCdHwPFF4N0KZeQ=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "23f61b897c00b66855074db471ba016e0cda20dd",
+        "rev": "695275c349bb27f91b2b06cb742510899c887b81",
        "type": "github"
      },
      "original": {
--- a/home-manager/modules/emacs/config.org
+++ b/home-manager/modules/emacs/config.org
@ -900,9 +900,9 @@ Enable [[https://github.com/BurntSushi/ripgrep][ripgrep]] support
 Set some connection properties

 #+begin_src emacs-lisp
-  (add-to-list 'tramp-connection-properties
-               (list (regexp-quote "/sshx:hass:")
-                     "remote-shell" "/bin/bash"))
+  (with-eval-after-load "tramp" (add-to-list 'tramp-connection-properties
+                                             (list (regexp-quote "/sshx:hass:")
+                                                   "remote-shell" "/bin/bash")))
 #+end_src

 ** Git
@ -1108,9 +1108,12 @@ Automatically use the =<lang>-ts-mode= when it is available
    :config
    (fset #'json--log-event #'ignore) ;; Performance boost by not logging every event
    (add-to-list 'eglot-server-programs
-                 '(conf-toml-mode . ("taplo" "lsp" "stdio")))
+                 '((toml-mode toml-ts-mode conf-toml-mode) . ("taplo" "lsp" "stdio")))
    (add-to-list 'eglot-server-programs
-                 `((elixir-mode elixir-ts-mode heex-ts-mode) . ,(eglot-alternatives '(("nextls" "--stdio") "elixir-ls"))))
+                 `((elixir-mode elixir-ts-mode heex-ts-mode) .
+                   ,(eglot-alternatives '(("nextls" "--stdio=true"
+                                           :initializationOptions (:experimental (:completions (:enable t))))
+                                          "elixir-ls"))))
    (add-to-list 'eglot-server-programs
                 '(dhall-mode . ("dhall-lsp-server")))
    (add-to-list 'eglot-stay-out-of 'flymake)
@ -1281,19 +1284,19 @@ Prefer local packages from =node_modules= to global ones
 Add support for Elixir with [[https://github.com/elixir-editors/emacs-elixir][elixir-mode]]. The =elixir-format= hook sets up the correct formatter configuration when in a =projectile= project.

 #+begin_src emacs-lisp
-    (use-package elixir-mode
-      :after eglot
-      :hook ((elixir-format . (lambda ()
-                                (if (projectile-project-p)
-                                    (setq elixir-format-arguments
-                                          (list "--dot-formatter"
-                                                (concat (locate-dominating-file buffer-file-name ".formatter.exs") ".formatter.exs")))
-                                  (setq elixir-format-arguments nil))))
-             (elixir-mode . (lambda () (add-hook 'before-save-hook 'elixir-format nil t)))
-             (elixir-mode . eglot-ensure))
-      :config
-      ;; (setq lsp-elixir-server-command '("elixir-ls"))
-      (add-to-list 'auto-mode-alist '("\\.[hl]eex\\'" . elixir-mode)))
+  (use-package elixir-mode
+    :after eglot
+    :hook ((elixir-mode . eglot-ensure))
+    ;;        ((elixir-format . (lambda ()
+    ;;                           (if (projectile-project-p)
+    ;;                               (setq elixir-format-arguments
+    ;;                                     (list "--dot-formatter"
+    ;;                                           (concat (locate-dominating-file buffer-file-name ".formatter.exs") ".formatter.exs")))
+    ;;                             (setq elixir-format-arguments nil))))
+    ;;        (elixir-mode . (lambda () (add-hook 'before-save-hook 'elixir-format nil t)))
+    :config
+    ;; (setq lsp-elixir-server-command '("elixir-ls"))
+    (add-to-list 'auto-mode-alist '("\\.[hl]eex\\'" . elixir-mode)))
 #+end_src

 Add a [[https://github.com/ayrat555/mix.el][mix]] minor mode to call =mix= tasks from emacs.
@ -1457,6 +1460,26 @@ Enable clangd LSP for C and C++
    ((c++-mode c++-ts-mode) . eglot-ensure))
 #+end_src

+Add some flags to clangd
+
+#+begin_src emacs-lisp
+  (with-eval-after-load 'eglot
+    (add-to-list 'eglot-server-programs
+                 '((c-mode c-ts-mode c++-mode c++-ts-mode)
+                   . ("clangd"
+                      "--malloc-trim"
+                      "--log=error"
+                      "--clang-tidy"
+                      "--completion-style=detailed"))))
+#+end_src
+
+Add QML mode
+
+#+begin_src emacs-lisp
+      (use-package qml-mode
+        :mode "\\.qml\\'")
+#+end_src
+
 Enable and configure =auto-insert-mode= for Horus projects

 #+begin_src emacs-lisp
--- a/home-manager/modules/emacs/default.nix
+++ b/home-manager/modules/emacs/default.nix
@ -38,6 +38,17 @@ let
    };
  };

+  tree-sitter-qml = pkgs.tree-sitter.buildGrammar {
+    language = "tree-sitter-qmljs";
+    version = "unstable-2024-02-02";
+    src = pkgs.fetchFromGitHub {
+      owner = "yuja";
+      repo = "tree-sitter-qmljs";
+      rev = "9fa49ff3315987f715ce5666ff979a7742fa8a98";
+      sha256 = "q20gLVLs0LpqRpgo/qNRDfExbWXhICWZjM1ux4+AT6M=";
+    };
+  };
+
  emacsWithPackages = pkgs.emacsWithPackagesFromUsePackage {
    config =
      let
@ -98,6 +109,7 @@ let
            tree-sitter-nu
            tree-sitter-pioasm
            tree-sitter-python
+            tree-sitter-qml
            tree-sitter-query
            tree-sitter-regex
            tree-sitter-rst
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@ -502,7 +502,7 @@
    renovate_env = {
      owner = "erwin";
    };
-    livebook_cookie = {
+    livebook-env = {
      owner = "erwin";
    };
    livebook-password = {
--- a/machines/loki/secrets.yaml
+++ b/machines/loki/secrets.yaml
@ -1,6 +1,6 @@
 ha_now_playing_token: ENC[AES256_GCM,data:2NKdfEn0tQx+DTE6HBVo79Ico8+afqJ2XFaBVOgIikaL4eMa34CqHwhX91T64VVdmWyjvhaC1kRzxsALoJvw1ZHEnSG2va6lX0vN36j/n8R3ulcX23ZJetMHYQQE6ss7A+gvnBHTnTBG+F9XyrPFT7xnfQ363lWHQ3nRFiGAZJjj6eYqLxSuG7KMWHtfSozy5gSy2JKoxyV4KnqpDs39PhBmNA7OSh3FRYZPIaq+i4qhdCfHRET+,iv:Znl6IW36aqhL/KBr0cRgPBPtqkhuc1GtoqCQEQJ/cXI=,tag:ubvLck9m9qiutU2zcQtdDw==,type:str]
 gh_token: ENC[AES256_GCM,data:7DBVEdZLReJQsyUoO9fITtHhE0UFcHr7XWod5XiaQ5iiwcI01tUdRA==,iv:HY82pn2rp9zf+xHWRg6Zwbl5V2qgp+67LghxHRQjiMI=,tag:OrkwDDYpJLXnsWZvqBtY9g==,type:str]
-livebook_cookie: ENC[AES256_GCM,data:ZB7u8BWNn7x2O00YTALYTwNi/obq8nH3mI01Bd8UxPg=,iv:JVpPJaB6O7oRjYqYuEueT812U0Bn8mUCOLDwpAU5yTs=,tag:GIkodjTt9mRLQZ0UAtJszg==,type:str]
+livebook-env: ENC[AES256_GCM,data:n0IReqMxu0pLJZtHdoTW+AvE8eKAyLsr41GbLR4OPSTrZrRKIOscZ5KIoLGtDrCQFw==,iv:MFC78r/1mfRf8puKWxXtaQeaqhFFVdYpu1vLMCe3JiI=,tag:Wd8EG95rx75EJpt5GaQw9g==,type:str]
 livebook-password: ENC[AES256_GCM,data:FaMIr0GxLTvAzrYt7blGbJuGDbr+lDiIMnvY2c/r,iv:SKKKYYRYLGtRGgaHs7zAnH8n0HZiGaoAlLAptUPaa/c=,tag:vgBGhmXH/QpTbKjbrQEhKw==,type:str]
 renovate_env: ENC[AES256_GCM,data:mzeS0FXsycD4hWMzRMgeEgTY+x2QtYtxmhcFCJcjwlD/q577kprHaU8otr1sOu9mwNud7K8kJGk=,iv:MMhr6CPsyvmP7+dKJUwt9cjnATm9JKZ/KbG4Dkj7hJ0=,tag:ubLmcW/CtT/uPiyswvr93w==,type:str]
 wireguard-horus-privkey: ENC[AES256_GCM,data:JVhdbvNqfdPWFCg24F56Hmu1Tf/EA6BOqa1uPuu8C/FrJhNaGi4S+KYOook=,iv:z8cq4C5vu/QqJ3UZdL1zEH22Ht3rKSbdHgAQbRSk8Kk=,tag:AVBvV8wJqw5jgDRiES89eQ==,type:str]
@ -65,8 +65,8 @@ sops:
            YlFmNzNseHZXSk01SmEwK0ZIRlFmb0kKPms5J3yViVwgwvQhI5XYwcNQZs4Bhwv4
            scaA7FZV2sa4x+EXrYAxg3AioH7QOky02FujCOrUaThlLIzDVucgKg==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-11-01T09:21:23Z"
-    mac: ENC[AES256_GCM,data:rYz0Q6CnVD6i+/Cs2RptgQnwx4SN5b+Tu4GeVt7gkvuFzegSIY5gv0N8hyvskKhdvTGzYE7DY5ePeFJRD1JdrRr/d9ZEmjCbapz+VxwfzxXlhyGElYboBEnWZ8G0C0mFtNOmPvwAqlinBNdQkRODX3l0zNa9947AXTPzkJuArPo=,iv:HQZzW/GkDP/kp7gAjiio5SKf3TGDeUySqfbaJWtYlVc=,tag:/taq1QhnK8FTCO+JquixRA==,type:str]
+    lastmodified: "2024-02-07T22:49:34Z"
+    mac: ENC[AES256_GCM,data:e3HW2LmCFwxXt2QkKf7pGKrpBQLFETVzz6w4/EEtxSzcuFn7p/S0AYk/4/FPXO+Gke1ccklXINFb/Qk0KlaWeToNg3Pp19xt5b9apvJQsoXQOuzjxqHDRkwZjGIFsYUvVgt/YNXs3AsTJzeMq0RjaI96xbwCitKvZl+sJP1nUBY=,iv:vA8xjOljqXwHwG+aJuCORgcHcNGgNf4L9RRV+dZv4+w=,tag:1Ukh7LQ/yTurdANzygxvXQ==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/modules/nix-common/default.nix
+++ b/modules/nix-common/default.nix
@ -85,7 +85,7 @@ in

      gc = {
        automatic = true;
-        dates = "daily";
+        dates = "weekly";
        options = "--delete-older-than 30d";
      };
    };
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@ -11,6 +11,11 @@ let
  homeCfg = config.home-manager.users.erwin;
  bt = config.eboskma.bluetooth;

+  gtkTheme = {
+    name = "io.elementary.stylesheet.slate";
+    package = pkgs.pantheon.elementary-gtk-theme;
+  };
+
  ewwDaemon =
    let
      path = lib.makeBinPath (
@ -248,7 +253,7 @@ in

        pointerCursor = {
          name = "elementary";
-          package = pkgs.pantheon.elementary-gtk-theme;
+          package = gtkTheme.package;
          gtk.enable = true;
          x11.enable = true;
        };
@ -294,6 +299,12 @@ in
          enable = true;
          createDirectories = true;
        };
+
+        configFile."gtk-4.0/gtk.css" = lib.mkForce {
+          text = ''
+            @import url("file://${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk-dark.css");
+          '';
+        };
      };

      i18n.inputMethod = {
@ -313,10 +324,7 @@ in

      gtk = {
        enable = true;
-        theme = {
-          name = "elementary";
-          package = pkgs.pantheon.elementary-gtk-theme;
-        };
+        theme = gtkTheme;

        iconTheme = {
          name = "elementary";
@ -438,12 +446,13 @@ in
      ddccontrol.enable = true;

      livebook = {
-        enableUserService = true;
-        environmentFile = pkgs.writeText "livebook-env" ''
-          LIVEBOOK_TOKEN_ENABLED=false
-          LIVEBOOK_IDENTITY_PROVIDER=tailscale:/run/tailscale/tailscaled.sock
-          LIVEBOOK_IP=100.106.117.132
-        '';
+        enableUserService = false;
+        environment = {
+          LIVEBOOK_TOKEN_ENABLED = false;
+          LIVEBOOK_IDENTITY_PROVIDER = "tailscale:/run/tailscale/tailscaled.sock";
+          LIVEBOOK_IP = "100.106.117.132";
+        };
+        environmentFile = config.sops.secrets.livebook-env.path;
      };
    };

--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@ -9,20 +9,10 @@ with lib;
 let
  cfg = config.eboskma.users.erwin;

-  # remoteSessionScript = pkgs.writeShellScriptBin "remote-session" ''
-  #   ${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --mode 2560x1440
-  #   ${pkgs.xorg.xrandr}/bin/xrandr --output DP-4 --mode 2560x1440 --right-of DP-0
-  #   ${pkgs.nitrogen}/bin/nitrogen --head=0 --set-auto ${toString ./wallpapers/jwst-carina-cosmic-cliffs-nircam-2560.png}
-  #   ${pkgs.nitrogen}/bin/nitrogen --head=1 --set-auto ${toString ./wallpapers/jwst-southern-ring-nircam-miri-side-by-side-2560.png}
-  #   systemctl --user restart polybar
-  # '';
-  # localSessionScript = pkgs.writeShellScriptBin "local-session" ''
-  #   ${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --mode 3840x2160
-  #   ${pkgs.xorg.xrandr}/bin/xrandr --output DP-4 --mode 3840x2160 --right-of DP-0
-  #   ${pkgs.nitrogen}/bin/nitrogen --head=0 --set-auto ${toString ./wallpapers/jwst-carina-cosmic-cliffs-nircam-3840.png}
-  #   ${pkgs.nitrogen}/bin/nitrogen --head=1 --set-auto ${toString ./wallpapers/jwst-southern-ring-nircam-miri-side-by-side-3840.png}
-  #   systemctl --user restart polybar
-  # '';
+  gtkTheme = {
+    name = "io.elementary.stylesheet.slate";
+    package = pkgs.pantheon.elementary-gtk-theme;
+  };

  ewwDaemon =
    let
@ -310,7 +300,7 @@ in

        pointerCursor = {
          name = "elementary";
-          package = pkgs.pantheon.elementary-gtk-theme;
+          package = gtkTheme.package;
          gtk.enable = true;
          x11.enable = true;
        };
@ -351,6 +341,12 @@ in
          enable = true;
          createDirectories = true;
        };
+
+        configFile."gtk-4.0/gtk.css" = lib.mkForce {
+          text = ''
+            @import url("file://${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk-dark.css");
+          '';
+        };
      };

      dconf.settings = {
@ -361,10 +357,7 @@ in

      gtk = {
        enable = true;
-        theme = {
-          name = "elementary";
-          package = pkgs.pantheon.elementary-gtk-theme;
-        };
+        theme = gtkTheme;

        iconTheme = {
          name = "elementary";
@ -379,9 +372,11 @@ in
          };
        };

-        gtk4.extraConfig = {
-          gtk-application-prefer-dark-theme = 1;
-          # gtk-cursor-theme-name = "elementary";
+        gtk4 = {
+          extraConfig = {
+            gtk-application-prefer-dark-theme = 1;
+            # gtk-cursor-theme-name = "elementary";
+          };
        };
      };
Author	SHA1	Message	Date
Erwin Boskma	f6173d7fbd	emacs: Add QML mode and tree-sitter Some checks failed / check (push) Failing after 1h10m8s Details	2024-02-15 08:36:05 +01:00
Erwin Boskma	e82ece7cba	flake.lock: Update Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/2e9b88f02ec166b1c3f0a638688f8e4ef444de32' (2024-02-05) → 'github:nix-community/disko/d07de570ba05cec2807d058daaa044f6955720c7' (2024-02-10) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/552a5b1fbcde5557b2a011956fa36fdef056fdb7' (2024-02-07) → 'github:nix-community/emacs-overlay/0f7f3b39157419f3035a2dad39fbaf8a4ba0448d' (2024-02-13) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/9f2ee8c91ac42da3ae6c6a1d21555f283458247e' (2024-02-05) → 'github:NixOS/nixpkgs/809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6' (2024-02-11) • Updated input 'home-manager': 'github:nix-community/home-manager/f99eace7c167b8a6a0871849493b1c613d0f1b80' (2024-02-05) → 'github:nix-community/home-manager/21b078306a2ab68748abf72650db313d646cf2ca' (2024-02-11) • Updated input 'microvm': 'github:astro/microvm.nix/c5074bb6d328a6071a70dcb097f8bcd208fce80a' (2024-02-04) → 'github:astro/microvm.nix/d227a91e7524db9367d0c4f2ed0656ea944bcbe7' (2024-02-10) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/6e5cc385fc8cf5ca6495d70243074ccdea9f64c7' (2024-02-06) → 'github:NixOS/nixos-hardware/2b68ccd7475362b8c8d6a1805b403033ba6273a8' (2024-02-13) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/faf912b086576fd1a15fca610166c98d47bc667e' (2024-02-05) → 'github:nixos/nixpkgs/f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8' (2024-02-11) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28) → 'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/7a94fe7690d2bdfe1aab475382a505e14dc114a6' (2024-02-07) → 'github:oxalica/rust-overlay/8dfbe2dffc28c1a18a29ffa34d5d0b269622b158' (2024-02-13) • Updated input 'sops': 'github:Mic92/sops-nix/23f61b897c00b66855074db471ba016e0cda20dd' (2024-02-04) → 'github:Mic92/sops-nix/695275c349bb27f91b2b06cb742510899c887b81' (2024-02-12) • Updated input 'sops/nixpkgs-stable': 'github:NixOS/nixpkgs/9a333eaa80901efe01df07eade2c16d183761fa3' (2024-01-22) → 'github:NixOS/nixpkgs/d8cd80616c8800feec0cab64331d7c3d5a1a6d98' (2024-02-10)	2024-02-13 14:59:29 +01:00
Erwin Boskma	2be4b97177	Fix GTK theme	2024-02-09 20:43:09 +01:00
Erwin Boskma	8f5c2f90a2	nix: Increase garbage collection to once a week	2024-02-09 20:39:15 +01:00
Erwin Boskma	c93ea5370a	loki: Fix livebook	2024-02-09 20:38:40 +01:00
Erwin Boskma	ce0e34f316	emacs: Fix TRAMP config, update next-ls config to enable completions	2024-02-09 20:37:41 +01:00