Merge branch 'main' of https://git.thomasfmly.org/michael/nix-dots

flake.lock

@@ -23,6 +23,24 @@
         "type": "github"
       }
     },
+    "ags": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1715703984,
+        "narHash": "sha256-0BZkMui6aCqswMCouvp0G90tAxDOxVnxTvG6TDZsDaI=",
+        "owner": "Aylur",
+        "repo": "ags",
+        "rev": "11150225e62462bcd431d1e55185e810190a730a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -430,7 +448,7 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "systems": "systems_2",
         "xdph": "xdph"
       },
@@ -581,7 +599,7 @@
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1717067539,
@@ -622,7 +640,7 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1719624269,
@@ -662,8 +680,24 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719075281,
+        "lastModified": 1708475490,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1716330097,
+        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
@@ -676,7 +710,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1717112898,
         "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
@@ -690,7 +724,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1713805509,
         "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
@@ -706,7 +740,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1719426051,
         "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
@@ -721,7 +755,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1718428119,
         "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
@@ -783,13 +817,14 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "ags": "ags",
         "darwin": "darwin_2",
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
         "ironbar": "ironbar",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nixvim": "nixvim",
         "nur": "nur",
         "rust-overlay": "rust-overlay_2",

flake.nix

@@ -29,6 +29,7 @@
       url = "github:JakeStanger/ironbar";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    ags.url = "github:Aylur/ags";
     agenix = {
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";

modules/applications/libreoffice/default.nix

@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    libreoffice-qt
+    hunspell
+    hunspellDicts.uk_UA
+    hunspellDicts.th_TH
+  ];
+}

modules/services/forgejo/default.nix

@@ -80,6 +80,10 @@ in {
         };
         settings.service = {
           DISABLE_REGISTRATION = true;
+          ENABLE_NOTIFY_MAIL = true;
+        };
+        settings.admin = {
+          DEFAULT_EMAIL_NOTIFICATIONS = "onmention";
         };
         settings.openid = {
           ENABLE_OPENID_SIGNIN = true;

pkgs/nvim/config/lsp/lsp.nix

@@ -63,8 +63,8 @@
 
         rust-analyzer = {
           enable = true;
-          installCargo = true;
+          installCargo = false;
-          installRustc = true;
+          installRustc = false;
           settings = {
             checkOnSave = true;
             check = {

user/environments/nixos/home.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ../../modules/ags
     ../../modules/dev.nix
     ../../modules/firefox.nix
     ../../modules/fonts.nix

user/modules/ags/default.nix

@@ -0,0 +1,31 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [inputs.ags.homeManagerModules.default];
+
+  programs.ags = {
+    enable = true;
+
+    extraPackages = with pkgs; [
+      bun
+      which
+      dart-sass
+      fd
+      fzf
+      brightnessctl
+      swww
+      # inputs.matugen.packages.${system}.default
+      slurp
+      wf-recorder
+      wl-clipboard
+      wayshot
+      swappy
+      hyprpicker
+      pavucontrol
+      networkmanager
+      gtk3
+    ];
+  };
+}

user/modules/nvim/lua/plugins/lsp.lua

@@ -70,6 +70,7 @@ return {
         javascriptreact = { { "prettierd", "prettier" } },
         typescript = { { "prettierd", "prettier" } },
         typescriptreact = { { "prettierd", "prettier" } },
+        json = { { "prettierd", "prettier" } },
         yaml = { { "prettierd", "prettier" } },
         css = { { "prettierd", "prettier" } },
         markdown = { { "prettierd", "prettier" } },