Now Emacs works on the Macbook
This commit is contained in:
parent
b4d239d34b
commit
3f39ace857
9 changed files with 158 additions and 127 deletions
|
@ -123,11 +123,11 @@
|
|||
# mbp is added bypassing Digga's mkFlake and adding a specific output to this flake
|
||||
pc = {
|
||||
system = "x86_64-linux";
|
||||
imports = [ { modules = ./hosts/pc; } ];
|
||||
imports = [{ modules = ./hosts/pc; }];
|
||||
};
|
||||
pbp = {
|
||||
system = "aarch64-linux";
|
||||
imports = [ { modules = ./hosts/pbp; } ];
|
||||
imports = [{ modules = ./hosts/pbp; }];
|
||||
modules = [
|
||||
"${pinebook-pro}/pinebook_pro.nix"
|
||||
];
|
||||
|
@ -155,7 +155,7 @@
|
|||
|
||||
home = {
|
||||
imports = [ (digga.lib.importModules ./users/modules) ];
|
||||
externalModules = [];
|
||||
externalModules = [ ];
|
||||
importables = rec {
|
||||
profiles = digga.lib.rakeLeaves ./users/profiles;
|
||||
suites = with profiles; rec {
|
||||
|
@ -173,7 +173,7 @@
|
|||
|
||||
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
|
||||
|
||||
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {};
|
||||
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
|
||||
|
||||
defaultTemplate = self.templates.bud;
|
||||
templates.bud.path = ./.;
|
||||
|
@ -189,6 +189,7 @@
|
|||
system = "x86_64-darwin";
|
||||
modules = [ home.darwinModules.home-manager ./hosts/mbp ];
|
||||
inputs = { inherit darwin; };
|
||||
specialArgs = { inherit emacs-overlay; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, home-manager, ...}:
|
||||
{ pkgs, home-manager, emacs-overlay, ... }:
|
||||
{
|
||||
imports = [
|
||||
../../users/andreaciceri
|
||||
|
@ -14,6 +14,8 @@
|
|||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [ (import ../../pkgs) emacs-overlay.overlay ];
|
||||
|
||||
nix = {
|
||||
package = pkgs.nixUnstable;
|
||||
extraOptions = ''
|
||||
|
@ -27,4 +29,4 @@
|
|||
options = "--delete-older-than 3d";
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ...}:
|
||||
{ pkgs, emacs-overlay, ... }:
|
||||
{
|
||||
imports = [
|
||||
./configuration.nix
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
final: prev: {
|
||||
# keep sources this first
|
||||
sources = prev.callPackage (import ./_sources/generated.nix) {};
|
||||
customEmacs = prev.callPackage (import ./emacs) {};
|
||||
sources = prev.callPackage (import ./_sources/generated.nix) { };
|
||||
customEmacs = prev.callPackage (import ./emacs) { };
|
||||
ungoogled-chromium = import ./ungoogled-chromium { inherit prev; };
|
||||
vscodium = import ./vscodium { inherit prev; };
|
||||
# then, call packages with `final.callPackage`
|
||||
}
|
||||
|
|
10
pkgs/ungoogled-chromium/default.nix
Normal file
10
pkgs/ungoogled-chromium/default.nix
Normal file
|
@ -0,0 +1,10 @@
|
|||
{ prev, pkgs, ... }:
|
||||
|
||||
prev.runCommandNoCC "wrap-chromium"
|
||||
{ buildInputs = with pkgs; [ makeWrapper ]; }
|
||||
''
|
||||
makeWrapper ${c}/bin/chromium $out/bin/chromium \
|
||||
--add-flags "--enable-features=UseOzonePlatform" \
|
||||
--add-flags "--ozone-platform=wayland"
|
||||
ln -sf ${c}/share $out/share
|
||||
''
|
10
pkgs/vscodium/default.nix
Normal file
10
pkgs/vscodium/default.nix
Normal file
|
@ -0,0 +1,10 @@
|
|||
{ prev, pkgs, ... }:
|
||||
|
||||
prev.runCommandNoCC "codium"
|
||||
{ buildInputs = with pkgs; [ makeWrapper ]; }
|
||||
''
|
||||
makeWrapper ${prev.vscodium}/bin/codium $out/bin/codium \
|
||||
--add-flags "--enable-features=UseOzonePlatform" \
|
||||
--add-flags "--ozone-platform=wayland"
|
||||
ln -sf ${prev.vscodium}/share $out/share
|
||||
''
|
7
profiles/chromecast/default.nix
Normal file
7
profiles/chromecast/default.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
config = {
|
||||
networking.firewall.extraCommands = ''
|
||||
iptables -I INPUT -p udp -m udp --dport 32768:60999 -j ACCEPT
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -1,15 +1,15 @@
|
|||
{ config, lib, pkgs, ... }: {
|
||||
home-manager.users."andreaciceri" = {...}: {
|
||||
{ config, lib, pkgs, emacs-overlay, ... }: {
|
||||
home-manager.users."andreaciceri" = { ... }: {
|
||||
imports = [
|
||||
../profiles/bat
|
||||
../profiles/fzf
|
||||
../profiles/zsh
|
||||
../profiles/direnv
|
||||
../profiles/exa
|
||||
../profiles/emacs
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
yarn
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -12,10 +12,9 @@
|
|||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
python-language-server
|
||||
fd
|
||||
ag
|
||||
nixpkgs-fmt
|
||||
rnix-lsp
|
||||
];
|
||||
] ++ (if config.network.hostname != "mbp" then python-language-server else [ ]);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue