update and merge conflicts
This commit is contained in:
Generated
+85
-79
@@ -6,11 +6,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725841979,
|
"lastModified": 1727303518,
|
||||||
"narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=",
|
"narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=",
|
||||||
"owner": "Aylur",
|
"owner": "Aylur",
|
||||||
"repo": "ags",
|
"repo": "ags",
|
||||||
"rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796",
|
"rev": "cd543afec4d9ed708990e5ba52184716809bf248",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -39,11 +39,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725753098,
|
"lastModified": 1727261104,
|
||||||
"narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
|
"narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
|
"rev": "b82fdaff917582a9d568969e15e61b398c71e990",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -72,16 +72,20 @@
|
|||||||
},
|
},
|
||||||
"ghostty": {
|
"ghostty": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": [
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-unstable": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"zig": "zig"
|
"zig": "zig"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726286796,
|
"lastModified": 1727631856,
|
||||||
"narHash": "sha256-5mop4eJrzPTuEsUaqRZizzjySOx+vK9ZXl7HlJqWh1M=",
|
"narHash": "sha256-VdoYxOjaDOT9BuyOlPN3IROc4PEKoCw9sSotzRA/PvE=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "4241eac890b8f4b6bbadf27b2d109ce483813fe9",
|
"rev": "83505bb4c0980e17cb7f396a43c1a3630c4ffdb0",
|
||||||
"revCount": 7314,
|
"revCount": 7546,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
||||||
},
|
},
|
||||||
@@ -97,11 +101,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726440980,
|
"lastModified": 1727383923,
|
||||||
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
|
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
|
"rev": "ffe2d07e771580a005e675108212597e5b367d2d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -126,11 +130,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722623071,
|
"lastModified": 1727532803,
|
||||||
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
|
"narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprcursor",
|
"repo": "hyprcursor",
|
||||||
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
|
"rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -149,11 +153,11 @@
|
|||||||
"systems": "systems_3"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725204025,
|
"lastModified": 1727257269,
|
||||||
"narHash": "sha256-DdPf2Hm/ywtXqQutmxuzvMLgTzuV1nuzbrsahyhB8uU=",
|
"narHash": "sha256-b/j875k6RrxQLtbW+NCLw7NLToMd9KDYywjtUoihpq4=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hypridle",
|
"repo": "hypridle",
|
||||||
"rev": "22b058b47a57b609e00c5c8a90697f33c7fe1fd3",
|
"rev": "cc23f97836adbba1abc8edd48169fb1f1f698c32",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -166,6 +170,7 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"aquamarine": "aquamarine",
|
"aquamarine": "aquamarine",
|
||||||
"hyprcursor": "hyprcursor",
|
"hyprcursor": "hyprcursor",
|
||||||
|
"hyprland-protocols": "hyprland-protocols",
|
||||||
"hyprlang": "hyprlang_2",
|
"hyprlang": "hyprlang_2",
|
||||||
"hyprutils": "hyprutils_2",
|
"hyprutils": "hyprutils_2",
|
||||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||||
@@ -174,11 +179,11 @@
|
|||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726430622,
|
"lastModified": 1727621787,
|
||||||
"narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=",
|
"narHash": "sha256-gSoqO3r98YvPEvN/6Fnw+UNg4hEwq/YWFijPtlLtFWM=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "9e356562446f44c471ae38a80506a9df039305d6",
|
"rev": "6649255d54f45a7e2fedd9b4be85fe5d11229c04",
|
||||||
"revCount": 5224,
|
"revCount": 5278,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
@@ -206,11 +211,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723143591,
|
"lastModified": 1727625596,
|
||||||
"narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=",
|
"narHash": "sha256-+BQyiJPhb9txsO6xZ4c4HrQwBzTe9gohX1e+wUvOM+Q=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-plugins",
|
"repo": "hyprland-plugins",
|
||||||
"rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77",
|
"rev": "13301eeede3deb4b3a5478518eb0931ae274a798",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -220,6 +225,31 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hyprland-protocols": {
|
"hyprland-protocols": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"hyprland",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"hyprland",
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1727451107,
|
||||||
|
"narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprland-protocols",
|
||||||
|
"rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprland-protocols",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"hyprland-protocols_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprland",
|
"hyprland",
|
||||||
@@ -343,11 +373,11 @@
|
|||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725535663,
|
"lastModified": 1727254580,
|
||||||
"narHash": "sha256-hsvbU1utffVOFTRa3arPepv8en42VltR33L72vK3QVo=",
|
"narHash": "sha256-JPms9Xhgr2R76vWEGmCvsBAoM0JUd4cQ2zl4pie+XAM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlock",
|
"repo": "hyprlock",
|
||||||
"rev": "153977aab35a72f3e142e32aed6b268b659d18e1",
|
"rev": "9ea804788ca5b4852d7e045d7a57f8d413852ca0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -393,11 +423,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724966483,
|
"lastModified": 1727300645,
|
||||||
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
|
"narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
|
"rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -443,11 +473,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721324119,
|
"lastModified": 1726874836,
|
||||||
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
|
"narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprwayland-scanner",
|
"repo": "hyprwayland-scanner",
|
||||||
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
|
"rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -472,45 +502,13 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1726062281,
|
|
||||||
"narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "release-24.05",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-unstable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1719082008,
|
|
||||||
"narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "9693852a2070b398ee123a329e68f0dab5526681",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725983898,
|
"lastModified": 1727348695,
|
||||||
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
|
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
|
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -522,11 +520,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726243404,
|
"lastModified": 1727348695,
|
||||||
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
|
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
|
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -625,11 +623,19 @@
|
|||||||
},
|
},
|
||||||
"xdph": {
|
"xdph": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprland-protocols": "hyprland-protocols",
|
"hyprland-protocols": "hyprland-protocols_2",
|
||||||
"hyprlang": [
|
"hyprlang": [
|
||||||
"hyprland",
|
"hyprland",
|
||||||
"hyprlang"
|
"hyprlang"
|
||||||
],
|
],
|
||||||
|
"hyprutils": [
|
||||||
|
"hyprland",
|
||||||
|
"hyprutils"
|
||||||
|
],
|
||||||
|
"hyprwayland-scanner": [
|
||||||
|
"hyprland",
|
||||||
|
"hyprwayland-scanner"
|
||||||
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprland",
|
"hyprland",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
@@ -640,11 +646,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726046979,
|
"lastModified": 1727524473,
|
||||||
"narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=",
|
"narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18",
|
"rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -24,6 +24,10 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
ghostty = {
|
ghostty = {
|
||||||
|
inputs = {
|
||||||
|
nixpkgs-stable.follows = "nixpkgs";
|
||||||
|
nixpkgs-unstable.follows = "nixpkgs";
|
||||||
|
};
|
||||||
url = "git+ssh://git@github.com/ghostty-org/ghostty";
|
url = "git+ssh://git@github.com/ghostty-org/ghostty";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -95,7 +95,7 @@
|
|||||||
|
|
||||||
blueman.enable = true;
|
blueman.enable = true;
|
||||||
|
|
||||||
printing.enable = true; # Enable CUPS to print documents.
|
# printing.enable = true; # Enable CUPS to print documents.
|
||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
|
|
||||||
auto-cpufreq.enable = true;
|
auto-cpufreq.enable = true;
|
||||||
|
|||||||
+13
-1
@@ -42,6 +42,8 @@
|
|||||||
gimp
|
gimp
|
||||||
gnome-keyring
|
gnome-keyring
|
||||||
gnome-sound-recorder
|
gnome-sound-recorder
|
||||||
|
gnome-disk-utility
|
||||||
|
gparted
|
||||||
gtk4
|
gtk4
|
||||||
gvfs
|
gvfs
|
||||||
grim
|
grim
|
||||||
@@ -49,6 +51,7 @@
|
|||||||
htop
|
htop
|
||||||
imagemagick
|
imagemagick
|
||||||
imhex
|
imhex
|
||||||
|
kdenlive
|
||||||
keepassxc
|
keepassxc
|
||||||
libsForQt5.polkit-kde-agent
|
libsForQt5.polkit-kde-agent
|
||||||
libtool
|
libtool
|
||||||
@@ -64,6 +67,8 @@
|
|||||||
powertop
|
powertop
|
||||||
praat
|
praat
|
||||||
prismlauncher
|
prismlauncher
|
||||||
|
protonvpn-cli
|
||||||
|
protonvpn-gui
|
||||||
qbittorrent
|
qbittorrent
|
||||||
signal-desktop
|
signal-desktop
|
||||||
slstatus
|
slstatus
|
||||||
@@ -72,9 +77,12 @@
|
|||||||
texliveFull
|
texliveFull
|
||||||
thunderbird
|
thunderbird
|
||||||
tree
|
tree
|
||||||
|
unzip
|
||||||
wev
|
wev
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
xclip
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
|
zip
|
||||||
];
|
];
|
||||||
|
|
||||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||||
@@ -253,6 +261,7 @@
|
|||||||
services = {
|
services = {
|
||||||
blueman-applet.enable = true;
|
blueman-applet.enable = true;
|
||||||
network-manager-applet.enable = true;
|
network-manager-applet.enable = true;
|
||||||
|
|
||||||
emacs = {
|
emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.emacs-gtk;
|
package = pkgs.emacs-gtk;
|
||||||
@@ -263,14 +272,17 @@
|
|||||||
"-a emacs"
|
"-a emacs"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
startWithUserSession = true;
|
startWithUserSession = "graphical";
|
||||||
};
|
};
|
||||||
|
|
||||||
gnome-keyring.enable = true;
|
gnome-keyring.enable = true;
|
||||||
|
|
||||||
gpg-agent = {
|
gpg-agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultCacheTtl = 1800;
|
defaultCacheTtl = 1800;
|
||||||
enableSshSupport = true;
|
enableSshSupport = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nextcloud-client.enable = true;
|
nextcloud-client.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
exec-once = [
|
exec-once = [
|
||||||
"wl-clipboard-history -t"
|
"wl-clipboard-history -t"
|
||||||
"wl-paste -p --watch wl-copy -p ''"
|
"wl-paste -p --watch wl-copy -p ''"
|
||||||
# "ags"
|
"fcitx5 -d"
|
||||||
];
|
];
|
||||||
env = [
|
env = [
|
||||||
"WLR_NO_HARDWARE_CURSORS,1"
|
"WLR_NO_HARDWARE_CURSORS,1"
|
||||||
|
|||||||
@@ -49,6 +49,8 @@
|
|||||||
"battery"
|
"battery"
|
||||||
"break"
|
"break"
|
||||||
"colors"
|
"colors"
|
||||||
|
"break"
|
||||||
|
"break"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -26,6 +26,8 @@
|
|||||||
- [[#markdown-mode][MARKDOWN MODE]]
|
- [[#markdown-mode][MARKDOWN MODE]]
|
||||||
- [[#org-download][ORG DOWNLOAD]]
|
- [[#org-download][ORG DOWNLOAD]]
|
||||||
- [[#pulse][PULSE]]
|
- [[#pulse][PULSE]]
|
||||||
|
- [[#pdf-tools][PDF TOOLS]]
|
||||||
|
- [[#projectile][PROJECTILE]]
|
||||||
- [[#rainbow-mode][RAINBOW MODE]]
|
- [[#rainbow-mode][RAINBOW MODE]]
|
||||||
- [[#reload-emacs][RELOAD EMACS]]
|
- [[#reload-emacs][RELOAD EMACS]]
|
||||||
- [[#shells-and-terminals][SHELLS AND TERMINALS]]
|
- [[#shells-and-terminals][SHELLS AND TERMINALS]]
|
||||||
@@ -497,20 +499,18 @@ Enable zoom in/out with C-=/- and also for C-scrl-up/down
|
|||||||
* ORG DOWNLOAD
|
* ORG DOWNLOAD
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
|
||||||
;; inspired by https://zzamboni.org/post/how-to-insert-screenshots-in-org-documents-on-macos/
|
|
||||||
|
|
||||||
(use-package org-download
|
(use-package org-download
|
||||||
:after org
|
:after org
|
||||||
:defer nil
|
:defer nil
|
||||||
:custom
|
:custom
|
||||||
(org-download-method 'directory)
|
(org-download-method 'directory)
|
||||||
(org-download-image-dir "~/emacs/")
|
(org-download-image-dir "~/emacs/images/")
|
||||||
(org-download-heading-lvl 0)
|
(org-download-heading-lvl 0)
|
||||||
(org-download-timestamp "org_%Y%m%d-%H%M%S_")
|
(org-download-timestamp "org_%Y%m%d-%H%M%S_")
|
||||||
;; (org-image-actual-width 400)
|
(org-image-actual-width 400)
|
||||||
(org-download-screenshot-method "wl-paste -t image/png > '%s'")
|
(org-download-screenshot-method "WAYLAND_DISPLAY=wayland-1 wl-paste -t image/png > '%s'.png")
|
||||||
:bind
|
:bind
|
||||||
("C-M-y" . org-download-screenshot)
|
("C-M-y" . org-download-screenshot file)
|
||||||
:config
|
:config
|
||||||
(require 'org-download))
|
(require 'org-download))
|
||||||
#+end_src
|
#+end_src
|
||||||
@@ -539,7 +539,13 @@ Pulse highlight a line on certain actions
|
|||||||
# (advice-add command :after #'pulse-line)))
|
# (advice-add command :after #'pulse-line)))
|
||||||
# #+end_src
|
# #+end_src
|
||||||
|
|
||||||
# * PROJECTILE
|
* PDF TOOLS
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
(use-package pdf-tools)
|
||||||
|
#+end_src
|
||||||
|
|
||||||
|
|
||||||
|
* PROJECTILE
|
||||||
[[https://github.com/bbatsov/projectile][Projectile]] is a project interaction library for Emacs.
|
[[https://github.com/bbatsov/projectile][Projectile]] is a project interaction library for Emacs.
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
|||||||
@@ -24,23 +24,44 @@ vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", {silent = true})
|
|||||||
-- put nvim to background
|
-- put nvim to background
|
||||||
vim.keymap.set("n", "<leader>bg", "<C-z>")
|
vim.keymap.set("n", "<leader>bg", "<C-z>")
|
||||||
|
|
||||||
|
-- BUILD SCRIPT INVOKATIONS
|
||||||
|
|
||||||
-- invoke build scripts
|
-- `build.sh` script binds
|
||||||
-- `build.sh`
|
-- non-interactive binds
|
||||||
vim.keymap.set("n", "<leader>bo", ":!./build.sh ") -- Interactive for adding flags/options
|
vim.keymap.set("n", "<leader>bb" , "<cmd>./build.sh <CR>")
|
||||||
vim.keymap.set("n", "<leader>bb", ":!./build.sh <CR>")
|
vim.keymap.set("n", "<leader>br" , "<cmd>./build.sh run <CR>")
|
||||||
vim.keymap.set("n", "<leader>br", ":!./build.sh run<CR>")
|
vim.keymap.set("n", "<leader>bRb" , "<cmd>./build.sh release <CR>")
|
||||||
vim.keymap.set("n", "<leader>bR", ":!./build.sh release<CR>")
|
vim.keymap.set("n", "<leader>bRr" , "<cmd>./build.sh release run <CR>")
|
||||||
vim.keymap.set("n", "<leader>bRr", ":!./build.sh release run<CR>")
|
vim.keymap.set("n", "<leader>bRr" , "<cmd>./build.sh release run <CR>")
|
||||||
|
|
||||||
-- zig build
|
-- interactive binds
|
||||||
vim.keymap.set("n", "<leader>zbo", ":!zig build -D") -- Interactive for adding flags/options
|
vim.keymap.set("n", "<leader>bo" , "<cmd>./build.sh ") -- allow for adding extra flags/options
|
||||||
vim.keymap.set("n", "<leader>zbb", ":!zig build <CR>")
|
vim.keymap.set("n", "<leader>bor" , "<cmd>./build.sh run") -- allow for adding extra flags/options
|
||||||
vim.keymap.set("n", "<leader>zbr", ":!zig build run<CR>")
|
vim.keymap.set("n", "<leader>bRo" , "<cmd>./build.sh release ")
|
||||||
vim.keymap.set("n", "<leader>zbR", ":!zig build -Doptimize=ReleaseSafe <CR>")
|
vim.keymap.set("n", "<leader>bRor", "<cmd>./build.sh release run ")
|
||||||
vim.keymap.set("n", "<leader>zbRr", ":!zig build -Doptimize=ReleaseSafe run<CR>")
|
|
||||||
vim.keymap.set("n", "<leader>zbt", ":!zig build -Dtarget=") -- Interactive to add target/other flags
|
-- `build.zig` script binds
|
||||||
vim.keymap.set("n", "<leader>zbtR", ":!zig build -Doptimize=ReleaseSafe -Dtarget=") -- Interactive to add target/other flags
|
-- non-interactive binds
|
||||||
|
vim.keymap.set("n", "<leader>zbb" , "<cmd>zig build <CR>")
|
||||||
|
vim.keymap.set("n", "<leader>zbr" , "<cmd>zig build run <CR>")
|
||||||
|
vim.keymap.set("n", "<leader>zbt" , "<cmd>zig build test <CR>")
|
||||||
|
vim.keymap.set("n", "<leader>zbR" , "<cmd>zig build -Doptimize=ReleaseSafe <CR>")
|
||||||
|
vim.keymap.set("n", "<leader>zbRs" , "<cmd>zig build -Doptimize=ReleaseSmall <CR>")
|
||||||
|
vim.keymap.set("n", "<leader>zbRf" , "<cmd>zig build -Doptimize=ReleaseFast <CR>")
|
||||||
|
vim.keymap.set("n", "<leader>zbRr" , "<cmd>zig build run -Doptimize=ReleaseSafe <CR>")
|
||||||
|
vim.keymap.set("n", "<leader>zbRsr", "<cmd>zig build run -Doptimize=ReleaseSmall <CR>")
|
||||||
|
vim.keymap.set("n", "<leader>zbRfr", "<cmd>zig build run -Doptimize=ReleaseFast <CR>")
|
||||||
|
|
||||||
|
-- interactive binds
|
||||||
|
vim.keymap.set("n", "<leader>zbob" , "<cmd>zig build ")
|
||||||
|
vim.keymap.set("n", "<leader>zbor" , "<cmd>zig build run ")
|
||||||
|
vim.keymap.set("n", "<leader>zbot" , "<cmd>zig build test ")
|
||||||
|
vim.keymap.set("n", "<leader>zboR" , "<cmd>zig build -Doptimize=ReleaseSafe ")
|
||||||
|
vim.keymap.set("n", "<leader>zboRs" , "<cmd>zig build -Doptimize=ReleaseSmall ")
|
||||||
|
vim.keymap.set("n", "<leader>zboRf" , "<cmd>zig build -Doptimize=ReleaseFast ")
|
||||||
|
vim.keymap.set("n", "<leader>zboRr" , "<cmd>zig build run -Doptimize=ReleaseSafe ")
|
||||||
|
vim.keymap.set("n", "<leader>zboRsr", "<cmd>zig build run -Doptimize=ReleaseSmall ")
|
||||||
|
vim.keymap.set("n", "<leader>zboRfr", "<cmd>zig build run -Doptimize=ReleaseFast ")
|
||||||
|
|
||||||
|
|
||||||
-- emacs-inspired binds
|
-- emacs-inspired binds
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
|
|
||||||
"clock": {
|
"clock": {
|
||||||
"interval": 1,
|
"interval": 1,
|
||||||
"format": "<big> </big>\n{:%d/%m\n<big> </big>\n %R}",
|
"format": "<big> </big>\n{:%d/%m\n<big> </big>\n%R}",
|
||||||
"tooltip": true,
|
"tooltip": true,
|
||||||
"tooltip-format": "<big>{:%Y %B}</big> <tt><small>{calendar}</small></tt>"
|
"tooltip-format": "<big>{:%Y %B}</big> <tt><small>{calendar}</small></tt>"
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user