From e7d91950d23b79b9fc5808597aa04b929b535d76 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 16 Jun 2024 12:25:51 -0400 Subject: [PATCH 1/5] feat: add ags module --- flake.lock | 53 ++++++++++++++++++++++++++------ flake.nix | 1 + user/environments/nixos/home.nix | 1 + user/modules/ags/default.nix | 31 +++++++++++++++++++ 4 files changed, 77 insertions(+), 9 deletions(-) create mode 100644 user/modules/ags/default.nix diff --git a/flake.lock b/flake.lock index 4d6dab4..9df78a2 100644 --- a/flake.lock +++ b/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": [ @@ -461,7 +479,7 @@ "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "systems": "systems_2", "xdph": "xdph" }, @@ -583,7 +601,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1717067539, @@ -624,7 +642,7 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1717377936, @@ -663,6 +681,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1708475490, + "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=", @@ -678,7 +712,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1717112898, "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", @@ -692,7 +726,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1713805509, "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", @@ -708,7 +742,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1717144377, "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", @@ -723,7 +757,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -785,13 +819,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", @@ -825,7 +860,7 @@ "rust-overlay_2": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1717442957, diff --git a/flake.nix b/flake.nix index 6906103..bd23e43 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,7 @@ url = "github:JakeStanger/ironbar"; inputs.nixpkgs.follows = "nixpkgs"; }; + ags.url = "github:Aylur/ags"; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/user/environments/nixos/home.nix b/user/environments/nixos/home.nix index 49c5c92..c41636a 100644 --- a/user/environments/nixos/home.nix +++ b/user/environments/nixos/home.nix @@ -1,5 +1,6 @@ { imports = [ + ../../modules/ags ../../modules/dev.nix ../../modules/firefox.nix ../../modules/fonts.nix diff --git a/user/modules/ags/default.nix b/user/modules/ags/default.nix new file mode 100644 index 0000000..adab4d1 --- /dev/null +++ b/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 + ]; + }; +} From 8463239b3921e3596ce0794796818bc95a4ff5b3 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 26 Jun 2024 18:51:45 -0400 Subject: [PATCH 2/5] feat(applications): add libreoffice --- modules/applications/libreoffice/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 modules/applications/libreoffice/default.nix diff --git a/modules/applications/libreoffice/default.nix b/modules/applications/libreoffice/default.nix new file mode 100644 index 0000000..1bf0d54 --- /dev/null +++ b/modules/applications/libreoffice/default.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + libreoffice-qt + hunspell + hunspellDicts.uk_UA + hunspellDicts.th_TH + ]; +} From 5bb8c348626c4ca69d14edbca8e8a9ce895a228e Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 26 Jun 2024 18:52:01 -0400 Subject: [PATCH 3/5] feat(nvim/lsp): do not install rustc and cargo --- pkgs/nvim/config/lsp/lsp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/nvim/config/lsp/lsp.nix b/pkgs/nvim/config/lsp/lsp.nix index 4b1a547..9593970 100644 --- a/pkgs/nvim/config/lsp/lsp.nix +++ b/pkgs/nvim/config/lsp/lsp.nix @@ -61,8 +61,8 @@ rust-analyzer = { enable = true; - installCargo = true; - installRustc = true; + installCargo = false; + installRustc = false; settings = { checkOnSave = true; check = { From 30fc7bf0a87284c23d91121fecad1bcae135f248 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 26 Jun 2024 18:52:27 -0400 Subject: [PATCH 4/5] feat(lazyvim): add json to lint config --- user/modules/nvim/lua/plugins/lsp.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/user/modules/nvim/lua/plugins/lsp.lua b/user/modules/nvim/lua/plugins/lsp.lua index 4f2893d..ea923ed 100644 --- a/user/modules/nvim/lua/plugins/lsp.lua +++ b/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" } }, }, From 41122b7b5f3fcca527dc06b21413999404d879b8 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 26 Jun 2024 18:56:20 -0400 Subject: [PATCH 5/5] fix(services/forgejo): enable notification emails --- modules/services/forgejo/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/services/forgejo/default.nix b/modules/services/forgejo/default.nix index 6fe984c..55814e9 100644 --- a/modules/services/forgejo/default.nix +++ b/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;