Browse Source

reorganize

master
Yorick van Pelt 6 months ago
parent
commit
e4c264569a
Signed by: yorick GPG Key ID: D8D3CC6D951384DE
  1. 15
      config.nix
  2. 0
      home-manager/arbtt.nix
  3. 0
      home-manager/desktop.nix
  4. 4
      home-manager/home.nix
  5. 0
      home-manager/libinput-gestures.nix
  6. 0
      home-manager/waybar/config
  7. 0
      home-manager/waybar/style.css
  8. 10
      nix/.config/nixpkgs/config.nix
  9. 38
      nix/.config/nixpkgs/overlays/01-backports.nix
  10. 34
      nix/.config/nixpkgs/overlays/03-customizations.nix
  11. 71
      nix/.config/nixpkgs/overlays/04-combine.nix
  12. 30
      nix/.config/nixpkgs/pkgs/nottetris2.nix
  13. 2
      nix/default.nix
  14. 1
      nixos/packages/default.nix
  15. 1
      nixos/roles/default.nix
  16. BIN
      nixos/secrets.nix
  17. 3
      nixos/services/website.nix
  18. 2
      overlay.nix
  19. 10
      overlays.nix
  20. 27
      pkgs/default.nix
  21. 0
      pkgs/envs.nix
  22. 2
      pkgs/ftb.nix
  23. 0
      pkgs/lejos.nix
  24. 0
      pkgs/pyroscope/default.nix
  25. 0
      pkgs/pyroscope/fix_readme.diff
  26. 0
      pkgs/yori-cc.nix

15
config.nix

@ -1,16 +1,7 @@
let sources = import ./nix/sources.nix;
in {
allowUnfree = true;
overlays = [
(import sources.nixpkgs-wayland)
(import sources.nixpkgs-mozilla)
(import sources.emacs-overlay)
(import ./nixos/overlay.nix)
(import ./nix/.config/nixpkgs/overlays/01-backports.nix)
(import ./nix/.config/nixpkgs/overlays/02-extrapkgs.nix)
(import ./nix/.config/nixpkgs/overlays/03-customizations.nix)
(import ./nix/.config/nixpkgs/overlays/04-combine.nix)
(import ./nix/.config/nixpkgs/overlays/05-envs.nix)
(import ./overlay.nix)
];
# chromium.vaapiSupport = true;
android_sdk.accept_license = true;
overlays = import ./overlays.nix;
}

0
nix/.config/nixpkgs/arbtt.nix → home-manager/arbtt.nix

0
nix/.config/nixpkgs/desktop.nix → home-manager/desktop.nix

4
nix/.config/nixpkgs/home.nix → home-manager/home.nix

@ -238,6 +238,7 @@ in {
gnome3.gcr.out # alacritty
notmuch
gmailieer
git-absorb
afew
broot
starship
@ -298,4 +299,7 @@ in {
recursive = true;
};
manual.manpages.enable = false;
home.sessionVariables = {
HOME_MANAGER_CONFIG = toString ./home.nix; # unused, but checked for existence
};
}

0
nix/.config/nixpkgs/libinput-gestures.nix → home-manager/libinput-gestures.nix

0
nix/.config/nixpkgs/waybar/config → home-manager/waybar/config

0
nix/.config/nixpkgs/waybar/style.css → home-manager/waybar/style.css

10
nix/.config/nixpkgs/config.nix

@ -1,10 +0,0 @@
{
allowUnfree = true;
# chromium = {
# vaapiSupport = true;
# };
android_sdk.accept_license = true;
}

38
nix/.config/nixpkgs/overlays/01-backports.nix

@ -1,38 +0,0 @@
self: super:
let
overrideOlder = original: override: with self.lib; let
newpkgver = getVersion (override original);
oldpkgver = getVersion original;
in if (versionOlder oldpkgver newpkgver) then original.overrideDerivation override else original;
in
{
factorio = super.factorio.override {
releaseType = "alpha";
username = "yorickvp";
token = "dd8dca57e4f1891117d351b25cf56f";
};
# numix-solarized-gtk-theme = super.numix-solarized-gtk-theme.overrideDerivation (attrs: rec {
# version = "20180204";
# name = "numix-solarized-gtk-theme-${version}";
# buildInputs = attrs.buildInputs ++ [ self.python3 self.inkscape ];
# src = self.fetchFromGitHub {
# owner = "Ferdi265";
# repo = "numix-solarized-gtk-theme";
# rev = "3da78b0dbe74d0af0e3cc12e18ec1c30c7cf2b16";
# sha256 = "0dyqfcs1laff7hr64dg4n5y6qrcki47mdr332yn3yxp3bk7xybc3";
# };
# postPatch = attrs.postPatch + ''
# sed -i s#/usr/bin/inkscape#${self.inkscape}/bin/inkscape# scripts/render-assets.sh
# '';
# buildPhase = ''
# # for i in Solarized*.colors; do
# # THEME=`basename $i` make
# # done
# '';
# installPhase = ''
# for i in Solarized*.colors; do
# HOME=/tmp/inkscape make install THEME=`basename $i .colors`
# done
# '';
# });
}

