summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-08-20 18:13:34 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2024-08-20 18:13:34 +0200
commit08f1b760858371149784df6b399b8fbba7bbae55 (patch)
tree8f1a493fa68cd4d075c009664ba1c7a348d04bb8
parentf4fb1e159c422fbc966bf6631b907036304699d0 (diff)
downloadnixos-08f1b760858371149784df6b399b8fbba7bbae55.tar
nixos-08f1b760858371149784df6b399b8fbba7bbae55.tar.gz
nixos-08f1b760858371149784df6b399b8fbba7bbae55.tar.bz2
nixos-08f1b760858371149784df6b399b8fbba7bbae55.tar.xz
nixos-08f1b760858371149784df6b399b8fbba7bbae55.zip
...
-rw-r--r--_sources/generated.json6
-rw-r--r--_sources/generated.nix6
-rw-r--r--accounts/gkleen@sif/default.nix12
-rw-r--r--accounts/gkleen@sif/zshrc1
-rw-r--r--nvfetcher.toml2
-rw-r--r--overlays/gup.nix8
-rw-r--r--shell.nix2
-rw-r--r--system-profiles/core/default.nix2
8 files changed, 26 insertions, 13 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index 2720c8d2..934d83a2 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -105,11 +105,11 @@
105 "passthru": null, 105 "passthru": null,
106 "pinned": false, 106 "pinned": false,
107 "src": { 107 "src": {
108 "sha256": "sha256-O9Z4ctYL9v0cgQQ0czYU1Gg+sNbd3jwUSI/Luu+MHcI=", 108 "sha256": "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=",
109 "type": "tarball", 109 "type": "tarball",
110 "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.13.tar.gz" 110 "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.14.tar.gz"
111 }, 111 },
112 "version": "2.13" 112 "version": "2.14"
113 }, 113 },
114 "mpv-autosave": { 114 "mpv-autosave": {
115 "cargoLocks": null, 115 "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 8bbe4a22..d4d97c03 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -61,10 +61,10 @@
61 }; 61 };
62 lesspipe = { 62 lesspipe = {
63 pname = "lesspipe"; 63 pname = "lesspipe";
64 version = "2.13"; 64 version = "2.14";
65 src = fetchTarball { 65 src = fetchTarball {
66 url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.13.tar.gz"; 66 url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.14.tar.gz";
67 sha256 = "sha256-O9Z4ctYL9v0cgQQ0czYU1Gg+sNbd3jwUSI/Luu+MHcI="; 67 sha256 = "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=";
68 }; 68 };
69 }; 69 };
70 mpv-autosave = { 70 mpv-autosave = {
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 214b18a1..ed0de55b 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -163,7 +163,7 @@ in {
163 enable = true; 163 enable = true;
164 package = pkgs.emacs29-pgtk; 164 package = pkgs.emacs29-pgtk;
165 extraPackages = epkgs: with epkgs; [ 165 extraPackages = epkgs: with epkgs; [
166 evil evil-dvorak undo-tree magit haskell-mode nix-mode 166 evil evil-dvorak undo-tree magit haskell-tng-mode nix-mode
167 yaml-mode json-mode shakespeare-mode smart-mode-line 167 yaml-mode json-mode shakespeare-mode smart-mode-line
168 highlight-parentheses highlight-symbol ag sass-mode lua-mode 168 highlight-parentheses highlight-symbol ag sass-mode lua-mode
169 fira-code-mode use-package wanderlust # notmuch 169 fira-code-mode use-package wanderlust # notmuch
@@ -171,6 +171,7 @@ in {
171 edit-server mediawiki editorconfig typescript-mode 171 edit-server mediawiki editorconfig typescript-mode
172 markdown-mode nftables-mode rustic lsp-mode lsp-ui 172 markdown-mode nftables-mode rustic lsp-mode lsp-ui
173 direnv company projectile tomorrow-night-paradise-theme 173 direnv company projectile tomorrow-night-paradise-theme
174 treesit-grammars.with-all-grammars
174 ]; 175 ];
175 overrides = self: super: { 176 overrides = self: super: {
176 tomorrow-night-paradise-theme = super.trivialBuild { 177 tomorrow-night-paradise-theme = super.trivialBuild {
@@ -558,7 +559,7 @@ in {
558 socketActivation.enable = true; 559 socketActivation.enable = true;
559 client = { 560 client = {
560 enable = true; 561 enable = true;
561 arguments = mkForce ["-a" "\"\""]; 562 arguments = mkForce ["--reuse-frame" "--alternate-editor" "\"\""];
562 }; 563 };
563 }; 564 };
564 gpg-agent = { 565 gpg-agent = {
@@ -693,7 +694,7 @@ in {
693 ]; 694 ];
694 695
695 file = { 696 file = {
696 ".emacs".source = ./emacs.el; 697 ".emacs.d/init.el".source = ./emacs.el;
697 ".backup-munin".source = ./backup-patterns; 698 ".backup-munin".source = ./backup-patterns;
698 ".mozilla/firefox/default/chrome/userChrome.css".source = ./firefox-chrome.css; 699 ".mozilla/firefox/default/chrome/userChrome.css".source = ./firefox-chrome.css;
699 ".mozilla/firefox/default/chrome/userContent.css".source = ./firefox-content.css; 700 ".mozilla/firefox/default/chrome/userContent.css".source = ./firefox-content.css;
@@ -711,6 +712,11 @@ in {
711 QT_QPA_PLATFORMTHEME = "qt5ct"; 712 QT_QPA_PLATFORMTHEME = "qt5ct";
712 LIBVIRT_DEFAULT_URI = "qemu:///system"; 713 LIBVIRT_DEFAULT_URI = "qemu:///system";
713 STACK_XDG = 1; 714 STACK_XDG = 1;
715 EDITOR = pkgs.writeShellScript "editor" ''
716 args=("--reuse-frame" "--alternate-editor" "")
717 args+=("$@")
718 exec -a emacsclient ${cfg.services.emacs.package}/bin/emacsclient "''${args[@]}"
719 '';
714 }; 720 };
715 721
716 extraProfileCommands = '' 722 extraProfileCommands = ''
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index 82e66337..91c177c3 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -309,7 +309,6 @@ alias -g B='&> /dev/null &'
309alias -g BB='&> /dev/null &!' 309alias -g BB='&> /dev/null &!'
310 310
311export DEFAULT_USER=gkleen 311export DEFAULT_USER=gkleen
312export EDITOR=emacsclient
313 312
314bindkey -e 313bindkey -e
315bindkey ';5C' emacs-forward-word 314bindkey ';5C' emacs-forward-word
diff --git a/nvfetcher.toml b/nvfetcher.toml
index c8b5efac..dcf5bd64 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -97,4 +97,4 @@ fetch.git = "https://github.com/jimeh/tomorrow-night-paradise-theme.el"
97[emoji-data] 97[emoji-data]
98src.github_tag = "Mange/emoji-data" 98src.github_tag = "Mange/emoji-data"
99fetch.github = "Mange/emoji-data" 99fetch.github = "Mange/emoji-data"
100git.fetchSubmodules = true \ No newline at end of file 100git.fetchSubmodules = true
diff --git a/overlays/gup.nix b/overlays/gup.nix
new file mode 100644
index 00000000..9f738442
--- /dev/null
+++ b/overlays/gup.nix
@@ -0,0 +1,8 @@
1{ final, prev, sources, ... }: {
2 gup = prev.gup.overrideAttrs (oldAttrs: rec {
3 PYLINTRC = prev.writeText "pylintrc" ''
4 [MESSAGES CONTROL]
5 disable=E0606
6 '';
7 });
8}
diff --git a/shell.nix b/shell.nix
index 005187c7..5bcb8180 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,7 +7,7 @@ in pkgs.mkShell {
7 nativeBuildInputs = builtins.attrValues self.packages.${system} ++ (with pkgs; [ 7 nativeBuildInputs = builtins.attrValues self.packages.${system} ++ (with pkgs; [
8 sops 8 sops
9 wireguard-tools 9 wireguard-tools
10 # gup 10 gup
11 nftables 11 nftables
12 deploy-rs.packages.${system}.deploy-rs 12 deploy-rs.packages.${system}.deploy-rs
13 knot-dns 13 knot-dns
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix
index b1898903..63b9a2b5 100644
--- a/system-profiles/core/default.nix
+++ b/system-profiles/core/default.nix
@@ -147,7 +147,7 @@ in {
147 ).defaultNix.overlays 147 ).defaultNix.overlays
148 ''}" 148 ''}"
149 "L+ /etc/nixos - - - - ${flake}" 149 "L+ /etc/nixos - - - - ${flake}"
150 ]; 150 ] ++ map (input: "L+ /run/flake-inputs/${input} - - - - ${flakeInputs.${input}.outPath}") (attrNames flakeInputs);
151 151
152 users.mutableUsers = false; 152 users.mutableUsers = false;
153 153