erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:871bef56c4b82f23599b1971e53f15081b4d7d80
Branches Tags
erwin:main
..
compare: erwin:f7546f99274d4b5682b77e93bb8be8d021e8c8b2
Branches Tags
erwin:main

No commits in common. "871bef56c4b82f23599b1971e53f15081b4d7d80" and "f7546f99274d4b5682b77e93bb8be8d021e8c8b2" have entirely different histories.
871bef56c4 ... f7546f9927

13 changed files with 72 additions and 123 deletions
Show stats Expand all files Collapse all files

78
flake.lock
View file

@ -193,11 +193,11 @@
]
},
"locked": {
"lastModified": 1727531434,
"narHash": "sha256-b+GBgCWd2N6pkiTkRZaMFOPztPO4IVTaclYPrQl2uLk=",
"lastModified": 1727156717,
"narHash": "sha256-Ef7UgoTdOB4PGQKSkHGu6SOxnTiArPHGcRf8qGFC39o=",
"owner": "nix-community",
"repo": "disko",
"rev": "b709e1cc33fcde71c7db43850a55ebe6449d0959",
"rev": "c61e50b63ad50dda5797b1593ad7771be496efbb",
"type": "github"
},
"original": {
@ -217,11 +217,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1727662057,
"narHash": "sha256-oMuC7BXm98IQ6falStTp+AaT6EuvhtC71rHJ92zaH/E=",
"lastModified": 1727140563,
"narHash": "sha256-uaugOQen4xK3vxect3xZyq3CsNOHcV5nMHS4yteIHFA=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "9deee9ccee19d5300bc366c7d28c479777886273",
"rev": "b3512b3df5396e17d9e89cadcc3f57db0ea1fecc",
"type": "github"
},
"original": {
@ -241,11 +241,11 @@
]
},
"locked": {
"lastModified": 1727371344,
"narHash": "sha256-3AU48S429GzXxhFTWDbIaC0Cr7HMAGiF8NuuznbOufI=",
"lastModified": 1725366879,
"narHash": "sha256-q82u3/pcP5T++TMdDmaeDKYuCyky1Bo5BjHY1/NVHbY=",
"owner": "elkowar",
"repo": "eww",
"rev": "e242d40e3522b27bf087addba23fc7588099b7a6",
"rev": "8661abf2bf07f5a809fc995233d93810cc1ac871",
"type": "github"
},
"original": {
@ -551,11 +551,11 @@
]
},
"locked": {
"lastModified": 1727383923,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"lastModified": 1727111745,
"narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"rev": "21c021862fa696c8199934e2153214ab57150cb6",
"type": "github"
},
"original": {
@ -575,11 +575,11 @@
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1727444402,
"narHash": "sha256-IhKB3RPTrblfiq6DW9MiGrS0ULcn/0qWtlefL+Gfg0o=",
"lastModified": 1726161490,
"narHash": "sha256-tzGcRRhhK5lAuBtlHl3D/TR2V3egPLV4BBcN2+4CyY0=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "04f643d06b6f3f79cb289a8c94f051b012e1750e",
"rev": "af604aa08ac9a4ae585beaf1a3482897a27ab67e",
"type": "github"
},
"original": {
@ -658,11 +658,11 @@
},
"nixos-facter-modules": {
"locked": {
"lastModified": 1727625453,
"narHash": "sha256-WcqLz7d2Yrss02Y43mQXDQkvJPsK/ISZxQjd/uRcUQY=",
"lastModified": 1726827416,
"narHash": "sha256-U2rPYu3iDI3GN1H6MN3NoCuVrAJlBJ9nNWRQY8Cs32Y=",
"owner": "numtide",
"repo": "nixos-facter-modules",
"rev": "e1ac6a83a5733788833fdff12aa074b5bdfdc965",
"rev": "6eb13404bbe40b9a5ef9984792b27933658571fa",
"type": "github"
},
"original": {
@ -673,11 +673,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1727665282,
"narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
"lastModified": 1727040444,
"narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
"rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
"type": "github"
},
"original": {
@ -732,11 +732,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1727540905,
"narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=",
"lastModified": 1726969270,
"narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fbca5e745367ae7632731639de5c21f29c8744ed",
"rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
"type": "github"
},
"original": {
@ -780,11 +780,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github"
},
"original": {
@ -832,11 +832,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1727514110,
"narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=",
"lastModified": 1726745158,
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8",
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
"type": "github"
},
"original": {
@ -880,11 +880,11 @@
]
},
"locked": {
"lastModified": 1727663505,
"narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=",
"lastModified": 1727144949,
"narHash": "sha256-uMZMjoCS2nf40TAE1686SJl3OXWfdfM+BDEfRdr+uLc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee",
"rev": "2e19799819104b46019d339e78d21c14372d3666",
"type": "github"
},
"original": {
@ -901,11 +901,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1727423009,
"narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=",
"lastModified": 1726524647,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "127a96f49ddc377be6ba76964411bab11ae27803",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
"type": "github"
},
"original": {
@ -998,11 +998,11 @@
]
},
"locked": {
"lastModified": 1727431250,
"narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
"lastModified": 1727098951,
"narHash": "sha256-gplorAc0ISAUPemUNOnRUs7jr3WiLiHZb3DJh++IkZs=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
"rev": "35dfece10c642eb52928a48bee7ac06a59f93e9a",
"type": "github"
},
"original": {

1
flake.nix
View file

@ -260,7 +260,6 @@
dnspyre = pkgs.callPackage ./pkgs/dnspyre { };
git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { };
hassbridge = pkgs.callPackage ./pkgs/hassbridge { };
peakperf = pkgs.callPackage ./pkgs/peakperf { };
tinyows = pkgs.callPackage ./pkgs/tinyows { };
tsui = pkgs.callPackage ./pkgs/tsui { };
};

