mirror of
https://github.com/librephoenix/nixos-config
synced 2026-01-15 21:24:00 +05:30
Compare commits
2 commits
870d360e8a
...
e3ac21a61d
| Author | SHA1 | Date | |
|---|---|---|---|
|
e3ac21a61d | ||
|
|
d91cdb6f93 |
4 changed files with 239 additions and 183 deletions
132
flake.lock
generated
132
flake.lock
generated
|
|
@ -71,11 +71,11 @@
|
||||||
"base16-helix": {
|
"base16-helix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752979451,
|
"lastModified": 1760703920,
|
||||||
"narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
|
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-helix",
|
"repo": "base16-helix",
|
||||||
"rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
|
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -104,11 +104,11 @@
|
||||||
"blocklist-hosts": {
|
"blocklist-hosts": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764276621,
|
"lastModified": 1764881424,
|
||||||
"narHash": "sha256-gYuj1iU2p02RQKFfSIsau9aIcUj82SuhFAGwdSwNr+s=",
|
"narHash": "sha256-i+CthE7tyFicVSDxa7LI/7RkWoD3W2/uNGrKGDpbEtw=",
|
||||||
"owner": "StevenBlack",
|
"owner": "StevenBlack",
|
||||||
"repo": "hosts",
|
"repo": "hosts",
|
||||||
"rev": "f0c008d73a95659429228d704339e0e80a20a262",
|
"rev": "821e6fbca7e2d70a8f04987a2436752f006c7c14",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -126,11 +126,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764153295,
|
"lastModified": 1764851612,
|
||||||
"narHash": "sha256-Y+Cp19zLo5JZVLSbzpyCTSK1bVYfE3Leuut6nQVkdR4=",
|
"narHash": "sha256-fz35kxfZAmnzbWZu0BEseRRMUwS7y4qBEVFlPkpLuHA=",
|
||||||
"owner": "chaotic-cx",
|
"owner": "chaotic-cx",
|
||||||
"repo": "nyx",
|
"repo": "nyx",
|
||||||
"rev": "29c49282c9b2e8216004a87086494defe401fee8",
|
"rev": "8620477f6ea262f2e8d02ac19abf0c7abbbf7bf6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -147,11 +147,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764264160,
|
"lastModified": 1764926139,
|
||||||
"narHash": "sha256-1tgVrTyMD9dFZ9XyFgiFz9B5gDk20FviqWHuW59RdDY=",
|
"narHash": "sha256-Indg7ZRhsjALhSt+IQZlA7h5KbW9GQtgB/2Q1MkSMZw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "f2272c1235937f3043a6d9cde826d2df729d8d95",
|
"rev": "f9f62d4c6bfa3419f340d816293733ebe1360415",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -163,11 +163,11 @@
|
||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758112371,
|
"lastModified": 1764724327,
|
||||||
"narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
|
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
|
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -200,11 +200,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756770412,
|
"lastModified": 1763759067,
|
||||||
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -269,11 +269,11 @@
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"host": "gitlab.gnome.org",
|
"host": "gitlab.gnome.org",
|
||||||
"lastModified": 1762869044,
|
"lastModified": 1764524476,
|
||||||
"narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
|
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
|
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -292,11 +292,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764075860,
|
"lastModified": 1764788330,
|
||||||
"narHash": "sha256-KYEIHCBBw+/lwKsJNRNoUxBB4ZY2LK0G0T8f+0i65q0=",
|
"narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "295d90e22d557ccc3049dc92460b82f372cd3892",
|
"rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -312,11 +312,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764194569,
|
"lastModified": 1764912896,
|
||||||
"narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=",
|
"narHash": "sha256-ftxQocr098v5ngqB3SXa9tW6aqovBSBOEdIRcLEj44c=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0",
|
"rev": "6bcb2395ab9ed05616052262da526cd7c5b4b123",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -782,11 +782,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763714684,
|
"lastModified": 1764746434,
|
||||||
"narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=",
|
"narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=",
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3",
|
"rev": "b4c0b604148adacf119b89824ed26df8926ce42c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -820,11 +820,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763966396,
|
"lastModified": 1764667669,
|
||||||
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
|
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
|
"rev": "418468ac9527e799809c900eda37cbff999199b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -836,11 +836,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763948260,
|
"lastModified": 1764560356,
|
||||||
"narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=",
|
"narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c",
|
"rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -852,11 +852,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764494334,
|
"lastModified": 1764831616,
|
||||||
"narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=",
|
"narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d542db745310b6929708d9abea513f3ff19b1341",
|
"rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -867,11 +867,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763966396,
|
"lastModified": 1764667669,
|
||||||
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
|
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
|
"rev": "418468ac9527e799809c900eda37cbff999199b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -898,11 +898,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762977756,
|
"lastModified": 1764517877,
|
||||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -924,11 +924,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758998580,
|
"lastModified": 1764773531,
|
||||||
"narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
|
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
|
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1007,11 +1007,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764038373,
|
"lastModified": 1764729618,
|
||||||
"narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=",
|
"narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9",
|
"rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1025,11 +1025,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764211126,
|
"lastModified": 1764902447,
|
||||||
"narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=",
|
"narHash": "sha256-wNqkDBj+tjK619sTHPEA7uhjr7DHHEY8OsFou31dxy0=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed",
|
"rev": "d914a744a83098eeb28125d2848ad383b209223f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1077,11 +1077,11 @@
|
||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764254063,
|
"lastModified": 1764860352,
|
||||||
"narHash": "sha256-V22JzkaTLF/GAL2LgqvOsJhAr8JbJsKaD8hnHjGwXfE=",
|
"narHash": "sha256-bWrh2T6EPiiZC7jY0jK5cWRwkG0hltnPT1etfHIHiXM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "a1451bc40413870f0c7b576b751c1ca92055e323",
|
"rev": "61a01b75f0a7e58dac486ddf022c628a71528399",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1171,11 +1171,11 @@
|
||||||
"tinted-schemes": {
|
"tinted-schemes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757716333,
|
"lastModified": 1763914658,
|
||||||
"narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
|
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "schemes",
|
"repo": "schemes",
|
||||||
"rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
|
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1187,11 +1187,11 @@
|
||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757811970,
|
"lastModified": 1764465359,
|
||||||
"narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
|
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-tmux",
|
"repo": "tinted-tmux",
|
||||||
"rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
|
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1203,11 +1203,11 @@
|
||||||
"tinted-zed": {
|
"tinted-zed": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757811247,
|
"lastModified": 1764464512,
|
||||||
"narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
|
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-zed",
|
"repo": "base16-zed",
|
||||||
"rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
|
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,15 @@
|
||||||
{ config, lib, pkgs, pkgs-stable, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
pkgs-stable,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.userSettings.emacs;
|
cfg = config.userSettings.emacs;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options = {
|
options = {
|
||||||
userSettings.emacs = {
|
userSettings.emacs = {
|
||||||
enable = lib.mkEnableOption "Enable emacs";
|
enable = lib.mkEnableOption "Enable emacs";
|
||||||
|
|
@ -15,132 +22,161 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
## THIS IS BROKEN BECAUSE THEY CHANGED EMACS IN NIXPKGS I THINK
|
## THIS IS BROKEN BECAUSE THEY CHANGED EMACS IN NIXPKGS I THINK
|
||||||
config = lib.mkIf false {
|
#config = lib.mkIf false {
|
||||||
#config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
(pkgs.emacsWithPackagesFromUsePackage {
|
(pkgs.emacsWithPackagesFromUsePackage {
|
||||||
config = ./init.el;
|
config = ./init.el;
|
||||||
package = pkgs.emacs-pgtk;
|
package = pkgs.emacs-pgtk;
|
||||||
alwaysEnsure = false;
|
alwaysEnsure = false;
|
||||||
extraEmacsPackages = epkgs: with epkgs; [
|
extraEmacsPackages =
|
||||||
org-modern olivetti
|
epkgs: with epkgs; [
|
||||||
command-log-mode
|
org-modern
|
||||||
vertico corfu hotfuzz orderless
|
olivetti
|
||||||
evil evil-collection evil-snipe evil-owl evil-vimish-fold
|
command-log-mode
|
||||||
dashboard doom-themes doom-modeline
|
vertico
|
||||||
nerd-icons nerd-icons-dired nerd-icons-corfu
|
corfu
|
||||||
nerd-icons-ibuffer nerd-icons-completion
|
hotfuzz
|
||||||
yasnippet shackle
|
orderless
|
||||||
projectile treemacs treemacs-projectile
|
evil
|
||||||
treemacs-evil treemacs-nerd-icons
|
evil-collection
|
||||||
treesit-grammars.with-all-grammars
|
evil-snipe
|
||||||
git-timemachine wgrep
|
evil-owl
|
||||||
magit magit-todos
|
evil-vimish-fold
|
||||||
undo-fu undo-fu-session
|
dashboard
|
||||||
org-roam org-node org-node-fakeroam
|
doom-themes
|
||||||
vterm vterm-toggle sudo-edit
|
doom-modeline
|
||||||
direnv
|
nerd-icons
|
||||||
svelte-mode
|
nerd-icons-dired
|
||||||
typescript-mode
|
nerd-icons-corfu
|
||||||
sass-mode
|
nerd-icons-ibuffer
|
||||||
rainbow-mode
|
nerd-icons-completion
|
||||||
default-text-scale
|
yasnippet
|
||||||
(epkgs.callPackage (
|
shackle
|
||||||
{ lib, trivialBuild }:
|
projectile
|
||||||
|
treemacs
|
||||||
|
treemacs-projectile
|
||||||
|
treemacs-evil
|
||||||
|
treemacs-nerd-icons
|
||||||
|
treesit-grammars.with-all-grammars
|
||||||
|
git-timemachine
|
||||||
|
wgrep
|
||||||
|
magit
|
||||||
|
magit-todos
|
||||||
|
undo-fu
|
||||||
|
undo-fu-session
|
||||||
|
org-roam
|
||||||
|
org-node
|
||||||
|
org-node-fakeroam
|
||||||
|
vterm
|
||||||
|
vterm-toggle
|
||||||
|
sudo-edit
|
||||||
|
direnv
|
||||||
|
svelte-mode
|
||||||
|
typescript-mode
|
||||||
|
sass-mode
|
||||||
|
rainbow-mode
|
||||||
|
default-text-scale
|
||||||
|
(epkgs.callPackage (
|
||||||
|
{ lib, trivialBuild }:
|
||||||
|
|
||||||
trivialBuild {
|
trivialBuild {
|
||||||
pname = "web-mode";
|
pname = "web-mode";
|
||||||
version = "17.3.20";
|
version = "17.3.20";
|
||||||
|
|
||||||
src = builtins.fetchGit {
|
src = builtins.fetchGit {
|
||||||
url = "https://github.com/fxbois/web-mode.git";
|
url = "https://github.com/fxbois/web-mode.git";
|
||||||
rev = "0c83581d1e93d1d802c730a1d5e90cd1c740e1b2";
|
rev = "0c83581d1e93d1d802c730a1d5e90cd1c740e1b2";
|
||||||
ref = "main";
|
ref = "main";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "web template editing mode for emacs";
|
description = "web template editing mode for emacs";
|
||||||
homepage = "https://web-mode.org/";
|
homepage = "https://web-mode.org/";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
) {})
|
) { })
|
||||||
gdscript-mode
|
gdscript-mode
|
||||||
nix-mode
|
nix-mode
|
||||||
python python-mode
|
python
|
||||||
lsp-mode flycheck lsp-ui lsp-treemacs
|
python-mode
|
||||||
# fix ultra-scroll
|
lsp-mode
|
||||||
(epkgs.callPackage (
|
flycheck
|
||||||
{ lib, trivialBuild }:
|
lsp-ui
|
||||||
|
lsp-treemacs
|
||||||
|
# fix ultra-scroll
|
||||||
|
(epkgs.callPackage (
|
||||||
|
{ lib, trivialBuild }:
|
||||||
|
|
||||||
trivialBuild {
|
trivialBuild {
|
||||||
pname = "ultra-scroll";
|
pname = "ultra-scroll";
|
||||||
version = "0.2.0";
|
version = "0.2.0";
|
||||||
|
|
||||||
src = builtins.fetchGit {
|
src = builtins.fetchGit {
|
||||||
url = "https://github.com/jdtsmith/ultra-scroll.git";
|
url = "https://github.com/jdtsmith/ultra-scroll.git";
|
||||||
rev = "64ad7be02e11317576498dabb15c92cf31e2c04c";
|
rev = "64ad7be02e11317576498dabb15c92cf31e2c04c";
|
||||||
ref = "main";
|
ref = "main";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "scroll Emacs like lightning";
|
description = "scroll Emacs like lightning";
|
||||||
homepage = "https://github.com/jdtsmith/ultra-scroll";
|
homepage = "https://github.com/jdtsmith/ultra-scroll";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
) {})
|
) { })
|
||||||
(epkgs.callPackage (
|
(epkgs.callPackage (
|
||||||
{ lib, trivialBuild }:
|
{ lib, trivialBuild }:
|
||||||
|
|
||||||
trivialBuild {
|
trivialBuild {
|
||||||
pname = "lsp-treemacs-nerd-icons";
|
pname = "lsp-treemacs-nerd-icons";
|
||||||
version = "2efa09a-unstable";
|
version = "2efa09a-unstable";
|
||||||
|
|
||||||
src = builtins.fetchGit {
|
src = builtins.fetchGit {
|
||||||
url = "https://github.com/Velnbur/lsp-treemacs-nerd-icons.git";
|
url = "https://github.com/Velnbur/lsp-treemacs-nerd-icons.git";
|
||||||
rev = "2efa09a701b8b455bfb66529454f27c30f7462dc";
|
rev = "2efa09a701b8b455bfb66529454f27c30f7462dc";
|
||||||
ref = "master";
|
ref = "master";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = with pkgs.emacsPackages; [
|
buildInputs = with pkgs.emacsPackages; [
|
||||||
lsp-treemacs
|
lsp-treemacs
|
||||||
treemacs
|
treemacs
|
||||||
nerd-icons
|
nerd-icons
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Use nerd icons for lsp-mode and lsp-treemacs";
|
description = "Use nerd icons for lsp-mode and lsp-treemacs";
|
||||||
homepage = "https://github.com/Velnbur/lsp-treemacs-nerd-icons";
|
homepage = "https://github.com/Velnbur/lsp-treemacs-nerd-icons";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
) {})
|
) { })
|
||||||
(epkgs.callPackage (
|
(epkgs.callPackage (
|
||||||
{ lib, trivialBuild }:
|
{ lib, trivialBuild }:
|
||||||
|
|
||||||
trivialBuild {
|
trivialBuild {
|
||||||
pname = "scratch-plus";
|
pname = "scratch-plus";
|
||||||
version = "2efa09a-unstable";
|
version = "2efa09a-unstable";
|
||||||
|
|
||||||
src = builtins.fetchGit {
|
src = builtins.fetchGit {
|
||||||
url = "https://git.sr.ht/~swflint/scratch-plus";
|
url = "https://git.sr.ht/~swflint/scratch-plus";
|
||||||
rev = "b794901f968000f6e338808307385b683b79ec8b";
|
rev = "b794901f968000f6e338808307385b683b79ec8b";
|
||||||
ref = "main";
|
ref = "main";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Better scratch buffers";
|
description = "Better scratch buffers";
|
||||||
homepage = "https://git.sr.ht/~swflint/scratch-plus";
|
homepage = "https://git.sr.ht/~swflint/scratch-plus";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
) {})
|
) { })
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
fira-code
|
fira-code
|
||||||
nerd-fonts.fira-code
|
nerd-fonts.fira-code
|
||||||
|
|
@ -148,8 +184,8 @@ in {
|
||||||
home.file.".config/emacs/init.el".source = ./init.el;
|
home.file.".config/emacs/init.el".source = ./init.el;
|
||||||
home.file.".config/emacs/lib".source = ./lib;
|
home.file.".config/emacs/lib".source = ./lib;
|
||||||
home.file.".config/emacs/themes/doom-stylix-theme.el".source = config.lib.stylix.colors {
|
home.file.".config/emacs/themes/doom-stylix-theme.el".source = config.lib.stylix.colors {
|
||||||
template = builtins.readFile ./lib/doom-stylix-theme.el.mustache;
|
template = builtins.readFile ./lib/doom-stylix-theme.el.mustache;
|
||||||
extension = ".el";
|
extension = ".el";
|
||||||
};
|
};
|
||||||
home.file.".config/emacs/sysvars.el".text = ''
|
home.file.".config/emacs/sysvars.el".text = ''
|
||||||
;;; sysvars.el --- imported variables from nixos config -*- lexical-binding: t; no-byte-compile: t; -*-
|
;;; sysvars.el --- imported variables from nixos config -*- lexical-binding: t; no-byte-compile: t; -*-
|
||||||
|
|
@ -166,6 +202,8 @@ in {
|
||||||
|
|
||||||
;;; sysvars.el ends here
|
;;; sysvars.el ends here
|
||||||
'';
|
'';
|
||||||
wayland.windowManager.hyprland.settings.exec-once = lib.optionals config.wayland.windowManager.hyprland.enable [ "emacs --daemon" ];
|
wayland.windowManager.hyprland.settings.exec-once =
|
||||||
|
lib.optionals config.wayland.windowManager.hyprland.enable
|
||||||
|
[ "emacs --daemon" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -452,13 +452,14 @@
|
||||||
;; Enable corfu
|
;; Enable corfu
|
||||||
(use-package corfu
|
(use-package corfu
|
||||||
:custom
|
:custom
|
||||||
|
(corfu-auto t)
|
||||||
(corfu-cycle t) ;; Enable cycling for `corfu-next/previous'
|
(corfu-cycle t) ;; Enable cycling for `corfu-next/previous'
|
||||||
;; (corfu-preview-current nil) ;; Disable current candidate preview
|
(corfu-preview-current t) ;; Disable current candidate preview
|
||||||
(corfu-preselect 'prompt) ;; Preselect the prompt
|
(corfu-preselect 'prompt) ;; Preselect the prompt
|
||||||
(corfu-on-exact-match 'insert) ;; Configure handling of exact matches
|
(corfu-on-exact-match 'insert) ;; Configure handling of exact matches
|
||||||
(corfu-auto nil) ;; auto complete
|
(corfu-auto-delay 0.15) ;; wait half a second though
|
||||||
(corfu-auto-delay 1.2) ;; wait half a second though
|
(corfu-auto-prefix 2) ;; also only for words 2 or more
|
||||||
(corfu-auto-prefix 5) ;; also only for words 3 or more
|
(corfu-min-width 120)
|
||||||
(defun corfu-lsp-setup ()
|
(defun corfu-lsp-setup ()
|
||||||
(setq-local completion-styles '(orderless flex hotfuzz)
|
(setq-local completion-styles '(orderless flex hotfuzz)
|
||||||
completion-category-defaults nil))
|
completion-category-defaults nil))
|
||||||
|
|
@ -1094,5 +1095,7 @@ Made for `org-tab-first-hook' in evil-mode."
|
||||||
|
|
||||||
(use-package rainbow-mode)
|
(use-package rainbow-mode)
|
||||||
|
|
||||||
|
(set-frame-font "FiraCode Nerd Font")
|
||||||
|
|
||||||
(provide 'init)
|
(provide 'init)
|
||||||
;;; init.el ends here
|
;;; init.el ends here
|
||||||
|
|
|
||||||
|
|
@ -128,6 +128,12 @@ in
|
||||||
"task_name" = "gitu";
|
"task_name" = "gitu";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
"space g G" = [
|
||||||
|
"task::Spawn"
|
||||||
|
{
|
||||||
|
"task_name" = "magit";
|
||||||
|
}
|
||||||
|
];
|
||||||
"space o d" = [
|
"space o d" = [
|
||||||
"task::Spawn"
|
"task::Spawn"
|
||||||
{
|
{
|
||||||
|
|
@ -221,6 +227,15 @@ in
|
||||||
use_new_terminal = false;
|
use_new_terminal = false;
|
||||||
hide = "on_success";
|
hide = "on_success";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
label = "magit";
|
||||||
|
command = "emacsclient -c --eval '(magit-status)' &> /dev/null & disown; exit;";
|
||||||
|
reveal = "always";
|
||||||
|
reveal_target = "center";
|
||||||
|
allow_concurrent_runs = false;
|
||||||
|
use_new_terminal = false;
|
||||||
|
hide = "on_success";
|
||||||
|
}
|
||||||
{
|
{
|
||||||
label = "yazi";
|
label = "yazi";
|
||||||
command = "yazi";
|
command = "yazi";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue