From 769bc078efe19abac0ea1e94e8f62df3319e9dae Mon Sep 17 00:00:00 2001 From: pupbrained Date: Mon, 12 Aug 2024 00:31:35 -0400 Subject: [PATCH] some updates + testing out emacs --- flake.lock | 279 +++++++++++------- homes/x86_64-linux/marshall@navis/default.nix | 149 ++++++++++ .../marshall@navis/hyprland/default.nix | 3 +- systems/x86_64-linux/navis/default.nix | 3 +- 4 files changed, 316 insertions(+), 118 deletions(-) diff --git a/flake.lock b/flake.lock index 55a85f1..71d6614 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1722100913, - "narHash": "sha256-75Hcx5Zu0f+BeCkZxN1frkYacjbkwgCq+z3doVgr4Hw=", + "lastModified": 1722347739, + "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4918e57979bbdbd05aabb20f63e1cb5dc289bcbd", + "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1721784420, - "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "lastModified": 1722997334, + "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", "owner": "catppuccin", "repo": "nix", - "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", "type": "github" }, "original": { @@ -88,6 +88,7 @@ "chaotic": { "inputs": { "compare-to": "compare-to", + "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager_2", "jovian": "jovian", @@ -96,11 +97,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1722198001, - "narHash": "sha256-CC+hi1esCjv26J+Zryr+j5Vz2azEgS2lGIETEEnkI2o=", + "lastModified": 1723389140, + "narHash": "sha256-CYcXNzK5YMHeSCCproj64kwtonaavbCnDnq6koYXi88=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "50e805f8d8255795063d8b0833590e5e05723fc9", + "rev": "a512107512f8d527db7152d48dedd6ebb764f9b9", "type": "github" }, "original": { @@ -116,11 +117,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1714765312, - "narHash": "sha256-WqZX4PMw4raTRXUliz2cr5yZeIERLq4rjB3DUoxdWn8=", + "lastModified": 1720551955, + "narHash": "sha256-8ZsaT5+Ny2hz3iZzV5o5/L2YYDppP+1kj7zEgXxTMjI=", "owner": "jcdickinson", "repo": "codeium.nvim", - "rev": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825", + "rev": "f6a2ef32a9e923cb0104a19d3e426b0e40e49505", "type": "github" }, "original": { @@ -172,11 +173,11 @@ ] }, "locked": { - "lastModified": 1722082646, - "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "type": "github" }, "original": { @@ -188,7 +189,6 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_4", "nixpkgs": [ "nixvim", "nixvim", @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -209,6 +209,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1723357708, + "narHash": "sha256-y0FYxyHd45FQkl1S4PIq9eNaEe2tEemHpQ3sp+C19Pk=", + "owner": "nix-community", + "repo": "fenix", + "rev": "344945339ec0e01c62195b849ae8a67eaa1004a3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -240,22 +262,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -272,7 +278,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1650374568, @@ -288,7 +294,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1650374568, @@ -334,11 +340,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -455,11 +461,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -521,7 +527,11 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": [ + "nixvim", + "nixvim", + "flake-compat" + ], "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -535,11 +545,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", "type": "github" }, "original": { @@ -600,11 +610,11 @@ ] }, "locked": { - "lastModified": 1722119539, - "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { @@ -620,11 +630,11 @@ ] }, "locked": { - "lastModified": 1722203588, - "narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "792757f643cedc13f02098d8ed506d82e19ec1da", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -642,11 +652,11 @@ ] }, "locked": { - "lastModified": 1719180626, - "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { @@ -696,11 +706,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1722203795, - "narHash": "sha256-Ml3cL8ayTGozjo8QW08J7jEPIRMWtQmdW1Y44pb2SYQ=", + "lastModified": 1723405096, + "narHash": "sha256-2C5YJ3lYuRFTixTIfi5XL4IbMaf+bZ/qowyhZ5XKITs=", "ref": "refs/heads/main", - "rev": "a9d87bd6669568741704de08b6f0328a92e29396", - "revCount": 5009, + "rev": "118d4e1001d5847aa42d1e5d5fa9623954ae751d", + "revCount": 5078, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -728,11 +738,11 @@ ] }, "locked": { - "lastModified": 1721668405, - "narHash": "sha256-ZnIXa+jeMXoerhRz/ZJwVoYHaROjcLyQsr1b6JZ2AjQ=", + "lastModified": 1723143591, + "narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "4c2cef8326711fbd91b7a313f095545eb50d2a57", + "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77", "type": "github" }, "original": { @@ -871,11 +881,11 @@ ] }, "locked": { - "lastModified": 1721993749, - "narHash": "sha256-dGqEQ68GNGmA8+HHzHEqAcW2uGu/AX+sRWcMO99UM8s=", + "lastModified": 1723367191, + "narHash": "sha256-noi5tre7BLtxImN38jEHeVOtOG1Xu37sJFwHKSAPHjo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3bd059992912139d6a12e86ba418f933ec368ef2", + "rev": "91178062f365b64eece94c5dff93e09b07e87d9d", "type": "github" }, "original": { @@ -928,11 +938,11 @@ ] }, "locked": { - "lastModified": 1719128254, - "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "50581970f37f06a4719001735828519925ef8310", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "type": "github" }, "original": { @@ -971,11 +981,11 @@ ] }, "locked": { - "lastModified": 1722136042, - "narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=", + "lastModified": 1723352546, + "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c0ca47e8523b578464014961059999d8eddd4aae", + "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", "type": "github" }, "original": { @@ -1072,11 +1082,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -1088,11 +1098,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1721924956, - "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ad6a14c6bf098e98800b091668718c336effc95", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -1120,11 +1130,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -1152,11 +1162,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1719444225, - "narHash": "sha256-tSTqQB0C1D4frFJI0ASXW0OWYHwqwcvLGxh9i9ieL40=", + "lastModified": 1723421421, + "narHash": "sha256-ohKD5dTOkz2wUa2od3G5COc0iAF2sV4HcNVeoPOfp7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c0e0424411ef3bd1f55f5e1025e0934c63bfbff", + "rev": "4e7d996aa858660e3261b4834ab00415cfe9b0fe", "type": "github" }, "original": { @@ -1167,11 +1177,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -1183,11 +1193,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -1206,11 +1216,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1719450216, - "narHash": "sha256-u/nnOqyS7agFU51JqnWZZmdMP+8NxrvA7bgby081bSU=", + "lastModified": 1723434584, + "narHash": "sha256-O3zbWIsVCi7IGCJ4V90X6hp529rAJuTd0eykddPRXHM=", "owner": "pupbrained", "repo": "nvim-config", - "rev": "6e9c79b8253997c56075f56d291fce35a2ab7095", + "rev": "8b0165fcdc7b4dc2685e4350b98dc20c0ad343de", "type": "github" }, "original": { @@ -1228,14 +1238,15 @@ "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_8", + "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719401747, - "narHash": "sha256-GuY035SXf/wv685mhXsHv/syYh3XT9U8ZDdxr1pGgts=", + "lastModified": 1723323133, + "narHash": "sha256-g3wit604jFhBvjDBziJgulDUXDl/ApafMXq7o7ioMxo=", "owner": "nix-community", "repo": "nixvim", - "rev": "53a9599cc4da4f7557995b8611e5dba831261eef", + "rev": "f13bdef0bc697261c51eab686c28c7e2e7b7db3c", "type": "github" }, "original": { @@ -1244,6 +1255,29 @@ "type": "github" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723134722, + "narHash": "sha256-wknII7R6ewALIxIKYtqeahjUk/ZrFj1ZtSpNBaHDCyg=", + "owner": "NuschtOS", + "repo": "search", + "rev": "1016f4620e321c12ff1dbcd464e9de889e302d1c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -1297,9 +1331,26 @@ "treefmt-nix": "treefmt-nix_3" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1723304838, + "narHash": "sha256-xAxVDxuvCs8WWkrxVWjCiqxTkHhGj7sSppr1YMuEdT8=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "0daeb5c0b05cfdf2101b0f078c27539099bf38e6", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "snowfall-flake": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], @@ -1321,7 +1372,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "snowfall-flake", @@ -1345,7 +1396,7 @@ }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" @@ -1495,11 +1546,11 @@ ] }, "locked": { - "lastModified": 1719243788, - "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", + "lastModified": 1723303070, + "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", + "rev": "14c092e0326de759e16b37535161b3cb9770cea3", "type": "github" }, "original": { @@ -1513,11 +1564,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1719243788, - "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", + "lastModified": 1723402464, + "narHash": "sha256-xjunKUFQs9D7u0TpVoXhrRYb4tbVkutRoFUHj0lEydE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", + "rev": "c9f97032be6816fa234f24803b8ae79dc7753a91", "type": "github" }, "original": { @@ -1531,11 +1582,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1721769617, - "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", + "lastModified": 1723402464, + "narHash": "sha256-xjunKUFQs9D7u0TpVoXhrRYb4tbVkutRoFUHj0lEydE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", + "rev": "c9f97032be6816fa234f24803b8ae79dc7753a91", "type": "github" }, "original": { @@ -1561,11 +1612,11 @@ ] }, "locked": { - "lastModified": 1722181019, - "narHash": "sha256-Lj/g1UzrsTZUixtveQix6eB3pon2j23qv5/5pzTx0LQ=", + "lastModified": 1722365976, + "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0e2f3b9c85f7bab3983098a01366876d34daf383", + "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index 2305973..5c46aba 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -137,6 +137,155 @@ }; programs = { + emacs = { + enable = true; + package = pkgs.emacs29-pgtk; + + extraPackages = epkgs: + with epkgs; [ + catppuccin-theme + company + dashboard + direnv + doom-modeline + eglot + evil + evil-leader + flycheck + flycheck-inline + nix-mode + treemacs + treemacs-evil + treesit-auto + treesit-grammars.with-all-grammars + tree-sitter-langs + vterm + ]; + + extraConfig = '' + ; Catppuccin theme + (load-theme 'catppuccin :no-confirm) + + ; Doom modeline + (require 'doom-modeline) + (doom-modeline-mode 1) + + ; Set font + (set-frame-font "Maple Mono NF 12" nil t) + + ; Change default indent size to 2 spaces + (setq-default indent-tabs-mode nil) ;; Use spaces instead of tabs + (setq-default standard-indent 2) ;; Change indent + (setq-default tab-width 2) ;; Change tab width + + ; Evil mode + (setq evil-want-C-u-scroll t) + (require 'evil) + (evil-mode 1) + + ;; Treemacs (+ evil mode support) + (require 'treemacs) + (require 'treemacs-evil) ; Optional: if you want Evil keybindings for Treemacs + + ;; Evil leader + (global-evil-leader-mode) + (evil-leader/set-leader "") + (evil-leader/set-key "e" 'treemacs) + + ;; Centered scrolling + (defun my/evil-scroll-up () + "Scroll up half a screen and center the line." + (interactive) + (evil-scroll-up nil) + (recenter)) + + (defun my/evil-scroll-down () + "Scroll down half a screen and center the line." + (interactive) + (evil-scroll-down nil) + (recenter)) + + (define-key evil-normal-state-map (kbd "C-u") 'my/evil-scroll-up) + (define-key evil-normal-state-map (kbd "C-d") 'my/evil-scroll-down) + + ; Disable menubar and toolbar + (menu-bar-mode -1) + (tool-bar-mode -1) + + ; Dashboard + (require 'dashboard) + (dashboard-setup-startup-hook) + (setq dashboard-startup-banner 'logo) + + ; Direnv + (direnv-mode) + + ; Nix setup + (require 'nix-mode) + (add-to-list 'auto-mode-alist '("\\.nix\\'" . nix-mode)) + + ; Tree-sitter setup + (require 'treesit) + (require 'tree-sitter-langs) + (require 'treesit-auto) + (global-treesit-auto-mode) + + (add-hook 'prog-mode-hook #'tree-sitter-mode) + (add-hook 'prog-mode-hook #'tree-sitter-hl-mode) + + ;; Use Tree-sitter for better syntax highlighting + (dolist (lang treesit-language-source-alist) + (let ((mode (intern (format "%s-ts-mode" (car lang))))) + (when (fboundp mode) + (add-to-list 'major-mode-remap-alist + (cons (intern (car lang)) mode))))) + + ; Eglot setup + (add-hook 'prog-mode-hook 'eglot-ensure) + (add-hook 'nix-mode-hook 'eglot-ensure) + + ;; Function to format the buffer using Eglot + (defun my/eglot-format-buffer-on-save () + "Format the current buffer if Eglot is active." + (when (bound-and-true-p eglot--managed-p) + (eglot-format-buffer))) + + ;; Add the function to the save-hook + (add-hook 'before-save-hook #'my/eglot-format-buffer-on-save) + + ; Flycheck setup + (require 'flycheck) + (global-flycheck-mode) + + ; Flycheck-inline setup + (require 'flycheck-inline) + (add-hook 'flycheck-mode-hook #'flycheck-inline-mode) + + ; Disable Flycheck modeline error messages + (setq-default flycheck-mode-line-prefix "") + (setq-default flycheck-display-errors-function #'flycheck-inline-display-errors) + + ; Company mode setup + (require 'company) + (global-company-mode) ; Enable Company mode globally + + ; Key bindings for company mode + (setq company-idle-delay 0.2) ; Start completion after a short delay + (setq company-minimum-prefix-length 1) ; Start completion after typing 1 character + (setq company-show-numbers t) ; Show numbers for completion candidates + (global-set-key (kbd "M-/") 'company-complete) ; Trigger completion manually with M-/ + + (defun my/compile-and-focus-treemacs () + "Run `compile` and focus on the project root in `Treemacs`." + (interactive) + (let ((default-directory (project-root (project-current t)))) + (compile (read-shell-command "Compile command: " (concat (or compile-command "make") " "))) + (treemacs-select-window))) + + (global-set-key (kbd "C-c C-c") 'my/compile-and-focus-treemacs) + ''; + }; + wezterm.extraConfig = builtins.readFile ./wezterm.lua; git = { diff --git a/homes/x86_64-linux/marshall@navis/hyprland/default.nix b/homes/x86_64-linux/marshall@navis/hyprland/default.nix index 5371a97..d8d1378 100644 --- a/homes/x86_64-linux/marshall@navis/hyprland/default.nix +++ b/homes/x86_64-linux/marshall@navis/hyprland/default.nix @@ -84,7 +84,7 @@ with pkgs; { device = [ { - name = "logitech-usb-receiver"; + name = "logitech-g502-x-plus"; sensitivity = -0.5; } ]; @@ -191,7 +191,6 @@ with pkgs; { "${modS}, q, exit" # Toggles - "${mod}, j, togglesplit" "${mod}, Space, togglefloating" # Focus movements diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index 4188bc8..9f2c5ae 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -207,7 +207,7 @@ with lib // pkgs // inputs; { max-jobs = "auto"; sandbox-fallback = false; sandbox = true; - system-features = ["nixos-test" "kvm" "recursive-nix" "big-parallel"]; + system-features = ["nixos-test" "kvm" "recursive-nix" "big-parallel" "gccarch-x86-64-v4"]; use-cgroups = true; use-xdg-base-directories = true; warn-dirty = false; @@ -406,7 +406,6 @@ with lib // pkgs // inputs; { flatpak.enable = true; getty.autologinUser = "marshall"; gnome.gnome-keyring.enable = true; - ollama.enable = true; openssh.enable = true; spice-vdagentd.enable = true; udisks2.enable = true;