6
home-manager/modules/foot/default.nix
View file

@ -27,11 +27,7 @@ in
settings = {
main = {
font = "Iosevka Nerd Font:size=${toString cfg.fontSize}, Twitter Color Emoji:size=${toString cfg.fontSize}";
dpi-aware = "no";
};
key-bindings = {
show-urls-copy = "Control+Shift+w";
dpi-aware = "yes";
};
scrollback = {

14
machines/gitea/forgejo/default.nix
View file

@ -89,20 +89,6 @@ in
};
};
# Clean up dump files older than 60 days
systemd.tmpfiles.settings = {
forgejo = {
"/var/lib/forgejo/dump" = {
d = {
user = "git";
group = "forgejo";
mode = "0750";
age = "60d";
};
};
};
};
networking.firewall.allowedTCPPorts = [ 3000 ];
users.users.git = {

8
machines/loki/configuration.nix
View file

@ -31,9 +31,9 @@
work = false;
udev-rules = {
qmk = true;
solo2 = false;
solo2 = true;
picotool = true;
blink1 = false;
blink1 = true;
probe-rs = true;
};
};
@ -109,10 +109,6 @@
# i2c support
i2c.enable = true;
amdgpu = {
opencl.enable = true;
};
};
boot = {

4
modules/base/blink1-udev/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib }:
stdenv.mkDerivation {
{ mkDerivation, lib }:
mkDerivation {
pname = "blink1-udev-rules";
version = "20220531093409";

28
modules/base/default.nix
View file

@ -7,12 +7,28 @@
with lib;
let
cfg = config.eboskma.base;
qmkUdevRules = pkgs.callPackage ./qmk { };
probersRules = pkgs.callPackage ./probe-rs { };
blink1Rules = pkgs.callPackage ./blink1-udev { };
picotoolRules = pkgs.callPackage ./picotool { };
solo2Rules = pkgs.callPackage ./solo2 { };
plymouth-nixos-blur = pkgs.callPackage ./plymouth-nixos-blur { };
qmkUdevRules = pkgs.callPackage ./qmk {
inherit (pkgs.stdenv) mkDerivation;
inherit lib;
};
probersRules = pkgs.callPackage ./probe-rs { inherit lib; };
blink1Rules = pkgs.callPackage ./blink1-udev {
inherit (pkgs.stdenv) mkDerivation;
inherit lib;
};
picotoolRules = pkgs.callPackage ./picotool {
inherit (pkgs.stdenv) mkDerivation;
inherit lib;
};
solo2Rules = pkgs.callPackage ./solo2 {
inherit (pkgs.stdenv) mkDerivation;
inherit lib;
};
plymouth-nixos-blur = pkgs.callPackage ./plymouth-nixos-blur {
inherit (pkgs.stdenv) mkDerivation;
inherit lib;
};
in
{
options.eboskma.base = {

4
modules/base/picotool/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib }:
stdenv.mkDerivation {
{ mkDerivation, lib }:
mkDerivation {
pname = "picotool-udev-rules";
version = "20220628194715";

2
modules/base/qmk/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv }:
{ lib, stdenv, ... }:
let
pname = "qmk-udev-rules";
version = "0.19.6";

4
modules/base/solo2/default.nix
View file

@ -1,9 +1,9 @@
{ lib, stdenv }:
{ lib, mkDerivation, ... }:
let
pname = "solo2-udev-rules";
version = "20220924";
in
stdenv.mkDerivation {
mkDerivation {
inherit pname version;
src = ./.;

41
pkgs/peakperf/default.nix
View file

@ -1,41 +0,0 @@
{
config,
lib,
stdenv,
fetchFromGitHub,
cmake,
enableCuda ? config.cudaSupport,
cudaPackages ? { },
}:
let
effectiveStdenv = if enableCuda then cudaPackages.backendStdenv else stdenv;
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "peakperf";
version = "1.17";
src = fetchFromGitHub {
owner = "Dr-Noob";
repo = "peakperf";
rev = "v${finalAttrs.version}";
hash = "sha256-bP38oo0tHDvzbWHiNwbkQoM7ZQ4nwTimVYfbPh0FUd4=";
};
buildInputs =
[ ]
++ lib.optionals enableCuda [
cudaPackages.cudart
];
nativeBuildInputs = [
cmake
];
meta = {
description = "Achieve peak performance on x86 CPUs and NVIDIA GPUs";
homepage = "https://github.com/Dr-Noob/peakperf";
license = lib.licenses.gpl2Only;
mainProgram = "peakperf";
platforms = lib.platforms.all;
};
})

3
users/erwin/home.nix
View file

@ -204,8 +204,6 @@ in
easyeffects
fd
ffmpeg-full
geekbench
godot_4
hashcat
helvum
imagemagick
@ -236,7 +234,6 @@ in
orca-slicer
pamedia
pass
passmark-performancetest
pavucontrol
povray
procs

2
users/erwin/work.nix
View file

@ -137,7 +137,7 @@ in
};
"HDMI-A-1" = {
bg = "${../../wallpapers/river-3840.png} fill";
scale = "1.5";
scale = "1.25";
disable = "disable";
};
};