Compare commits
9 commits
51b1768805
...
120787f402
| Author | SHA1 | Date | |
|---|---|---|---|
| 120787f402 | |||
0d1a446ab4
|
|||
|
dba7a5ac50
|
|||
|
f742129d4d
|
|||
|
6128c1a1e3
|
|||
|
ee15e3823e
|
|||
|
f6fd747fb3
|
|||
|
62bd8fb899
|
|||
|
bcdcabc5c4
|
7 changed files with 43 additions and 32 deletions
36
flake.lock
generated
36
flake.lock
generated
|
|
@ -156,11 +156,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737450060,
|
"lastModified": 1737536521,
|
||||||
"narHash": "sha256-eR5OAScax6/yeU/21l+v5O+XEPZqrI+BBCkeh4/B5jQ=",
|
"narHash": "sha256-EEVJhzem5B3k7qETXKPalr1m5rV0gYjbpcbyxUi1s4c=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "92864bdb1faa821eee11c341fb4b4dde7384f05a",
|
"rev": "48dd30cb0e8569b6aac98e8d206227fc15a89468",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -561,11 +561,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737461688,
|
"lastModified": 1737480538,
|
||||||
"narHash": "sha256-zQCFe5FcSSGzY3qauAAHZcPt7Ej4WSGo78ShSTCSBvU=",
|
"narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "bb14224f51ae4caed12a7b26f245d042c8cf8553",
|
"rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -821,11 +821,11 @@
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737423230,
|
"lastModified": 1737504076,
|
||||||
"narHash": "sha256-WEOiNmkcmlaeXy2HGW1PYxYmCPiHdsI7a7SpjhBYxRg=",
|
"narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "46d0fa4ded0a7532f19870f9bbedaf62269fe3f7",
|
"rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1044,11 +1044,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737062831,
|
"lastModified": 1737469691,
|
||||||
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
|
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
|
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1123,11 +1123,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_9": {
|
"nixpkgs_9": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737062831,
|
"lastModified": 1737469691,
|
||||||
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
|
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
|
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1454,11 +1454,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737103437,
|
"lastModified": 1737483750,
|
||||||
"narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
|
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
|
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -141,6 +141,12 @@
|
||||||
(add-hook 'next-error-hook #'pulsar-pulse-line)
|
(add-hook 'next-error-hook #'pulsar-pulse-line)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
(use-package visual-replace
|
||||||
|
:defer t
|
||||||
|
:bind (("C-c r" . visual-replace)
|
||||||
|
:map isearch-mode-map
|
||||||
|
("C-c r" . visual-replace-from-isearch)))
|
||||||
|
|
||||||
(use-package clipetty
|
(use-package clipetty
|
||||||
:delight
|
:delight
|
||||||
:hook (after-init . global-clipetty-mode))
|
:hook (after-init . global-clipetty-mode))
|
||||||
|
|
@ -456,11 +462,10 @@
|
||||||
(use-package magit-delta
|
(use-package magit-delta
|
||||||
:hook (magit-mode . magit-delta-mode))
|
:hook (magit-mode . magit-delta-mode))
|
||||||
|
|
||||||
;; FIXME
|
(use-package magit-todos
|
||||||
;; (use-package magit-todos
|
:after magit
|
||||||
;; :after magit
|
:custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
|
||||||
;; :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
|
:config (magit-todos-mode 1))
|
||||||
;; :config (magit-todos-mode 1))
|
|
||||||
|
|
||||||
(use-package difftastic
|
(use-package difftastic
|
||||||
:demand t
|
:demand t
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ output "eDP-1" {
|
||||||
mode "1920x1080@59.999"
|
mode "1920x1080@59.999"
|
||||||
|
|
||||||
// You can use integer or fractional scale, for example use 1.5 for 150% scale.
|
// You can use integer or fractional scale, for example use 1.5 for 150% scale.
|
||||||
scale 1.2
|
scale 1.1
|
||||||
|
|
||||||
// Transform allows to rotate the output counter-clockwise, valid values are:monitor
|
// Transform allows to rotate the output counter-clockwise, valid values are:monitor
|
||||||
// normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
|
// normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
|
||||||
|
|
@ -314,6 +314,13 @@ window-rule {
|
||||||
open-focused true
|
open-focused true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
window-rule {
|
||||||
|
match title=r#"^GPTel - Emacs$"#
|
||||||
|
opacity 0.95
|
||||||
|
open-floating true
|
||||||
|
open-focused true
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -341,7 +348,7 @@ binds {
|
||||||
Mod+B { spawn "firefox"; }
|
Mod+B { spawn "firefox"; }
|
||||||
Mod+RETURN { spawn "emacsclient" "-c" "--eval" "(ccr/start-eshell)"; }
|
Mod+RETURN { spawn "emacsclient" "-c" "--eval" "(ccr/start-eshell)"; }
|
||||||
Mod+M { spawn "emacsclient" "-c" "--eval" "(notmuch-search \"tag:new\")"; }
|
Mod+M { spawn "emacsclient" "-c" "--eval" "(notmuch-search \"tag:new\")"; }
|
||||||
Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))"; }
|
Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))" "-F" "((name . \"GPTel - Emacs\") (width . 150) (height . 60))'"; }
|
||||||
Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; }
|
Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; }
|
||||||
Mod+Alt+L { spawn "swaylock"; }
|
Mod+Alt+L { spawn "swaylock"; }
|
||||||
Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; }
|
Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; }
|
||||||
|
|
|
||||||
|
|
@ -75,8 +75,9 @@
|
||||||
"emacs"
|
"emacs"
|
||||||
"chirp"
|
"chirp"
|
||||||
"sdrangel"
|
"sdrangel"
|
||||||
|
"zmkbatx"
|
||||||
];
|
];
|
||||||
extraGroups = [ ];
|
extraGroups = [ "plugdev" ];
|
||||||
backupPaths = [ ];
|
backupPaths = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -168,6 +168,8 @@
|
||||||
algorithm = "zstd";
|
algorithm = "zstd";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hardware.rtl-sdr.enable = true;
|
||||||
|
|
||||||
# TODO move away from here (how can the interface name be retrieved programmatically?)
|
# TODO move away from here (how can the interface name be retrieved programmatically?)
|
||||||
networking.interfaces.enp11s0.wakeOnLan = {
|
networking.interfaces.enp11s0.wakeOnLan = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -11,12 +11,7 @@ let
|
||||||
inputs.emacs-overlay.overlays.emacs
|
inputs.emacs-overlay.overlays.emacs
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
pkgs-with-tree-sitter-kdl =
|
all-grammars = pkgs'.tree-sitter.withPlugins builtins.attrValues;
|
||||||
(builtins.getFlake "github:aciceri/nixpkgs/23a675ee8313427610cf129dd2b52a69bf6a2a26")
|
|
||||||
.legacyPackages.${pkgs.stdenv.system};
|
|
||||||
# TODO remove when merged: https://github.com/NixOS/nixpkgs/pull/371287/files
|
|
||||||
# all-grammars = pkgs'.tree-sitter.withPlugins builtins.attrValues;
|
|
||||||
all-grammars = pkgs-with-tree-sitter-kdl.tree-sitter.withPlugins builtins.attrValues;
|
|
||||||
treesitGrammars = pkgs'.runCommand "treesit-grammars" { } ''
|
treesitGrammars = pkgs'.runCommand "treesit-grammars" { } ''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
for f in ${all-grammars}/*
|
for f in ${all-grammars}/*
|
||||||
|
|
|
||||||
|
|
@ -184,6 +184,7 @@ let
|
||||||
telega
|
telega
|
||||||
aggressive-indent
|
aggressive-indent
|
||||||
mixed-pitch
|
mixed-pitch
|
||||||
|
visual-replace
|
||||||
# org-re-reveal # FIXME very not nice hash mismatch when building
|
# org-re-reveal # FIXME very not nice hash mismatch when building
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue