byteio/nixos-config
1
0
Fork 0
mirror of https://github.com/librephoenix/nixos-config synced 2025-01-19 07:05:51 +05:30
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: byteio:88caf2356fd930fd203b1dfcdf2c44d85a83db84
Branches Tags
byteio:main
...
compare: byteio:020ba9b3b76d9a0584cd80272334c406cd977e14
Branches Tags
byteio:main

14 commits
88caf2356f ... 020ba9b3b7

Author SHA1 Message Date
D.A.Pelasgus 020ba9b3b7
Merge 6d10a848cf into 5570e49412 2024-07-21 02:43:05 +00:00
Emmet 5570e49412 Fix org agenda date faces 2024-07-20 11:34:21 -05:00
Emmet 868b0db976 Trying lsp-booster 2024-07-20 11:34:13 -05:00
Emmet cabfed6f4b Switched audio player 2024-07-20 11:33:05 -05:00
Emmet da89ee5f38 Updated system 2024-07-20 11:32:34 -05:00
Emmet 67d1ea26b4 Use autoconfig on qb 2024-07-18 07:20:22 -05:00
Emmet bef375ef43 Fixes for permissions scripts 2024-07-16 10:02:28 -05:00
Emmet c0f7854c2c Updated home-manager-stable lock 2024-07-16 09:58:42 -05:00
Emmet 8cec3e5299 Fixes server rebuild error 2024-07-16 08:41:20 -05:00
Emmet 35c5e4f00b Fixes stable home-manager ver 2024-07-16 08:38:11 -05:00
Emmet 8f739d1583 Bumped stable to 24.05 and added unstable for servers 2024-07-16 08:36:19 -05:00
Emmet ba2f97ab31 Select roam dashboard/inbox from title 2024-07-16 08:33:30 -05:00
Emmet b6f621c964 Open ports for syncthing 2024-07-15 10:42:20 -05:00
D.A.Pelasgus 6d10a848cf
Update install.org 
Spelling mistake
 2024-07-01 02:48:03 +03:00
15 changed files with 200 additions and 103 deletions
Show stats Expand all files Collapse all files

81
flake.lock
View file

@ -53,11 +53,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696727917, "lastModified": 1720809814,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1720371934, "lastModified": 1721090606,
"narHash": "sha256-30Hl4Llh1wetlW3au2/bRR+/m5P9D7QvLGFWAYHKbKs=", "narHash": "sha256-tS7CDuotk+aAbtOR1x3u3ymyRvPgb3GZjuDcJNm6lZs=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "67448bdb863d266fd6031f1330c8958d84eba1a2", "rev": "87af2c503dbd86ec8b1f7c70ae005a1dae422a60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -451,16 +451,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719827415, "lastModified": 1720042825,
"narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -472,11 +472,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720327769, "lastModified": 1721135958,
"narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -832,7 +832,10 @@
"nix-on-droid", "nix-on-droid",
"nixpkgs" "nixpkgs"
], ],
"nmd": "nmd", "nmd": [
"nix-on-droid",
"nmd"
],
"nmt": "nmt" "nmt": "nmt"
}, },
"locked": { "locked": {
@ -860,14 +863,14 @@
], ],
"nixpkgs-docs": "nixpkgs-docs", "nixpkgs-docs": "nixpkgs-docs",
"nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
"nmd": "nmd_2" "nmd": "nmd"
}, },
"locked": { "locked": {
"lastModified": 1720396533, "lastModified": 1720964831,
"narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", "narHash": "sha256-UwVKfjrQ6FWTuqks6lF4+VlzPFDC/GR1Ti/iBKTEQco=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-on-droid", "repo": "nix-on-droid",
"rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", "rev": "c00333ee42aa2b4d4825e0388a1049fdeeded6c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -896,11 +899,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720031269, "lastModified": 1720957393,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -943,16 +946,16 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719957072, "lastModified": 1721226092,
"narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "rev": "c716603a63aca44f39bef1986c13402167450e0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -989,22 +992,6 @@
} }
}, },
"nmd": { "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": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nix-on-droid", "nix-on-droid",
@ -1351,11 +1338,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1720405186, "lastModified": 1721269159,
"narHash": "sha256-7D57KwmTIbsopE/1g8hFeIbVoeJGgU3wfuGYvTlNQG4=", "narHash": "sha256-eHrGuKZKQb762qdCkrfoyyxXLKumYhiXJca1ig0RftE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f0ca58b37ff4179ce4587589c32205764d9b4a4f", "rev": "c3e217122ac55680606d69bc693bdf262f14f602",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1411,11 +1398,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1719525570, "lastModified": 1720818679,
"narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", "narHash": "sha256-u9PqY7O6TN42SLeb0e6mnYAgQOoQmclaVSHfLKMpmu0=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", "rev": "29148118cc33f08b71058e1cda7ca017f5300b51",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
flake.nix
View file

@ -79,6 +79,15 @@
}; };
}; };
pkgs-unstable = import inputs.nixpkgs-patched {
system = systemSettings.system;
config = {
allowUnfree = true;
allowUnfreePredicate = (_: true);
};
overlays = [ inputs.rust-overlay.overlays.default ];
};
pkgs-emacs = import inputs.emacs-pin-nixpkgs { pkgs-emacs = import inputs.emacs-pin-nixpkgs {
system = systemSettings.system; system = systemSettings.system;
}; };
@ -192,7 +201,7 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
nixpkgs-stable.url = "nixpkgs/nixos-23.11"; nixpkgs-stable.url = "nixpkgs/nixos-24.05";
emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6";
kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94";
nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15"; nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15";
@ -200,7 +209,7 @@
home-manager-unstable.url = "github:nix-community/home-manager/master"; home-manager-unstable.url = "github:nix-community/home-manager/master";
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs";
home-manager-stable.url = "github:nix-community/home-manager/release-23.11"; home-manager-stable.url = "github:nix-community/home-manager/release-24.05";
home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable";
nix-on-droid = { nix-on-droid = {

27
harden.sh
View file

@ -19,17 +19,18 @@ else
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
fi fi
pushd $SCRIPT_DIR &> /dev/null; pushd $SCRIPT_DIR &> /dev/null;
chown 0:0 .; sudo chown 0:0 .;
chown 0:0 profiles/*; sudo chown 0:0 profiles/*;
chown -R 0:0 system; sudo chown -R 0:0 system;
chown -R 0:0 patches; sudo chown -R 0:0 patches;
chown 0:0 flake.lock; sudo chown 0:0 flake.lock;
chown 0:0 flake.nix sudo chown 0:0 flake.nix
chown 0:0 profiles sudo chown 0:0 profiles
chown 0:0 profiles/*/configuration.nix; sudo chown 0:0 profiles/*/configuration.nix;
chown 0:0 harden.sh; sudo chown 0:0 profiles/homelab/base.nix;
chown 0:0 soften.sh; sudo chown 0:0 harden.sh;
chown 0:0 install.sh; sudo chown 0:0 soften.sh;
chown 0:0 update.sh; sudo chown 0:0 install.sh;
chown 1000:users **/README.org; sudo chown 0:0 update.sh;
sudo chown 1000:users **/README.org;
popd &> /dev/null; popd &> /dev/null;

2
install.org
View file

@ -161,7 +161,7 @@ or for your own custom directory:
sudo nixos-rebuild switch --flake /your/custom/directory#system sudo nixos-rebuild switch --flake /your/custom/directory#system
#+END_SRC #+END_SRC
*** Intall and Switch Home Manager Config *** Install and Switch Home Manager Config
Home manager can be installed and the configuration activated with: Home manager can be installed and the configuration activated with:
#+BEGIN_SRC sh :noeval #+BEGIN_SRC sh :noeval
nix run home-manager/master -- switch --flake ~/.dotfiles#user nix run home-manager/master -- switch --flake ~/.dotfiles#user

6
patches/emacs-no-version-check.patch
View file

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

2
profiles/homelab/base.nix
View file

@ -89,6 +89,4 @@
# It is ok to leave this unchanged for compatibility purposes # It is ok to leave this unchanged for compatibility purposes
system.stateVersion = "22.11"; system.stateVersion = "22.11";
news.display = "silent";
} }

16
profiles/work/home.nix
View file

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

2
soften.sh
View file

@ -23,5 +23,5 @@ else
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
fi fi
pushd $SCRIPT_DIR &> /dev/null; pushd $SCRIPT_DIR &> /dev/null;
chown -R 1000:users .; sudo chown -R 1000:users .;
popd &> /dev/null; popd &> /dev/null;

4
system/security/firewall.nix
View file

@ -4,8 +4,8 @@
# Firewall # Firewall
networking.firewall.enable = true; networking.firewall.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ]; networking.firewall.allowedTCPPorts = [ 22000 21027 ]; # syncthing
# networking.firewall.allowedUDPPorts = [ ... ]; networking.firewall.allowedUDPPorts = [ 22000 21027 ]; # syncthing
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
} }

2
system/wm/fonts.nix
View file

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

2
user/app/browser/qutebrowser.nix
View file

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

61
user/app/doom-emacs/config.el
View file

@ -727,8 +727,8 @@ If the path from LINK does not exist, nil is returned."
(defun org-roam-open-dashboard () (defun org-roam-open-dashboard ()
"Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)" "Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)"
(interactive) (interactive)
(if (file-exists-p (concat org-roam-directory "/dashboard.org")) (if (org-roam-node-from-title-or-alias "Overview")
(org-open-file (concat org-roam-directory "/dashboard.org")) (org-roam-node-open (org-roam-node-from-title-or-alias "Overview"))
(dired org-roam-directory)) (dired org-roam-directory))
) )
@ -740,11 +740,19 @@ If the path from LINK does not exist, nil is returned."
(message "No inbox found, capture something with M-x org-roam-capture-inbox")) (message "No inbox found, capture something with M-x org-roam-capture-inbox"))
) )
(defun org-roam-open-inbox ()
"Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)"
(interactive)
(if (org-roam-node-from-title-or-alias "Inbox")
(org-roam-node-open (org-roam-node-from-title-or-alias "Inbox"))
(message "No inbox found, capture something with M-x org-roam-capture-inbox"))
)
(defun org-roam-capture-inbox () (defun org-roam-capture-inbox ()
(interactive) (interactive)
(org-roam-capture- :node (org-roam-node-create) (org-roam-capture- :node (org-roam-node-from-title-or-alias "Inbox")
:templates '(("i" "inbox" plain "* %?" :templates '(("i" "inbox" plain "* %?"
:if-new (file+head "inbox.org" "#+title: Inbox\n"))))) :if-new (file+head "%<%Y%m%d%H%M%S>-inbox.org" "#+title: Inbox\n")))))
(defun org-roam-switch-db (&optional arg silent) (defun org-roam-switch-db (&optional arg silent)
"Switch to a different org-roam database, arg" "Switch to a different org-roam database, arg"
@ -1042,13 +1050,12 @@ If the path from LINK does not exist, nil is returned."
;; Custom styles for dates in agenda ;; Custom styles for dates in agenda
(custom-set-faces! (custom-set-faces!
'(org-agenda-date :inherit outline-1 :height 1.15) '(org-agenda-date :inherit outline-1 :height 1.15)
'(org-agenda-date-today :inherit diary :height 1.15) '(org-agenda-date-today :inherit outline-2 :height 1.15)
'(org-agenda-date-weekend :ineherit outline-2 :height 1.15) '(org-agenda-date-weekend :inherit outline-1 :height 1.15)
'(org-agenda-date-weekend-today :inherit outline-4 :height 1.15) '(org-agenda-date-weekend-today :inherit outline-2 :height 1.15)
'(org-super-agenda-header :inherit custom-button :weight bold :height 1.05) '(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))) `(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 ;; Toggle completed entries function
(defun org-agenda-toggle-completed () (defun org-agenda-toggle-completed ()
@ -1495,6 +1502,11 @@ If the path from LINK does not exist, nil is returned."
(require 'nix-mode) (require 'nix-mode)
(require 'gdscript-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-java-workspace-dir (concat user-home-directory "/.local/share/doom/java-workspace"))
(setq lsp-treemacs-deps-position-params (setq lsp-treemacs-deps-position-params
@ -1512,6 +1524,37 @@ 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)) (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) (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
(after! vterm (after! vterm
(add-to-list 'vterm-tramp-shells '("ssh" "zsh")) ;; I use zsh on all my servers (add-to-list 'vterm-tramp-shells '("ssh" "zsh")) ;; I use zsh on all my servers

1
user/app/doom-emacs/doom.nix
View file

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

66
user/app/doom-emacs/doom.org
View file

@ -866,8 +866,8 @@ exit
(defun org-roam-open-dashboard () (defun org-roam-open-dashboard ()
"Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)" "Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)"
(interactive) (interactive)
(if (file-exists-p (concat org-roam-directory "/dashboard.org")) (if (org-roam-node-from-title-or-alias "Overview")
(org-open-file (concat org-roam-directory "/dashboard.org")) (org-roam-node-open (org-roam-node-from-title-or-alias "Overview"))
(dired org-roam-directory)) (dired org-roam-directory))
) )
@ -879,11 +879,19 @@ exit
(message "No inbox found, capture something with M-x org-roam-capture-inbox")) (message "No inbox found, capture something with M-x org-roam-capture-inbox"))
) )
(defun org-roam-open-inbox ()
"Open ${org-roam-directory}/dashboard.org (I use this naming convention to create dashboards for each of my org roam maps)"
(interactive)
(if (org-roam-node-from-title-or-alias "Inbox")
(org-roam-node-open (org-roam-node-from-title-or-alias "Inbox"))
(message "No inbox found, capture something with M-x org-roam-capture-inbox"))
)
(defun org-roam-capture-inbox () (defun org-roam-capture-inbox ()
(interactive) (interactive)
(org-roam-capture- :node (org-roam-node-create) (org-roam-capture- :node (org-roam-node-from-title-or-alias "Inbox")
:templates '(("i" "inbox" plain "* %?" :templates '(("i" "inbox" plain "* %?"
:if-new (file+head "inbox.org" "#+title: Inbox\n"))))) :if-new (file+head "%<%Y%m%d%H%M%S>-inbox.org" "#+title: Inbox\n")))))
(defun org-roam-switch-db (&optional arg silent) (defun org-roam-switch-db (&optional arg silent)
"Switch to a different org-roam database, arg" "Switch to a different org-roam database, arg"
@ -932,6 +940,10 @@ exit
(org-roam-switch-db prev-org-roam-db-choice 1))) (org-roam-switch-db prev-org-roam-db-choice 1)))
#+END_SRC #+END_SRC
#+RESULTS:
: org-roam-switch-db-id-open
*** Org Roam "todos" Tagging for Org Agenda *** Org Roam "todos" Tagging for Org Agenda
#+BEGIN_SRC emacs-lisp :tangle config.el #+BEGIN_SRC emacs-lisp :tangle config.el
;;;------ Org-roam-agenda configuration ------;;; ;;;------ Org-roam-agenda configuration ------;;;
@ -1210,13 +1222,12 @@ On Wayland, EAF doesn't work.
;; Custom styles for dates in agenda ;; Custom styles for dates in agenda
(custom-set-faces! (custom-set-faces!
'(org-agenda-date :inherit outline-1 :height 1.15) '(org-agenda-date :inherit outline-1 :height 1.15)
'(org-agenda-date-today :inherit diary :height 1.15) '(org-agenda-date-today :inherit outline-2 :height 1.15)
'(org-agenda-date-weekend :ineherit outline-2 :height 1.15) '(org-agenda-date-weekend :inherit outline-1 :height 1.15)
'(org-agenda-date-weekend-today :inherit outline-4 :height 1.15) '(org-agenda-date-weekend-today :inherit outline-2 :height 1.15)
'(org-super-agenda-header :inherit custom-button :weight bold :height 1.05) '(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))) `(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 ;; Toggle completed entries function
(defun org-agenda-toggle-completed () (defun org-agenda-toggle-completed ()
@ -1763,6 +1774,11 @@ I don't have this active right now since it's kinda weird with pgtk...
(require 'nix-mode) (require 'nix-mode)
(require 'gdscript-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-java-workspace-dir (concat user-home-directory "/.local/share/doom/java-workspace"))
(setq lsp-treemacs-deps-position-params (setq lsp-treemacs-deps-position-params
@ -1780,6 +1796,37 @@ 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)) (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 #+END_SRC
** Terminal ** Terminal
#+BEGIN_SRC emacs-lisp :tangle config.el #+BEGIN_SRC emacs-lisp :tangle config.el
@ -2124,6 +2171,7 @@ in
}; };
home.packages = (with pkgs-emacs; [ home.packages = (with pkgs-emacs; [
emacs-lsp-booster
nil nil
nixfmt nixfmt
file file

18
user/wm/hyprland/hyprland.nix
View file

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