From b4cdc7b109a78d8955998c84b50d7342558f3ce0 Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Mon, 3 Feb 2025 22:55:50 -0800 Subject: [PATCH 1/4] emacs: update to emacs 30 --- modules/emacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index 68acdf3..b6d8ebd 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -12,8 +12,8 @@ src = pkgs.fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "4be180759ec13651f72bacee65fa477c64222a1a"; - sha256 = "qc9InFEQgeFfFReJuQd8WjTNK4fFMEaWcqQUcGxxuBI="; + rev = "0ad33e32ae9726e151d16ca20ba3e507ff65e01f"; + sha256 = "LhehKOhCDPExEgEiOj3TiuFk8/DohzYhy/9GmUSxaIg="; }; }; }; @@ -62,7 +62,7 @@ custom-emacs = with newpkgs; - ((emacsPackagesFor (emacs29-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [ + ((emacsPackagesFor (emacs30-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [ avy better-jumper company From 8a47ecd4691ad1eff33cf484bb3e18e7c82de170 Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Fri, 28 Feb 2025 16:47:53 -0800 Subject: [PATCH 2/4] emacs: add haskell and zig devtools --- modules/emacs/default.nix | 5 +++++ modules/user/dev-support.nix | 2 ++ 2 files changed, 7 insertions(+) diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index b6d8ebd..1e832fb 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -31,6 +31,7 @@ tree-sitter-dot tree-sitter-elisp tree-sitter-glsl + tree-sitter-haskell tree-sitter-html tree-sitter-java tree-sitter-javascript @@ -58,6 +59,7 @@ tree-sitter-astro tree-sitter-vim tree-sitter-yaml + tree-sitter-zig ]; custom-emacs = @@ -79,11 +81,13 @@ fussy glsl-mode groovy-mode + haskell-ts-mode just-mode kotlin-mode lsp-mode lsp-treemacs lsp-ui + lsp-haskell lsp-java magit markdown-mode @@ -104,6 +108,7 @@ vertico which-key ws-butler + zig-ts-mode ])); in { home-manager.users.${config.main-user} = { diff --git a/modules/user/dev-support.nix b/modules/user/dev-support.nix index c93011f..2c57f34 100644 --- a/modules/user/dev-support.nix +++ b/modules/user/dev-support.nix @@ -6,7 +6,9 @@ kotlin-language-server typescript-language-server astro-language-server + haskell-language-server glslls + zls bear gdb From 5f26ed052438652c4a9df981c0828beeac257ac8 Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Fri, 28 Feb 2025 16:49:57 -0800 Subject: [PATCH 3/4] system/msi: fix mcontrolcenter not appearing in tray --- systems/msi/mcontrolcenter.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systems/msi/mcontrolcenter.nix b/systems/msi/mcontrolcenter.nix index a7e8aef..bf7cdae 100644 --- a/systems/msi/mcontrolcenter.nix +++ b/systems/msi/mcontrolcenter.nix @@ -11,8 +11,9 @@ systemd.user.services.mcontrolcenter = { description = "Launch mcontrolcenter"; requires = [ "tray.target" ]; - after = [ "graphical-session-pre.target" "tray.target" ]; + after = [ "tray.target" ]; partOf = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; script = lib.getExe pkgs.mcontrolcenter; }; } From ac00b175c94fe0d63f5de47865c38d9280205fc8 Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Fri, 28 Feb 2025 16:53:28 -0800 Subject: [PATCH 4/4] switch from bitwarden to keepassxc --- modules/user/general.nix | 3 ++- modules/user/modules/firefox/default.nix | 6 +++--- modules/user/modules/keepassxc/default.nix | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 modules/user/modules/keepassxc/default.nix diff --git a/modules/user/general.nix b/modules/user/general.nix index 196d820..b4f18f0 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -38,6 +38,7 @@ programs.ssh = { enableAskPassword = true; askPassword = lib.getExe pkgs.lxqt.lxqt-openssh-askpass; + startAgent = true; }; systemd = { @@ -103,6 +104,7 @@ ./modules/dolphin ./modules/firefox ./modules/element.nix + ./modules/keepassxc ./dev-support.nix ]; @@ -117,7 +119,6 @@ curl cantata logseq - bitwarden lxqt.pavucontrol-qt helvum htop diff --git a/modules/user/modules/firefox/default.nix b/modules/user/modules/firefox/default.nix index 0120f51..49f22e2 100755 --- a/modules/user/modules/firefox/default.nix +++ b/modules/user/modules/firefox/default.nix @@ -220,7 +220,7 @@ in { settings = modules.general; extensions = with pkgs.nur.repos.rycee.firefox-addons; with extra-addons; [ - bitwarden + keepassxc-browser darkreader github-reposize sidebery @@ -251,7 +251,7 @@ in { settings = modules.trusted; extensions = with pkgs.nur.repos.rycee.firefox-addons; with extra-addons; [ - bitwarden + keepassxc-browser darkreader github-reposize sidebery @@ -268,7 +268,7 @@ in { settings = modules.trusted; extensions = with pkgs.nur.repos.rycee.firefox-addons; with extra-addons; [ - bitwarden + keepassxc-browser darkreader github-reposize sidebery diff --git a/modules/user/modules/keepassxc/default.nix b/modules/user/modules/keepassxc/default.nix new file mode 100644 index 0000000..20b213c --- /dev/null +++ b/modules/user/modules/keepassxc/default.nix @@ -0,0 +1,16 @@ +{ lib, pkgs, ... }: let + keepassxc = pkgs.keepassxc.overrideAttrs (prev: { + patches = prev.patches ++ [ + (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/keepassxreboot/keepassxc/pull/11692.patch"; + sha256 = "S/Oy4dAxER2NkoJQYAdsz5rphn5SW2TH50F//5Xmf+Y="; + }) + (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/keepassxreboot/keepassxc/pull/11693.patch"; + sha256 = "SV4DX/EzJBjFKvcw0TjTw6V5Xex/d5gc7oFa0JGGOts="; + }) + ]; + }); +in { + home.packages = [ keepassxc ]; +}