This commit is contained in:
Simon Gardling 2025-06-11 15:26:04 -07:00
parent bf59582afd
commit 009136a417
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
5 changed files with 48 additions and 45 deletions

60
flake.lock generated
View File

@ -38,11 +38,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749412641, "lastModified": 1749650702,
"narHash": "sha256-1ftxNhm7bmqv3TDVYmn+DQIBHNJmDBgIHqIqCaPBcpk=", "narHash": "sha256-4ip/dnDf8vofZoW0Pi2MwwwWTNG4d8IMvTj/BV6H740=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "aa46f16e8aafe8903d59fcd71e9c0786d31de861", "rev": "cfe6d82c1c57685d12792a752dd7d28450b300c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +120,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749521434, "lastModified": 1749662391,
"narHash": "sha256-iYuO2A6EeCk3yt7i+u5BbKpYUKBWZrWwEvyMzx7JL8o=", "narHash": "sha256-Adk/3i35uhGcr8XipH5synkXjtj+RDDy3RBZqjq+gvQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a1fc4a1252cf8f730d39a6570d36b9b95b478cd5", "rev": "f2bb2b16cb85b5e54bfa62a92daa674c7b906ca7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -142,11 +142,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1749278330, "lastModified": 1749451322,
"narHash": "sha256-8NKf1rHaKg+7MRoj7hhPlS048upmpwSXsUx2+6phePI=", "narHash": "sha256-t53R3kSDl4Jie+Ooxi/aQFN2ODRp1tXQSJBevOt3IkQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "68e191fa1f76ab42d3eb7195844eab261e412e2e", "rev": "77de5067629e201436c76f14f96614a19368c4ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +235,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749526227, "lastModified": 1749657191,
"narHash": "sha256-djUEgLQNnOA2SEClYFvBr9tJfMcQajuaU186tpPIYU4=", "narHash": "sha256-QLilaHuhGxiwhgceDWESj9gFcKIdEp7+9lRqNGpN8S4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e9763eb195c1e3d508892993cf112bd75d6fd712", "rev": "faeab32528a9360e9577ff4082de2d35c6bbe1ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,11 +257,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749312278, "lastModified": 1749495634,
"narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=", "narHash": "sha256-NPifVq2XZGRCsLBoUt6M5YUTiIh23+ubq57w7mSODt8=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455", "rev": "c40d2f31f92571bf341497884174a132829ef0fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -311,11 +311,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1749525718, "lastModified": 1749639406,
"narHash": "sha256-n4qouY1cHRvXxsYVPgoULEnUfCemuxjl37grfNsImII=", "narHash": "sha256-uRWykdzOlpdXfAZAJLPdBD3y25Gnk9qxAlpGaTfcZLA=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "9c6c994cad6c5d5079d0affa570beeab22648f03", "rev": "a38e8adc092396b2f5e288d91573086da4fd0cfc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -344,11 +344,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749474820, "lastModified": 1749634836,
"narHash": "sha256-hf5eCZ0bbqwOKPvPKn8Rutwj+xs3GhAfB0AjGa8tIEM=", "narHash": "sha256-V2QM8Gz2rtqn13+1eKGDl4PugfIbvlWt/9ln3Mzkbv0=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "a18d24fc24d8b17242e336ccf39fcbe91e8161fd", "rev": "07080a0431d86d64efed6fa557c2a02cb9041e93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -456,11 +456,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749194353, "lastModified": 1749419176,
"narHash": "sha256-i6nNh8It11J9afo8QAR1Vwk4qKz/byIc5yq0rU3SW7M=", "narHash": "sha256-Hs0vidgwvBiBuqNjR5oCQMMGUfUYwwnyxLShg3yzhWU=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "6acff6c1f8306a0a1d29be8fd1ffa63cff1ad598", "rev": "9fc1b9076cf49c7f54497df9cfa4485a63f14d3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -477,11 +477,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749523120, "lastModified": 1749609482,
"narHash": "sha256-lEhEK8qE8xto2Wnj4f7R+VRSg7M6tgTTkJVTZ2QxXOI=", "narHash": "sha256-R+Y3tXIUAMosrgo/ynhIUPEONZ+cM0ScbgN7KA8OkoE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d0727dbab79c5a28289f3c03e4fac7d5b95bafb3", "rev": "a17da8deb943e7c8b4151914abbfe33d5a4e5b0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -548,11 +548,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749511163, "lastModified": 1749673264,
"narHash": "sha256-0NpDb30Wf1wBeMHQP4N6mUVIq+tNujNX9hplZSvXWKE=", "narHash": "sha256-4V1RTD5UZieXllOq0U4OCmdHNFyTquFKc6BoSBvnTGI=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "4cbc88072f1597e1757ec82fefaacc02f49c6c98", "rev": "114ff3933cd2ae3b1e123971ae02a80f0070e540",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -8,6 +8,7 @@
imports = [ imports = [
./no-gui.nix ./no-gui.nix
./progs/alacritty.nix ./progs/alacritty.nix
./progs/emacs.nix
# ./progs/gpt4all/gpt4all.nix # ./progs/gpt4all/gpt4all.nix
# ./progs/trezor.nix # - broken # ./progs/trezor.nix # - broken
]; ];

View File

@ -45,17 +45,6 @@ let
cmake-language-server # cmake lsp cmake-language-server # cmake lsp
]; ];
# Praise be to the church of emacs
emacs_stuff = with pkgs; [
emacs-unstable-pgtk
# shell check things
shellcheck
# for search
fd
];
in in
{ {
imports = [ imports = [
@ -109,7 +98,6 @@ in
ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg` ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg`
lurk # better strace lurk # better strace
# alternative to `find` # alternative to `find`
fd fd
@ -204,8 +192,7 @@ in
jasmin jasmin
] ]
++ rust_pkgs ++ rust_pkgs
++ lsps ++ lsps;
++ emacs_stuff;
# https://github.com/flamegraph-rs/flamegraph # https://github.com/flamegraph-rs/flamegraph
home.file.".cargo/config.toml".text = '' home.file.".cargo/config.toml".text = ''

View File

@ -0,0 +1,16 @@
{ pkgs, config, ... }:
{
programs.emacs = {
enable = true;
package = pkgs.emacs-unstable-pgtk;
extraPackages = epkgs: [
epkgs.dracula-theme
pkgs.shellcheck
# for file search
pkgs.fd
];
extraConfig = "";
};
}

View File

@ -130,7 +130,6 @@
"${pkgs.fuzzel}/bin/fuzzel" "${pkgs.fuzzel}/bin/fuzzel"
]; ];
"Mod+O".action = toggle-overview; "Mod+O".action = toggle-overview;
# open a terminal # open a terminal