Compare commits

..

No commits in common. "5570e49412301ac34cb5e7d2806aae9ec9116195" and "bef375ef43988a8bfff2d8fccdd173661f42ba92" have entirely different histories.

9 changed files with 69 additions and 138 deletions

View file

@ -53,11 +53,11 @@
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1720809814,
"narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
"lastModified": 1696727917,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
"type": "github"
},
"original": {
@ -117,11 +117,11 @@
"blocklist-hosts": {
"flake": false,
"locked": {
"lastModified": 1721090606,
"narHash": "sha256-tS7CDuotk+aAbtOR1x3u3ymyRvPgb3GZjuDcJNm6lZs=",
"lastModified": 1720371934,
"narHash": "sha256-30Hl4Llh1wetlW3au2/bRR+/m5P9D7QvLGFWAYHKbKs=",
"owner": "StevenBlack",
"repo": "hosts",
"rev": "87af2c503dbd86ec8b1f7c70ae005a1dae422a60",
"rev": "67448bdb863d266fd6031f1330c8958d84eba1a2",
"type": "github"
},
"original": {
@ -472,11 +472,11 @@
]
},
"locked": {
"lastModified": 1721135958,
"narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
"lastModified": 1720327769,
"narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
"rev": "6b7ce96f34b324e4e104abc30d06955d216bac71",
"type": "github"
},
"original": {
@ -832,10 +832,7 @@
"nix-on-droid",
"nixpkgs"
],
"nmd": [
"nix-on-droid",
"nmd"
],
"nmd": "nmd",
"nmt": "nmt"
},
"locked": {
@ -863,14 +860,14 @@
],
"nixpkgs-docs": "nixpkgs-docs",
"nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
"nmd": "nmd"
"nmd": "nmd_2"
},
"locked": {
"lastModified": 1720964831,
"narHash": "sha256-UwVKfjrQ6FWTuqks6lF4+VlzPFDC/GR1Ti/iBKTEQco=",
"lastModified": 1720396533,
"narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
"owner": "nix-community",
"repo": "nix-on-droid",
"rev": "c00333ee42aa2b4d4825e0388a1049fdeeded6c6",
"rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
"type": "github"
},
"original": {
@ -899,11 +896,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"lastModified": 1720031269,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github"
},
"original": {
@ -946,11 +943,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1721226092,
"narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
"lastModified": 1720954236,
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c716603a63aca44f39bef1986c13402167450e0a",
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
"type": "github"
},
"original": {
@ -992,6 +989,22 @@
}
},
"nmd": {
"flake": false,
"locked": {
"lastModified": 1666190571,
"narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
"owner": "rycee",
"repo": "nmd",
"rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmd",
"type": "gitlab"
}
},
"nmd_2": {
"inputs": {
"nixpkgs": [
"nix-on-droid",
@ -1338,11 +1351,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1721269159,
"narHash": "sha256-eHrGuKZKQb762qdCkrfoyyxXLKumYhiXJca1ig0RftE=",
"lastModified": 1720405186,
"narHash": "sha256-7D57KwmTIbsopE/1g8hFeIbVoeJGgU3wfuGYvTlNQG4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "c3e217122ac55680606d69bc693bdf262f14f602",
"rev": "f0ca58b37ff4179ce4587589c32205764d9b4a4f",
"type": "github"
},
"original": {
@ -1398,11 +1411,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1720818679,
"narHash": "sha256-u9PqY7O6TN42SLeb0e6mnYAgQOoQmclaVSHfLKMpmu0=",
"lastModified": 1719525570,
"narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=",
"owner": "danth",
"repo": "stylix",
"rev": "29148118cc33f08b71058e1cda7ca017f5300b51",
"rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116",
"type": "github"
},
"original": {

View file

@ -1,6 +1,6 @@
diff -crB nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix nixpkgs-patched/pkgs/applications/editors/emacs/build-support/generic.nix
*** nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix 2023-09-08 20:42:24.476059868 -0500
--- nixpkgs-patched/pkgs/applications/editors/emacs/build-support/generic.nix 2023-09-08 21:12:46.637645595 -0500
diff -crB nixpkgs/pkgs/build-support/emacs/generic.nix nixpkgs-patched/pkgs/build-support/emacs/generic.nix
*** nixpkgs/pkgs/build-support/emacs/generic.nix 2023-09-08 20:42:24.476059868 -0500
--- nixpkgs-patched/pkgs/build-support/emacs/generic.nix 2023-09-08 21:12:46.637645595 -0500
***************
*** 3,9 ****
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:

View file

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-stable, pkgs-kdenlive, userSettings, ... }:
{ config, pkgs, pkgs-kdenlive, userSettings, ... }:
{
# Home Manager needs a bit of information about you and the paths it should
@ -111,19 +111,19 @@
pinta
krita
inkscape
(pkgs-stable.lollypop.override { youtubeSupport = false; })
musikcube
vlc
mpv
yt-dlp
blender-hip
# cura is moderately broken on wayland, so use xwayland
(pkgs-stable.cura.overrideAttrs (oldAttrs: {
(pkgs.cura.overrideAttrs (oldAttrs: {
postInstall = oldAttrs.postInstall + ''cp -rf ${(pkgs.makeDesktopItem {
name = "com.ultimaker.cura";
icon = "cura-icon";
desktopName = "Cura";
exec = "env QT_QPA_PLATFORM=xcb ${pkgs-stable.cura}/bin/cura %F";
tryExec = "env QT_QPA_PLATFORM=xcb ${pkgs-stable.cura}/bin/cura";
exec = "env QT_QPA_PLATFORM=xcb ${pkgs.cura}/bin/cura %F";
tryExec = "env QT_QPA_PLATFORM=xcb ${pkgs.cura}/bin/cura";
terminal = false;
type = "Application";
categories = ["Graphics"];
@ -133,8 +133,8 @@
"model/gltf+json" "model/vnd.collada+xml+zip"];
})}/share/applications $out/share'';
}))
(pkgs.writeShellScriptBin "curax" ''env QT_QPA_PLATFORM=xcb ${pkgs-stable.cura}/bin/cura'')
(pkgs-stable.curaengine_stable)
(pkgs.writeShellScriptBin "curax" ''env QT_QPA_PLATFORM=xcb ${pkgs.cura}/bin/cura'')
curaengine_stable
openscad
(stdenv.mkDerivation {
name = "cura-slicer";
@ -154,7 +154,7 @@
sed -i 's+#!/usr/bin/perl+#! /usr/bin/env nix-shell\n#! nix-shell -i perl -p perl538 perl538Packages.JSON+g' $out/bin/cura-slicer
sed -i 's+/usr/share+/home/${userSettings.username}/.nix-profile/share+g' $out/bin/cura-slicer
'';
propagatedBuildInputs = with pkgs-stable; [
propagatedBuildInputs = with pkgs; [
curaengine_stable
];
})

View file

@ -5,7 +5,7 @@
fonts.packages = with pkgs; [
# Fonts
nerdfonts
# powerline # FIXME broken by python 311 -> 312 nixpkgs update
powerline
];
}

View file

@ -116,7 +116,7 @@ if (os.path.isfile(secretFile)):
secretsExists = True
config.set('qt.args',['ignore-gpu-blacklist','enable-gpu-rasterization','enable-native-gpu-memory-buffers','num-raster-threads=4'])
config.load_autoconfig(True)
config.load_autoconfig(False)
base00 = "#''+config.lib.stylix.colors.base00+''"
base01 = "#''+config.lib.stylix.colors.base01+''"

View file

@ -1050,12 +1050,13 @@ If the path from LINK does not exist, nil is returned."
;; Custom styles for dates in agenda
(custom-set-faces!
'(org-agenda-date :inherit outline-1 :height 1.15)
'(org-agenda-date-today :inherit outline-2 :height 1.15)
'(org-agenda-date-weekend :inherit outline-1 :height 1.15)
'(org-agenda-date-weekend-today :inherit outline-2 :height 1.15)
'(org-agenda-date-today :inherit diary :height 1.15)
'(org-agenda-date-weekend :ineherit outline-2 :height 1.15)
'(org-agenda-date-weekend-today :inherit outline-4 :height 1.15)
'(org-super-agenda-header :inherit custom-button :weight bold :height 1.05)
`(link :foreground unspecified :underline nil :background ,(nth 1 (nth 7 doom-themes--colors)))
'(org-link :foreground unspecified))
'(org-link :foreground unspecified)
)
;; Toggle completed entries function
(defun org-agenda-toggle-completed ()
@ -1502,11 +1503,6 @@ If the path from LINK does not exist, nil is returned."
(require 'nix-mode)
(require 'gdscript-mode)
(add-hook 'nix-mode-hook 'lsp-deferred)
(add-hook 'gdscript-mode-hook 'lsp-deferred)
(setq gdscript-godot-executable "godot4")
(setq lsp-java-workspace-dir (concat user-home-directory "/.local/share/doom/java-workspace"))
(setq lsp-treemacs-deps-position-params
@ -1524,37 +1520,6 @@ If the path from LINK does not exist, nil is returned."
(setq +format-on-save-enabled-modes '(not emacs-lisp-mode sql-mode tex-mode latex-mode org-msg-edit-mode nix-mode))
(defun lsp-booster--advice-json-parse (old-fn &rest args)
"Try to parse bytecode instead of json."
(or
(when (equal (following-char) ?#)
(let ((bytecode (read (current-buffer))))
(when (byte-code-function-p bytecode)
(funcall bytecode))))
(apply old-fn args)))
(advice-add (if (progn (require 'json)
(fboundp 'json-parse-buffer))
'json-parse-buffer
'json-read)
:around
#'lsp-booster--advice-json-parse)
(defun lsp-booster--advice-final-command (old-fn cmd &optional test?)
"Prepend emacs-lsp-booster command to lsp CMD."
(let ((orig-result (funcall old-fn cmd test?)))
(if (and (not test?) ;; for check lsp-server-present?
(not (file-remote-p default-directory)) ;; see lsp-resolve-final-command, it would add extra shell wrapper
lsp-use-plists
(not (functionp 'json-rpc-connection)) ;; native json-rpc
(executable-find "emacs-lsp-booster"))
(progn
(when-let ((command-from-exec-path (executable-find (car orig-result)))) ;; resolve command from exec-path (in case not found in $PATH)
(setcar orig-result command-from-exec-path))
(message "Using emacs-lsp-booster for %s!" orig-result)
(cons "emacs-lsp-booster" orig-result))
orig-result)))
(advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command)
(add-to-list 'tramp-remote-path 'tramp-own-remote-path)
(after! vterm
(add-to-list 'vterm-tramp-shells '("ssh" "zsh")) ;; I use zsh on all my servers

View file

@ -47,7 +47,6 @@ in
};
home.packages = (with pkgs-emacs; [
emacs-lsp-booster
nil
nixfmt
file

View file

@ -1222,12 +1222,13 @@ On Wayland, EAF doesn't work.
;; Custom styles for dates in agenda
(custom-set-faces!
'(org-agenda-date :inherit outline-1 :height 1.15)
'(org-agenda-date-today :inherit outline-2 :height 1.15)
'(org-agenda-date-weekend :inherit outline-1 :height 1.15)
'(org-agenda-date-weekend-today :inherit outline-2 :height 1.15)
'(org-agenda-date-today :inherit diary :height 1.15)
'(org-agenda-date-weekend :ineherit outline-2 :height 1.15)
'(org-agenda-date-weekend-today :inherit outline-4 :height 1.15)
'(org-super-agenda-header :inherit custom-button :weight bold :height 1.05)
`(link :foreground unspecified :underline nil :background ,(nth 1 (nth 7 doom-themes--colors)))
'(org-link :foreground unspecified))
'(org-link :foreground unspecified)
)
;; Toggle completed entries function
(defun org-agenda-toggle-completed ()
@ -1774,11 +1775,6 @@ I don't have this active right now since it's kinda weird with pgtk...
(require 'nix-mode)
(require 'gdscript-mode)
(add-hook 'nix-mode-hook 'lsp-deferred)
(add-hook 'gdscript-mode-hook 'lsp-deferred)
(setq gdscript-godot-executable "godot4")
(setq lsp-java-workspace-dir (concat user-home-directory "/.local/share/doom/java-workspace"))
(setq lsp-treemacs-deps-position-params
@ -1796,37 +1792,6 @@ I don't have this active right now since it's kinda weird with pgtk...
(setq +format-on-save-enabled-modes '(not emacs-lisp-mode sql-mode tex-mode latex-mode org-msg-edit-mode nix-mode))
(defun lsp-booster--advice-json-parse (old-fn &rest args)
"Try to parse bytecode instead of json."
(or
(when (equal (following-char) ?#)
(let ((bytecode (read (current-buffer))))
(when (byte-code-function-p bytecode)
(funcall bytecode))))
(apply old-fn args)))
(advice-add (if (progn (require 'json)
(fboundp 'json-parse-buffer))
'json-parse-buffer
'json-read)
:around
#'lsp-booster--advice-json-parse)
(defun lsp-booster--advice-final-command (old-fn cmd &optional test?)
"Prepend emacs-lsp-booster command to lsp CMD."
(let ((orig-result (funcall old-fn cmd test?)))
(if (and (not test?) ;; for check lsp-server-present?
(not (file-remote-p default-directory)) ;; see lsp-resolve-final-command, it would add extra shell wrapper
lsp-use-plists
(not (functionp 'json-rpc-connection)) ;; native json-rpc
(executable-find "emacs-lsp-booster"))
(progn
(when-let ((command-from-exec-path (executable-find (car orig-result)))) ;; resolve command from exec-path (in case not found in $PATH)
(setcar orig-result command-from-exec-path))
(message "Using emacs-lsp-booster for %s!" orig-result)
(cons "emacs-lsp-booster" orig-result))
orig-result)))
(advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command)
#+END_SRC
** Terminal
#+BEGIN_SRC emacs-lisp :tangle config.el
@ -2171,7 +2136,6 @@ in
};
home.packages = (with pkgs-emacs; [
emacs-lsp-booster
nil
nixfmt
file

View file

@ -173,11 +173,6 @@ in
bind=SUPERSHIFT,K,exec,hyprctl kill
bind=SUPER,W,exec,nwg-dock-wrapper
bind=,code:172,exec,lollypop -t
bind=,code:174,exec,lollypop -s
bind=,code:171,exec,lollypop -n
bind=,code:173,exec,lollypop -p
bind = SUPER,R,pass,^(com\.obsproject\.Studio)$
bind = SUPERSHIFT,R,pass,^(com\.obsproject\.Studio)$
@ -264,7 +259,7 @@ in
bind=SUPER,Z,exec,pypr toggle term && hyprctl dispatch bringactivetotop
bind=SUPER,F,exec,pypr toggle ranger && hyprctl dispatch bringactivetotop
bind=SUPER,N,exec,pypr toggle numbat && hyprctl dispatch bringactivetotop
bind=SUPER,M,exec,pypr toggle music && hyprctl dispatch bringactivetotop
bind=SUPER,M,exec,pypr toggle musikcube && hyprctl dispatch bringactivetotop
bind=SUPER,B,exec,pypr toggle btm && hyprctl dispatch bringactivetotop
bind=SUPER,D,exec,hypr-element
bind=SUPER,code:172,exec,pypr toggle pavucontrol && hyprctl dispatch bringactivetotop
@ -280,10 +275,6 @@ in
windowrulev2 = size 85% 90%,class:^(Element)$
windowrulev2 = center,class:^(Element)$
windowrulev2 = float,class:^(lollypop)$
windowrulev2 = size 85% 90%,class:^(lollypop)$
windowrulev2 = center,class:^(lollypop)$
$savetodisk = title:^(Save to Disk)$
windowrulev2 = float,$savetodisk
windowrulev2 = size 70% 75%,$savetodisk
@ -308,7 +299,6 @@ in
windowrulev2 = opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1
windowrulev2 = opacity 0.85,class:^(Element)$
windowrulev2 = opacity 0.85,class:^(lollypop)$
windowrulev2 = opacity 1.0,class:^(Brave-browser),fullscreen:1
windowrulev2 = opacity 1.0,class:^(librewolf),fullscreen:1
windowrulev2 = opacity 0.85,title:^(My Local Dashboard Awesome Homepage - qutebrowser)$
@ -736,8 +726,8 @@ in
command = "alacritty --class scratchpad -e numbat"
margin = 50
[scratchpads.music]
command = "lollypop"
[scratchpads.musikcube]
command = "alacritty --class scratchpad -e musikcube"
margin = 50
[scratchpads.btm]
@ -806,7 +796,7 @@ in
"9" = "󱎓";
"scratch_term" = "_";
"scratch_ranger" = "_󰴉";
"scratch_music" = "_";
"scratch_musikcube" = "_";
"scratch_btm" = "_";
"scratch_pavucontrol" = "_󰍰";
};