larstvei/nix-config
1
0
Fork 0
mirror of https://github.com/larstvei/nix-config.git synced 2024-11-26 00:48:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove custom Emacs build

Browse Source 
Switching (updating) caused Emacs to build, which takes a couple of minutes.
This made is less tempting to update, leading to a bit more clutter.

It seems that I am sacrificing rounded corners and having the color theme sync
with the OS.
This commit is contained in:
larstvei 2024-03-28 01:56:03 +01:00
parent b727b0e128
commit de6f0c5ca5
3 changed files with 26 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
flake.lock
View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1708737761,
"narHash": "sha256-sR/1cYjpgr71ZSrt6Kp5Dg4Ul3mo6pZIG400tuzYks8=",
"lastModified": 1710717205,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "bbde06bed1b72eddff063fa42f18644e90a0121e",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
"type": "github"
},
"original": {
@ -20,44 +20,6 @@
"type": "github"
}
},
"emacs": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1688322111,
"narHash": "sha256-wwc+POUpjLYp14H6xhD8QpFax80Nyt8QJekzbvbUP3g=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "3372519e7d0a4fa74beaa60dc07f3fd2b34379d7",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -65,11 +27,11 @@
]
},
"locked": {
"lastModified": 1708806879,
"narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
"lastModified": 1711554349,
"narHash": "sha256-RypwcWEIFePBI0Hubfj4chanbM/G2yzJzC6wgz+dmS4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
"rev": "179f6acaf7c068c7870542cdae72afec9427a5b0",
"type": "github"
},
"original": {
@ -79,54 +41,6 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1708655239,
"narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1708702655,
"narHash": "sha256-qxT5jSLhelfLhQ07+AUxSTm1VnVH+hQxDkQSZ/m/Smo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c5101e457206dd437330d283d6626944e28794b3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1708751719,
"narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1685573264,
"narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
@ -142,29 +56,29 @@
"type": "github"
}
},
"root": {
"inputs": {
"darwin": "darwin",
"emacs": "emacs",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
"systems": {
"nixpkgs-unstable": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"lastModified": 1711401922,
"narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "07262b18b97000d16a4bdb003418bd2fb067a932",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
}
}
},
"root": "root",

16
flake.nix
View File

@ -16,9 +16,6 @@
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
emacs = {
url = "github:nix-community/emacs-overlay";
};
};
outputs = { self, nixpkgs, darwin, home-manager, ... }@inputs: {
@ -45,20 +42,7 @@
nixpkgs = {
config.allowUnfree = true;
overlays = with inputs; [
emacs.overlays.emacs
emacs.overlays.package
(final: prev: {
emacs-git = (prev.emacs-git.override {
# withXwidgets = true;
withTreeSitter = true;
withGTK3 = true;
}).overrideAttrs (o: rec {
buildInputs = o.buildInputs ++ [ prev.darwin.apple_sdk.frameworks.WebKit ];
patches = [
./patches/no-titlebar-rounded-corners.patch
./patches/system-appearance.patch
];
});
maude-mac = final.callPackage ./pkgs/maude-mac { };
})
];

6
modules/home.nix
View File

@ -2,7 +2,7 @@
home.packages = with pkgs; [
((emacsPackagesFor emacs-git).emacsWithPackages
((emacsPackagesFor emacs29).emacsWithPackages
(epkgs: with epkgs; [
vterm
pdf-tools
@ -49,7 +49,7 @@
jdk
jq
leiningen
maude-mac
# maude-mac
minizinc
nixpkgs-fmt
pandoc
@ -57,7 +57,7 @@
pdf2svg
poppler_utils
ripgrep
rnix-lsp
# rnix-lsp
# rust-analyzer
rustup
shortcat