pupbrained/nix-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: pupbrained:e556fec612ee72b69add9e703b33b636261d28ca
Branches Tags
pupbrained:main
pupbrained:asahi
...
compare: pupbrained:e7e32dfa484416130c6252910be9aad865b1eb5a
Branches Tags
pupbrained:main
pupbrained:asahi

2 commits
e556fec612 ... e7e32dfa48

Author SHA1 Message Date
Mars e7e32dfa48
Merge branch 'main' of https://git.pupbrained.xyz/pupbrained/nix-config 2024-08-12 00:32:51 -04:00
Mars 769bc078ef
some updates + testing out emacs 2024-08-12 00:31:35 -04:00
4 changed files with 270 additions and 111 deletions
Show stats Expand all files Collapse all files

226
flake.lock
View file

@ -97,11 +97,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1723330979, "lastModified": 1723389140,
"narHash": "sha256-OSwb8PTMfnK36trpBS2JShw5HiC2/c6ghT6CpzUJ/y0=", "narHash": "sha256-CYcXNzK5YMHeSCCproj64kwtonaavbCnDnq6koYXi88=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "e389756159d7ccfb7cf00645db5b86d94641718c", "rev": "a512107512f8d527db7152d48dedd6ebb764f9b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1714765312, "lastModified": 1720551955,
"narHash": "sha256-WqZX4PMw4raTRXUliz2cr5yZeIERLq4rjB3DUoxdWn8=", "narHash": "sha256-8ZsaT5+Ny2hz3iZzV5o5/L2YYDppP+1kj7zEgXxTMjI=",
"owner": "jcdickinson", "owner": "jcdickinson",
"repo": "codeium.nvim", "repo": "codeium.nvim",
"rev": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825", "rev": "f6a2ef32a9e923cb0104a19d3e426b0e40e49505",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,7 +189,6 @@
}, },
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixvim", "nixvim",
@ -197,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717408969, "lastModified": 1722113426,
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,11 +212,11 @@
"doomemacs": { "doomemacs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723239709, "lastModified": 1723252886,
"narHash": "sha256-KzW1CdVtAIa82tWgU9JEpIkIFT4jYMPz29QdjD6s1rY=", "narHash": "sha256-wrC3oAnVz22SHR/ujEG8wqaA9vfSNDlCiitW10iUlbM=",
"owner": "doomemacs", "owner": "doomemacs",
"repo": "doomemacs", "repo": "doomemacs",
"rev": "511c8af36537992fd60ff970e19e5638207546ed", "rev": "f5020a4f7f228a84a51039a57fbf67107a0f2d74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,11 +236,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723277852, "lastModified": 1723341846,
"narHash": "sha256-xCNyb1FuKSCQDj0EaN8lCtyJ8Yb3xPj69xralv786pk=", "narHash": "sha256-ZLQwk39U2ByDd8ZlsFOQN8wBRbjFtglCRgIHWDVG2RI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "1528fd2d8b6f51e6cf1d367da718570d61c48460", "rev": "516c442503ca7f744d46d30b77b2ca11f35f1e3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +258,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1723185066, "lastModified": 1723357708,
"narHash": "sha256-u7guFfIrfspwUp6/SEWCDhs2tVoE1fcgft0Fw7LdNEU=", "narHash": "sha256-y0FYxyHd45FQkl1S4PIq9eNaEe2tEemHpQ3sp+C19Pk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "d5f1b280af93acddbcce948d946bb5db2f8035fe", "rev": "344945339ec0e01c62195b849ae8a67eaa1004a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,22 +302,6 @@
} }
}, },
"flake-compat_3": { "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, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -335,7 +318,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": { "flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1650374568, "lastModified": 1650374568,
@ -351,7 +334,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_6": { "flake-compat_5": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1650374568, "lastModified": 1650374568,
@ -397,11 +380,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1722555600,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -536,11 +519,11 @@
"systems": "systems_9" "systems": "systems_9"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1710146030,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -602,7 +585,11 @@
}, },
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": [
"nixvim",
"nixvim",
"flake-compat"
],
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -616,11 +603,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719259945, "lastModified": 1723202784,
"narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -701,11 +688,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723015306, "lastModified": 1723399884,
"narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -723,11 +710,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719180626, "lastModified": 1723015306,
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -777,11 +764,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723322565, "lastModified": 1723405096,
"narHash": "sha256-iwTi2QEc1H6s65Uv7V/Tro/vkvg8WCnpdjzX01mDp7g=", "narHash": "sha256-2C5YJ3lYuRFTixTIfi5XL4IbMaf+bZ/qowyhZ5XKITs=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "01ff5fdf6a00a9231bd3b56400d8bcab378c4257", "rev": "118d4e1001d5847aa42d1e5d5fa9623954ae751d",
"revCount": 5076, "revCount": 5078,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -952,11 +939,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723016361, "lastModified": 1723367191,
"narHash": "sha256-iEVCAOn7WUdJGrK2EW5hkfl4gBmYl5gVck+MSn6ba44=", "narHash": "sha256-noi5tre7BLtxImN38jEHeVOtOG1Xu37sJFwHKSAPHjo=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "fc3d12deef508a73c7beef4cd9bebe03acde4ed7", "rev": "91178062f365b64eece94c5dff93e09b07e87d9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1009,11 +996,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719128254, "lastModified": 1722924007,
"narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "50581970f37f06a4719001735828519925ef8310", "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1030,11 +1017,11 @@
"systems": "systems_6" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1723278726, "lastModified": 1723365095,
"narHash": "sha256-SS7e1wL/1P/Ov6OX0VzyFqlCBYrmbgxeYqBCyWO0s+g=", "narHash": "sha256-2230LsHCU86sqVP2ND/w5A3JPH1eiikzrIPKVd0ZQho=",
"owner": "marienz", "owner": "marienz",
"repo": "nix-doom-emacs-unstraightened", "repo": "nix-doom-emacs-unstraightened",
"rev": "f2781cdac535d905c0ea9f75873ad3f00cdcb722", "rev": "c8e3c381a6cb4e12768f23265f3af65902d872a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1073,11 +1060,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722740924, "lastModified": 1723352546,
"narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "97ca0a0fca0391de835f57e44f369a283e37890f", "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1158,11 +1145,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1708475490, "lastModified": 1720957393,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260", "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1190,11 +1177,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1722813957, "lastModified": 1723175592,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1222,11 +1209,12 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1721562059, "lastModified": 1723221148,
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
"path": "/nix/store/afawjm6nv8m5aagkcqxlxgrr5qpyh6cm-source", "owner": "NixOS",
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", "repo": "nixpkgs",
"type": "path" "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
@ -1283,11 +1271,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1719444225, "lastModified": 1723421421,
"narHash": "sha256-tSTqQB0C1D4frFJI0ASXW0OWYHwqwcvLGxh9i9ieL40=", "narHash": "sha256-ohKD5dTOkz2wUa2od3G5COc0iAF2sV4HcNVeoPOfp7U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c0e0424411ef3bd1f55f5e1025e0934c63bfbff", "rev": "4e7d996aa858660e3261b4834ab00415cfe9b0fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1298,11 +1286,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1719254875, "lastModified": 1723175592,
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1321,11 +1309,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1719450216, "lastModified": 1723434584,
"narHash": "sha256-u/nnOqyS7agFU51JqnWZZmdMP+8NxrvA7bgby081bSU=", "narHash": "sha256-O3zbWIsVCi7IGCJ4V90X6hp529rAJuTd0eykddPRXHM=",
"owner": "pupbrained", "owner": "pupbrained",
"repo": "nvim-config", "repo": "nvim-config",
"rev": "6e9c79b8253997c56075f56d291fce35a2ab7095", "rev": "8b0165fcdc7b4dc2685e4350b98dc20c0ad343de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1343,14 +1331,15 @@
"home-manager": "home-manager_4", "home-manager": "home-manager_4",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_9",
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1719401747, "lastModified": 1723323133,
"narHash": "sha256-GuY035SXf/wv685mhXsHv/syYh3XT9U8ZDdxr1pGgts=", "narHash": "sha256-g3wit604jFhBvjDBziJgulDUXDl/ApafMXq7o7ioMxo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "53a9599cc4da4f7557995b8611e5dba831261eef", "rev": "f13bdef0bc697261c51eab686c28c7e2e7b7db3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1359,6 +1348,29 @@
"type": "github" "type": "github"
} }
}, },
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_5",
"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": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -1416,11 +1428,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723124382, "lastModified": 1723304838,
"narHash": "sha256-WdJYEBlc8qsif+y4qnkjaeEpDmOZhz8qA6i/2n1q2kw=", "narHash": "sha256-xAxVDxuvCs8WWkrxVWjCiqxTkHhGj7sSppr1YMuEdT8=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "dab022fb3127466e47e29e40769b11174b3e0ac3", "rev": "0daeb5c0b05cfdf2101b0f078c27539099bf38e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1432,7 +1444,7 @@
}, },
"snowfall-flake": { "snowfall-flake": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -1454,7 +1466,7 @@
}, },
"snowfall-lib": { "snowfall-lib": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_4",
"flake-utils-plus": "flake-utils-plus", "flake-utils-plus": "flake-utils-plus",
"nixpkgs": [ "nixpkgs": [
"snowfall-flake", "snowfall-flake",
@ -1478,7 +1490,7 @@
}, },
"snowfall-lib_2": { "snowfall-lib_2": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_5",
"flake-utils-plus": "flake-utils-plus_2", "flake-utils-plus": "flake-utils-plus_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -1658,11 +1670,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719243788, "lastModified": 1723303070,
"narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "rev": "14c092e0326de759e16b37535161b3cb9770cea3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1676,11 +1688,11 @@
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1719243788, "lastModified": 1723402464,
"narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "narHash": "sha256-xjunKUFQs9D7u0TpVoXhrRYb4tbVkutRoFUHj0lEydE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "rev": "c9f97032be6816fa234f24803b8ae79dc7753a91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1694,11 +1706,11 @@
"nixpkgs": "nixpkgs_11" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {
"lastModified": 1723303070, "lastModified": 1723402464,
"narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", "narHash": "sha256-xjunKUFQs9D7u0TpVoXhrRYb4tbVkutRoFUHj0lEydE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "14c092e0326de759e16b37535161b3cb9770cea3", "rev": "c9f97032be6816fa234f24803b8ae79dc7753a91",
"type": "github" "type": "github"
}, },
"original": { "original": {

149
homes/x86_64-linux/marshall@navis/default.nix
View file

@ -137,6 +137,155 @@
}; };
programs = { 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 "<SPC>")
(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; wezterm.extraConfig = builtins.readFile ./wezterm.lua;
git = { git = {

3
homes/x86_64-linux/marshall@navis/hyprland/default.nix
View file

@ -84,7 +84,7 @@ with pkgs; {
device = [ device = [
{ {
name = "logitech-usb-receiver"; name = "logitech-g502-x-plus";
sensitivity = -0.5; sensitivity = -0.5;
} }
]; ];
@ -191,7 +191,6 @@ with pkgs; {
"${modS}, q, exit" "${modS}, q, exit"
# Toggles # Toggles
"${mod}, j, togglesplit"
"${mod}, Space, togglefloating" "${mod}, Space, togglefloating"
# Focus movements # Focus movements

3
systems/x86_64-linux/navis/default.nix
View file

@ -207,7 +207,7 @@ with lib // pkgs // inputs; {
max-jobs = "auto"; max-jobs = "auto";
sandbox-fallback = false; sandbox-fallback = false;
sandbox = true; 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-cgroups = true;
use-xdg-base-directories = true; use-xdg-base-directories = true;
warn-dirty = false; warn-dirty = false;
@ -406,7 +406,6 @@ with lib // pkgs // inputs; {
flatpak.enable = true; flatpak.enable = true;
getty.autologinUser = "marshall"; getty.autologinUser = "marshall";
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;
ollama.enable = true;
openssh.enable = true; openssh.enable = true;
spice-vdagentd.enable = true; spice-vdagentd.enable = true;
udisks2.enable = true; udisks2.enable = true;