34
nix/.config/nixpkgs/overlays/03-customizations.nix

@ -1,34 +0,0 @@
self: super: {
#mpv = super.mpv.override { vaapiSupport = true; };
python36Packages = super.python36Packages.override { overrides = (self: super: {
# pycrypto runs slow tests by default
pycryptodome = super.pycryptodome.overrideDerivation (attrs: {
doCheck = false;
doInstallCheck = false;
setuptoolsCheckPhase = "true";
# installCheckPhase = ''
# ${self.python.interpreter} nix_run_setup.py test --skip-slow-tests
# '';
});
}); };
# emacs-pgtk = with self; emacs26.overrideAttrs (
# { configureFlags ? [], postPatch ? "", nativeBuildInputs ? [], ... }:
# {
# src = fetchFromGitHub {
# owner = "masm11";
# repo = "emacs";
# rev = "d56f600d1ca2e996bedc6a59a85abc983bb3f23d";
# sha256 = "06wycfmr1w3lgpg10ffad1i2sr9ryac54w8qsavhn3h0rlvivjd3";
# };
# patches = [];
# nativeBuildInputs = nativeBuildInputs ++ [ autoreconfHook texinfo ];
# configureFlags = configureFlags ++ [ "--without-x" "--with-cairo" "--with-modules" ];
# }
# );
# wine = pkgs.wine.override { wineRelease = "staging"; wineBuild = "wineWow"; };
}

71
nix/.config/nixpkgs/overlays/04-combine.nix

@ -1,71 +0,0 @@
self: super: {
myEmacs = super.emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
company
paredit
counsel
flycheck
ivy
ivy-hydra
magit
projectile
epkgs.melpaPackages.counsel-projectile
ggtags
use-package
org-bullets
solarized-theme
evil
evil-magit
evil-leader
evil-tutor
evil-surround
epkgs.evil-goggles
epkgs.ox-mediawiki
epkgs.hledger-mode
# evil-commentary
password-store
pass
linum-relative
(epkgs.trivialBuild {
pname = "emacs-nix-mode";
src = super.fetchFromGitHub {
owner = "matthewbauer";
repo = "nix-mode";
rev = "f24abeb736a028deb283d51a859e7e34aba5e42b";
sha256 = "06kznwa5qbl3vzvvdh6lqdgzjzkvkvayvv3bjx3p2j275fxy1kfw";
};
preConfigure = "rm nix-company.el nix-mode-mmm.el";
})
nix-buffer
which-key
git-gutter-fringe
neotree
all-the-icons
epkgs.org-cliplink
pandoc-mode
markdown-mode
interleave
# all-the-icons-dired
org-ref
avy
# nixos-sandbox # https://github.com/travisbhartwell/nix-emacs
haskell-mode
intero
]));
# todo: emacs-all-the-icons-fonts
pandocdeps = (super.texlive.combine {
inherit (super.texlive)
scheme-basic
# explicit list pandoc tex dependencies
amsfonts amsmath lm ec ifxetex ifluatex eurosym listings fancyvrb
# longtable
booktabs
hyperref ulem geometry setspace
# linestretch
babel
# some optional dependencies of pandoc
upquote microtype csquotes
mathtools
;
});
}

30
nix/.config/nixpkgs/pkgs/nottetris2.nix

@ -1,30 +0,0 @@
{ pkgs ? import <nixpkgs> { }, stdenv ? pkgs.stdenv, love_0_7 ? pkgs.love_0_7 }:
# let
# name = "nottetris2";
# src = pkgs.fetchzip {
# url = "http://stabyourself.net/dl.php?file=${name}/${name}-linux.zip";
# sha256 = "1zwwp4h1njwl3jnwkszcsqx868v16312pbfy5rp9h48ym79spd36";
# stripRoot = false;
# };
# in pkgs.writeShellScriptBin name ''
# exec ${love_0_7}/bin/love "${src}/Not Tetris 2.love"
# ''
stdenv.mkDerivation {
pname = "nottetris";
version = "2";
buildInputs = [ love_0_7 pkgs.unzip pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.unzip ];
src = pkgs.fetchurl {
url = "https://stabyourself.net/dl.php?file=nottetris2/nottetris2-source.zip";
sha256 = "13lsacp3bd1xf80yrj7r8dgs15m7kxalqa7vml0k7frmhbkb0b1n";
};
sourceRoot = ".";
installPhase = ''
mkdir -p $out/lib
cp "Not Tetris 2.love" $out/lib/
makeWrapper $(command -v love) $out/bin/nottetris2 --add-flags "\"$out/lib/Not Tetris 2.love\""
'';
# meta = {
# license =
# };
}

2
nix/default.nix

@ -1,2 +0,0 @@
let sources = import /home/yorick/dotfiles/nix/sources.nix;
in import sources.nixpkgs (import ./config.nix)

1
nixos/packages/default.nix

@ -1 +0,0 @@
[ (self: super: { yori-cc = super.callPackage ./yori-cc.nix { }; }) ]

1
nixos/roles/default.nix

@ -34,7 +34,6 @@ in {
# Nix
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = import ../packages;
#nix.buildCores = config.nix.maxJobs;

BIN
nixos/secrets.nix

Binary file not shown.

3
nixos/services/website.nix

@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }:
let
yoricc = pkgs.callPackage ../packages/yori-cc.nix { };
cfg = config.services.yorick.website;
in with lib; {
options.services.yorick = {
@ -10,7 +9,7 @@ in with lib; {
vhost = mkOption { type = types.str; };
pkg = mkOption {
type = types.package;
default = yoricc;
default = pkgs.yori-cc;
};
};
redirect = mkOption {

2
overlay.nix

@ -3,7 +3,7 @@ in pkgs: super: {
yorick = super.yorick // rec {
home = { check ? true, newsReadIdsFile ? null }:
import "${sources.home-manager}/home-manager/home-manager.nix" {
confPath = ./nix/.config/nixpkgs/home.nix;
confPath = ./home-manager/home.nix;
inherit pkgs check newsReadIdsFile;
};
};

10
overlays.nix

@ -0,0 +1,10 @@
let sources = import ./nix/sources.nix;
in [
(import sources.nixpkgs-wayland)
(import sources.nixpkgs-mozilla)
(import sources.emacs-overlay)
(import ./pkgs)
(import ./pkgs/envs.nix)
(import ./nixos/overlay.nix)
(import ./overlay.nix)
]

27
nix/.config/nixpkgs/overlays/02-extrapkgs.nix → pkgs/default.nix

@ -1,14 +1,15 @@
self: super: {
(self: super: {
ftb = self.callPackage ../pkgs/ftb.nix {};
pyroscope = self.callPackage ../pkgs/pyroscope {};
nottetris2 = self.callPackage ../pkgs/nottetris2.nix {};
#lejos = self.callPackage ../pkgs/lejos.nix {};
yori-cc = super.callPackage ./yori-cc.nix { };
ftb = super.callPackage ./ftb.nix {};
pyroscope = super.callPackage ./pyroscope {};
#lejos = super.callPackage ../pkgs/lejos.nix {};
libinput-gestures = super.libinput-gestures.override { extraUtilsPath = [
self.xdotool self.python3
];};
gitFire = super.stdenv.mkDerivation {
src = super.fetchFromGitHub {
gitFire = self.stdenv.mkDerivation {
src = self.fetchFromGitHub {
owner = "qw3rtman";
repo = "git-fire";
rev = "f485fffedbc4f719c55547be22ccd0080e592c9a";
@ -21,11 +22,17 @@ self: super: {
'';
};
weiightminder = self.callPackage (builtins.fetchGit {
weiightminder = super.callPackage (builtins.fetchGit {
url = https://gist.github.com/yorickvP/229d21a7da13c9c514dbd26147822641;
rev = "9749ef4d83c0078bc0248215ee882d7124827cf3";
}) {};
yscripts = self.callPackage /home/yorick/dotfiles/bin {};
}
yscripts = super.callPackage ../bin {};
factorio = super.factorio.override {
releaseType = "alpha";
username = "yorickvp";
token = (import ../nixos/secrets.nix).factorio_token;
};
})

0
nix/.config/nixpkgs/overlays/05-envs.nix → pkgs/envs.nix

2
nix/.config/nixpkgs/pkgs/ftb.nix → pkgs/ftb.nix

@ -30,6 +30,6 @@ in
meta = {
description = "Modded minecraft launcher";
homepage = http://www.feed-the-beast.com;
license = stdenv.lib.licenses.unfreeRedistributable;
license = lib.licenses.unfreeRedistributable;
};
}

0
nix/.config/nixpkgs/pkgs/lejos.nix → pkgs/lejos.nix

0
nix/.config/nixpkgs/pkgs/pyroscope/default.nix → pkgs/pyroscope/default.nix

0
nix/.config/nixpkgs/pkgs/pyroscope/fix_readme.diff → pkgs/pyroscope/fix_readme.diff

0
nixos/packages/yori-cc.nix → pkgs/yori-cc.nix

Loading…
Cancel
Save