swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 00:57:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: adapt flake for 'nix flake check'

Browse source
This commit is contained in:
Swarsel 2024-12-10 18:09:50 +01:00
parent 584cc31ce3
commit 453869609c
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
9 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
SwarselSystems.org
View file

@ -608,7 +608,6 @@ In this section I am creating some attributes that define general concepts of my
};
});
formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt);
overlays = [
checks = forAllSystems (
system:
let
@ -616,6 +615,7 @@ In this section I am creating some attributes that define general concepts of my
in
import ./checks { inherit self inputs system pkgs; }
);
overlaysList = [
(import ./overlays { inherit inputs; }).additions
(import ./overlays { inherit inputs; }).modifications
(import ./overlays { inherit inputs; }).nixpkgs-stable
@ -840,7 +840,7 @@ This is the "reference implementation" of a setup that runs without NixOS, only
imports = builtins.attrValues outputs.homeManagerModules;
nixpkgs = {
inherit (outputs) overlays;
overlays = outputs.overlaysList;
config = {
allowUnfree = true;
};
@ -933,7 +933,7 @@ My work machine. Built for more security, this is the gold standard of my config
nixpkgs = {
inherit (outputs) overlays;
overlays = outputs.overlaysList;
config = {
allowUnfree = true;
};
@ -1151,7 +1151,7 @@ My work machine. Built for more security, this is the gold standard of my config
nixpkgs = {
inherit (outputs) overlays;
overlays = outputs.overlaysList;
config = {
allowUnfree = true;
};
@ -1745,11 +1745,11 @@ This is a shorthand for calling emacsclient mostly. Also, it hides the kittyterm
#+end_src
#+begin_src nix :tangle pkgs/e/default.nix
{ writeShellApplication, emacs-pgtk, sway, jq }:
{ writeShellApplication, emacs30-pgtk, sway, jq }:
writeShellApplication {
name = "e";
runtimeInputs = [ emacs-pgtk sway jq ];
runtimeInputs = [ emacs30-pgtk sway jq ];
text = builtins.readFile ../../scripts/e.sh;
}
@ -5683,7 +5683,7 @@ This section sets up all the imports that are used in the home-manager section.
nix.settings.experimental-features = "nix-command flakes";
nixpkgs = {
hostPlatform = "x86_64-darwin";
inherit (outputs) overlays;
overlays = outputs.overlaysList;
config = {
allowUnfree = true;
};

4
flake.nix
View file

@ -185,8 +185,9 @@
nativeBuildInputs = [ pkgs.nix pkgs.home-manager pkgs.git ];
};
});
# this sets the formatter that is going to be used by nix fmt
formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt);
overlays = [
checks = forAllSystems (
system:
let
@ -194,6 +195,7 @@
in
import ./checks { inherit self inputs system pkgs; }
);
overlaysList = [
(import ./overlays { inherit inputs; }).additions
(import ./overlays { inherit inputs; }).modifications
(import ./overlays { inherit inputs; }).nixpkgs-stable

4
pkgs/e/default.nix
View file

@ -1,7 +1,7 @@
{ writeShellApplication, emacs-pgtk, sway, jq }:
{ writeShellApplication, emacs30-pgtk, sway, jq }:
writeShellApplication {
name = "e";
runtimeInputs = [ emacs-pgtk sway jq ];
runtimeInputs = [ emacs30-pgtk sway jq ];
text = builtins.readFile ../../scripts/e.sh;
}

3
profiles/common/home/packages.nix
View file

@ -37,6 +37,9 @@
statix
nix-tree
# shellscripts
shfmt
# local file sharing
wormhole-rs

2
profiles/darwin/common/nixos/default.nix
View file

@ -10,7 +10,7 @@ in
nix.settings.experimental-features = "nix-command flakes";
nixpkgs = {
hostPlatform = "x86_64-darwin";
inherit (outputs) overlays;
overlays = outputs.overlaysList;
config = {
allowUnfree = true;
};

2
profiles/home-manager/default.nix
View file

@ -4,7 +4,7 @@
imports = builtins.attrValues outputs.homeManagerModules;
nixpkgs = {
inherit (outputs) overlays;
overlays = outputs.overlaysList;
config = {
allowUnfree = true;
};

2
profiles/nbl-imba-2/default.nix
View file

@ -29,7 +29,7 @@ in
nixpkgs = {
inherit (outputs) overlays;
overlays = outputs.overlaysList;
config = {
allowUnfree = true;
};

2
profiles/server/winters/default.nix
View file

@ -23,7 +23,7 @@ in
nixpkgs = {
inherit (outputs) overlays;
overlays = outputs.overlaysList;
config = {
allowUnfree = true;
};

5
programs/emacs/init.el
View file

@ -1194,6 +1194,11 @@ create a new one."
(use-package nixpkgs-fmt)
(use-package shfmt
:config
(setq shfmt-command "shfmt")
(setq shfmt-arguments '("-i" "4" "-s" "-sr")))
(setq markdown-command "pandoc")
(use-package markdown-mode