moritz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve code quality

nixos
Moritz Böhme 2022-12-30 18:58:13 +01:00
parent 8e70a05d6d
commit fc1084b0ca
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flake.nix
View File

@ -61,20 +61,32 @@
utils.lib.mkFlake { utils.lib.mkFlake {
inherit self inputs; inherit self inputs;
supportedSystems = [ "x86_64-linux" ];
channelsConfig.allowUnfree = true; channelsConfig.allowUnfree = true;
################ ################
### Overlays ### ### Overlays ###
################ ################
overlays.default = import ./overlays { inherit inputs; }; overlay = import ./overlays { inherit inputs; };
channels.nixpkgs.overlaysBuilder = channels: [ channels.nixpkgs.overlaysBuilder = channels: [
self.overlays.default self.overlay
inputs.utils.overlay inputs.agenix.overlay
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
inputs.howdy.overlays.default inputs.howdy.overlays.default
inputs.hyprland.overlays.default
inputs.hyprpaper.overlays.default
inputs.utils.overlay
]; ];
# overlays = utils.lib.exportOverlays {
# inherit (self) pkgs inputs;
# };
overlays.default = self.overlay;
############### ###############
### Modules ### ### Modules ###
############### ###############
@ -139,6 +151,8 @@
shellcheck.enable = true; shellcheck.enable = true;
}; };
}; };
packages = utils.lib.exportPackages self.overlays channels;
}; };
}; };
} }

1
modules/profiles/desktop.nix
View File

@ -95,7 +95,6 @@ with lib; {
mullvad.enable = true; mullvad.enable = true;
openconnect.enable = true; openconnect.enable = true;
openvpn.enable = true; openvpn.enable = true;
picom.enable = true;
printing.enable = true; printing.enable = true;
redshift.enable = true; redshift.enable = true;
}; };

7
overlays/default.nix
View File

@ -1,9 +1,6 @@
{ inputs }: final: prev: { { inputs }: final: prev: {
nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}";
agenix = inputs.agenix.defaultPackage."${prev.system}";
logseq-wayland = prev.symlinkJoin { logseq-wayland = prev.symlinkJoin {
name = "logseq"; name = "logseq-wayland";
paths = [ prev.logseq ]; paths = [ prev.logseq ];
nativeBuildInputs = [ prev.makeWrapper ]; nativeBuildInputs = [ prev.makeWrapper ];
postBuild = '' postBuild = ''
@ -13,11 +10,13 @@
}; };
waybar-hyprland = prev.waybar.overrideAttrs (old: { waybar-hyprland = prev.waybar.overrideAttrs (old: {
pname = "${old.pname}-hyprland";
postPatch = old.postPatch or "" + '' postPatch = old.postPatch or "" + ''
sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp
''; '';
mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ]; mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ];
}); });
master = import inputs.master { master = import inputs.master {
inherit (prev) system; inherit (prev) system;
config.allowUnfree = true; config.allowUnfree = true;