26 Commits

Author SHA1 Message Date
fec13e08b9 dev suite: remove latex
Some checks failed
Update Nix Flake / update-flake (push) Failing after 12s
2025-12-13 07:59:44 +01:00
a540ca622d kardorf: switch to hyprland 2025-12-13 07:59:35 +01:00
7fb0bcdac0 nixvim: add orgmode support 2025-12-13 07:59:20 +01:00
b7726fce94 hyprland: fix cursor tearing 2025-12-13 07:58:54 +01:00
30c987bd9b hm: remove my binarycache for hm-standalone
Some checks failed
Update Nix Flake / update-flake (push) Failing after 12s
Normally I wont have VPN access on standalone
2025-12-08 17:12:10 +01:00
539e9a0b8e v3ms: add qt-distrobox 2025-12-08 17:09:45 +01:00
1e4593ea17 home: add qt-distrobox config 2025-12-08 17:09:14 +01:00
ec8a71de95 open-messaging: update name of telegram binary
Some checks failed
Update Nix Flake / update-flake (push) Failing after 14s
2025-12-06 11:30:42 +01:00
0c39388b21 gc: change to older than 30
the old +3 did not seem to work
2025-12-06 11:28:02 +01:00
ebb043b589 format code 2025-12-06 11:24:15 +01:00
fcfc9f6450 hm: make it backup conflicting files 2025-12-06 11:24:08 +01:00
fe3cd057cd fix regreet with hyprland 2025-12-06 11:23:41 +01:00
b9cdb9299e auto-upgrade: commit flake.lock if upgrading worked 2025-12-06 09:22:21 +01:00
8b6ba76848 pianonix: add rpi-ws281x package 2025-12-06 09:22:02 +01:00
2e79bd9e00 nix: do not optimise store on build, but regularly 2025-12-06 09:21:30 +01:00
cfdc9f7001 aspi: activate wireguard 2025-12-06 09:21:17 +01:00
a12b50edfa pianonix: try getting piano-led-visualizer to run
Still did not work, using raspberrypi os
2025-12-06 09:20:52 +01:00
194d4bcec0 tmux: use vim bindings and better prefix 2025-12-06 09:20:00 +01:00
5badb000be install vagrant and qtcreator 2025-12-06 09:19:38 +01:00
08b3f2c194 emacs: add more tools for c++ and typst development 2025-12-06 09:19:20 +01:00
5f9a110464 update to nixos 25.11 2025-12-06 09:19:06 +01:00
bcd041484d Auto-update flake.lock 2025-12-05 14:03:59 +01:00
fd3b9f20f0 update flake, add tmux
Some checks failed
Update Nix Flake / update-flake (push) Failing after 14s
2025-11-25 20:13:12 +01:00
bc160af26a fix open-messaging and workspace assignments
Some checks failed
Update Nix Flake / update-flake (push) Failing after 15s
2025-11-17 07:05:41 +01:00
a34abd0f05 fix broken programs
Some checks failed
Update Nix Flake / update-flake (push) Failing after 14s
2025-11-16 12:24:15 +01:00
2fd1f5ee53 update flake 2025-11-16 12:24:09 +01:00
32 changed files with 281 additions and 127 deletions

66
flake.lock generated
View File

@@ -58,11 +58,11 @@
]
},
"locked": {
"lastModified": 1762276996,
"narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
"lastModified": 1764627417,
"narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=",
"owner": "nix-community",
"repo": "disko",
"rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
"rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3",
"type": "github"
},
"original": {
@@ -111,11 +111,11 @@
]
},
"locked": {
"lastModified": 1762440070,
"narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=",
"lastModified": 1763759067,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github"
},
"original": {
@@ -203,16 +203,16 @@
]
},
"locked": {
"lastModified": 1758463745,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"lastModified": 1764866045,
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
@@ -385,11 +385,11 @@
]
},
"locked": {
"lastModified": 1751903740,
"narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
"lastModified": 1764234087,
"narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "032decf9db65efed428afd2fa39d80f7089085eb",
"rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
"type": "github"
},
"original": {
@@ -400,11 +400,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1762847253,
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
"lastModified": 1764440730,
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github"
},
"original": {
@@ -446,11 +446,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1762596750,
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
"lastModified": 1764950072,
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
"rev": "f61125a668a320878494449750330ca58b78c557",
"type": "github"
},
"original": {
@@ -474,16 +474,16 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1762756533,
"narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
"lastModified": 1764831616,
"narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
"rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -498,16 +498,16 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1762722066,
"narHash": "sha256-Kph9HBaDqN0dOvsb8fnhoyj4mpxF6RfoqzVqXxvpzVY=",
"lastModified": 1764755396,
"narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "b36fcf1d64e782488fc6296eaa4f26d6cae4e090",
"rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "nixos-25.05",
"ref": "nixos-25.11",
"repo": "nixvim",
"type": "github"
}
@@ -585,11 +585,11 @@
]
},
"locked": {
"lastModified": 1762812535,
"narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=",
"lastModified": 1764483358,
"narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7",
"rev": "5aca6ff67264321d47856a2ed183729271107c9c",
"type": "github"
},
"original": {
@@ -724,11 +724,11 @@
"yazi-flavors": {
"flake": false,
"locked": {
"lastModified": 1761204921,
"narHash": "sha256-bavHcmeGZ49nNeM+0DSdKvxZDPVm3e6eaNmfmwfCid0=",
"lastModified": 1763969227,
"narHash": "sha256-twgXHeIj52EfpMpLrhxjYmwaPnIYah3Zk/gqCNTb2SQ=",
"owner": "yazi-rs",
"repo": "flavors",
"rev": "f6b425a6d57af39c10ddfd94790759f4d7612332",
"rev": "3edeb49597e1080621a9b0b50d9f0a938b8f62bb",
"type": "github"
},
"original": {

View File

@@ -3,7 +3,7 @@
inputs = {
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
systems.url = "github:nix-systems/default-linux";
nixos-hardware.url = "github:nixos/nixos-hardware";
impermanence.url = "github:nix-community/impermanence";
@@ -16,7 +16,7 @@
};
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
@@ -38,7 +38,7 @@
flake = false;
};
nixvim = {
url = "github:nix-community/nixvim/nixos-25.05";
url = "github:nix-community/nixvim/nixos-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-matlab = {

View File

@@ -11,6 +11,8 @@
./features/alacritty
./features/yazi
./features/emacs
./features/tmux
./features/qt-distrobox
./features/hyprland

View File

@@ -52,6 +52,14 @@ in {
shfmt
pyright
clang-tools # c++ lsp etc
ccls # alternative c++ lsp
cmake
bear
cmake-language-server
# qt6.full # qt tools and libs including lsp
tinymist # typst lsp
ltex-ls # latex languagetool
graphviz

View File

@@ -12,7 +12,7 @@ with lib; {
dejavu_fonts
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-color-emoji
liberation_ttf
fira-code
fira-code-symbols

View File

@@ -228,6 +228,10 @@ in {
vfr = true; # power saving
};
cursor = {
no_hardware_cursors = 1; # disable hardware cursors to fix tearing on kardorf
};
render = {
# we do, in fact, want direct scanout
direct_scanout = true;
@@ -244,7 +248,9 @@ in {
windowrulev2 = [
"suppressevent maximize, class:.*"
"workspace 1, class:firefox"
"workspace 8, class:Zotero"
"workspace 9, class:nheko"
"workspace 9, class:discord"
"workspace 9, class:org.telegram.desktop"
"workspace 10, class:thunderbird"
"float, class:qalculate-gtk"

View File

@@ -3,8 +3,9 @@
pkgs,
inputs,
...
}: {
imports = [inputs.nixvim.homeManagerModules.nixvim];
}:
{
imports = [ inputs.nixvim.homeModules.nixvim ];
home.sessionVariables = {
EDITOR = "nvim";
@@ -78,6 +79,7 @@
neogit.enable = true; # like magit
trouble.enable = true;
web-devicons.enable = true;
orgmode.enable = true; # org-mode support
# Shows file trees
oil = {
@@ -91,9 +93,9 @@
conform-nvim = {
enable = true;
settings.formatters_by_ft = with pkgs; {
lua = ["stylua"];
python = ["black"];
nix = ["nixfmt"];
lua = [ "stylua" ];
python = [ "black" ];
nix = [ "nixfmt" ];
};
# extraOptions = {
# default_format_opts.lsp_format = "fallback";
@@ -105,9 +107,9 @@
enable = true;
autoEnableSources = true;
settings.sources = [
{name = "nvim_lsp";}
{name = "path";}
{name = "buffer";}
{ name = "nvim_lsp"; }
{ name = "path"; }
{ name = "buffer"; }
];
settings.mapping = {
"<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";

View File

@@ -0,0 +1,22 @@
{
programs.distrobox = {
enable = true;
containers."qt-distrobox" = {
image = "debian:12.2";
exported_apps = "qtcreator";
enableSystemdUnit = false; # fails in creating and does not recreate. Do distrobox-assemble create --replace --file ~/.config/distrobox/containers.ini instead
additional_packages = [
"qtcreator"
"qt6-base-dev"
"qt6-wayland"
"qt6-tools-dev-tools"
"qt6-tools-dev"
"qt6-serialbus-dev"
"qt6-websockets-dev"
"libgl1-mesa-dev"
"build-essential"
"cmake"
];
};
};
}

View File

@@ -1,7 +1,7 @@
{pkgs, ...}: {
home.packages = with pkgs; [
bat
du-dust # Like du tree but better
dust # Like du tree but better
fd # better find
fdupes # find and delete duplicate files
ffmpeg
@@ -24,7 +24,7 @@
p7zip # unzip 7zip archives
parted
pciutils # lspci
poppler_utils # Pdf utils including pdfimages
poppler-utils # Pdf utils including pdfimages
libqalculate # Nice tui calculator (qalc)
ripgrep # better grep
rnr # renaming tool

View File

@@ -27,7 +27,7 @@
# element-desktop
# rocketchat-desktop
thunderbird
tdesktop # telegram
telegram-desktop # telegram
# schildichat-desktop # not updated regularly
nheko
evince # Simple pdf reader, good for focusing on document content
@@ -43,7 +43,7 @@
nomacs # Image viewer
kdePackages.okular # Pdf reader with many features, good for commenting documents
pavucontrol
unstable.pdfsam-basic # Split, merge, etc for pdfs
pdfsam-basic # Split, merge, etc for pdfs
qalculate-gtk # Nice gui calculator
qpdfview
# qutebrowser
@@ -51,7 +51,7 @@
# rpi-imager # make isos
# rustdesk
tor-browser
unstable.rusty-path-of-building # Path of Building for poe1 and poe2
rusty-path-of-building # Path of Building for poe1 and poe2
# frajul.pob-dev-version # Path of Building
vlc
wineWowPackages.stable # 32-bit and 64-bit wine

View File

@@ -9,7 +9,7 @@
clippy
cntr # nix debugger
conda
micromamba # a better, faster conda
# micromamba # a better, faster conda
devcontainer # development container
devenv # devbox alternative
dbeaver-bin
@@ -21,20 +21,21 @@
unstable.zed-editor
jdk
julia-bin
(texlive.combine {
# for rendering latex in inkscape
inherit
(texlive)
scheme-medium
standalone
amsmath
preview
# needed for org mode export
wrapfig
capt-of
biblatex
;
})
# (texlive.combine {
# # for rendering latex in inkscape
# inherit
# (texlive)
# scheme-medium
# standalone
# amsmath
# preview
# # needed for org mode export
# wrapfig
# capt-of
# biblatex
# ;
# })
vagrant
matlab # Using nix-matlab overlay defined in flake
maven
nodejs

View File

@@ -0,0 +1,10 @@
{
programs.tmux = {
enable = true;
clock24 = true;
keyMode = "vi";
customPaneNavigationAndResize = true; # use hjkl
mouse = true;
prefix = "C-Space"; # use instead of C-b
};
}

View File

@@ -9,8 +9,8 @@
home.packages = with pkgs; [
exiftool
unar # extract archives
xdragon # dragndrop
poppler_utils # pdf preview
dragon-drop # dragndrop
poppler-utils # pdf preview
fd
ripgrep
fzf

View File

@@ -1,6 +1,5 @@
# Only apply this to home-manager standalone
{ outputs, ... }:
{
{outputs, ...}: {
# Apply overlays
nixpkgs = {
overlays = builtins.attrValues outputs.overlays;
@@ -20,13 +19,13 @@
"https://nix-community.cachix.org"
"https://cache.nixos.org/"
"https://hyprland.cachix.org"
"http://binarycache.julian-mutter.de"
"https://devenv.cachix.org"
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
];
trusted-users = [

View File

@@ -8,11 +8,14 @@
./features/neovim
./features/ghostty
./features/wezterm
./features/alacritty
./features/yazi
./features/emacs
# ./features/hyprland
./features/i3
./features/tmux
./features/qt-distrobox
./features/hyprland
# ./features/i3
./features/suites/cli
./features/suites/desktop
@@ -21,7 +24,7 @@
hostName = "kardorf";
is-nixos = true;
terminal = "ghostty";
terminal = "alacritty";
# --------- ---------
# | DVI-D-1 | | DVI-D-2 |

View File

@@ -13,6 +13,7 @@
../features/yazi
../features/emacs
../features/nix-helper
../features/qt-distrobox
];
hostName = "aspi";

View File

@@ -5,7 +5,7 @@ with pkgs; [
dejavu_fonts
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-color-emoji
liberation_ttf
fira-code
fira-code-symbols

View File

@@ -31,7 +31,7 @@ with pkgs; [
ffmpeg
julia-bin
poppler_utils # Pdf utils including pdfimages
poppler-utils # Pdf utils including pdfimages
sage
pkg-config # Often needed to build something

View File

@@ -20,7 +20,7 @@
../common/optional/virtualbox.nix
../common/optional/podman.nix
# ../common/optional/wireguard.nix
../common/optional/wireguard.nix
../common/optional/flatpak.nix
../common/optional/avahi.nix
@@ -42,6 +42,7 @@
};
};
programs.hyprland.enable = true;
services.desktopManager.plasma6.enable = true;
services.blueman.enable = true;
@@ -50,8 +51,8 @@
programs.steam.enable = true;
# TODO: not working
services.logind.lidSwitch = "lock";
services.logind.lidSwitchDocked = "lock";
# services.logind.lidSwitch = "lock";
# services.logind.lidSwitchDocked = "lock";
programs.kdeconnect.enable = true;

View File

@@ -41,8 +41,9 @@
"8.8.8.8"
];
# HM
home-manager.useGlobalPkgs = true;
# HM module
home-manager.useGlobalPkgs = true; # hm module uses the pkgs of the nixos config
home-manager.backupFileExtension = "hm-backup"; # backup conflicting files. So hm activation never fails
home-manager.extraSpecialArgs = {
inherit inputs outputs;
};

View File

@@ -2,7 +2,8 @@
lib,
outputs,
...
}: {
}:
{
# Apply overlays
nixpkgs = {
# TODO: apply this to hm and nixos without duplicate code
@@ -18,7 +19,9 @@
};
};
nix.settings.auto-optimise-store = lib.mkDefault true;
# optimize at every build, slows down builds
# better to do optimise.automatic for regular optimising
# nix.settings.auto-optimise-store = lib.mkDefault true;
nix.settings.experimental-features = [
"nix-command"
"flakes"
@@ -29,8 +32,11 @@
nix.gc = {
automatic = true;
dates = "weekly";
# Keep the last 3 generations
options = "--delete-older-than +3";
options = "--delete-older-than 30d";
};
nix.optimise = {
automatic = true;
dates = [ "weekly" ]; # Optional; allows customizing optimisation schedule
};
programs.nix-ld.enable = true;

View File

@@ -1,26 +1,9 @@
{
pkgs,
lib,
config,
...
}: let
{config, ...}: let
homeCfgs = config.home-manager.users;
homeSharePaths = lib.mapAttrsToList (_: v: "${v.home.path}/share") homeCfgs;
vars = ''XDG_DATA_DIRS="$XDG_DATA_DIRS:${lib.concatStringsSep ":" homeSharePaths}" GTK_USE_PORTAL=0'';
julianCfg = homeCfgs.julian;
sway-kiosk = command: "${lib.getExe pkgs.sway} --unsupported-gpu --config ${pkgs.writeText "kiosk.config" ''
output * bg #000000 solid_color
xwayland disable
input "type:touchpad" {
tap enabled
}
exec '${vars} ${command}; ${pkgs.sway}/bin/swaymsg exit'
''}";
in {
users.extraUsers.greeter = {
# For caching and such
# For caching
home = "/tmp/greeter-home";
createHome = true;
};
@@ -33,13 +16,22 @@ in {
cursorTheme = {
inherit (julianCfg.gtk.cursorTheme) name package;
};
cageArgs = [
"-s"
"-m"
"last"
]; # multimonitor use last monitor
# settings.background = {
# path = julianCfg.wallpaper;
# fit = "Cover";
# }; # TODO: fix
};
services.greetd = {
enable = true;
settings.default_session.command = sway-kiosk (lib.getExe config.programs.regreet.package);
# TODO: setting keyboard language does not work
# settings = {
# env = {
# XKB_DEFAULT_LAYOUT = "de";
# # XKB_DEFAULT_VARIANT = "altgr-intl";
# };
# };
};
}

View File

@@ -1,7 +1,7 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
shared-mime-info # extended mimetype support
lxde.lxmenu-data # open with "Installed Applications"
lxmenu-data # open with "Installed Applications"
pcmanfm
];

View File

@@ -55,7 +55,7 @@ in {
# element-desktop
# rocketchat-desktop
thunderbird
tdesktop # telegram
telegram-desktop # telegram
# schildichat-desktop # not updated regularly
nheko
evince # Simple pdf reader, good for focusing on document content

View File

@@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
imports = [
./hardware-configuration.nix
@@ -7,21 +8,22 @@
../common/users/wolfi
../common/optional/binarycaches.nix
../common/optional/xserver.nix
# ../common/optional/xserver.nix
../common/optional/remote-builder.nix
../common/optional/boot-efi.nix
# ../common/optional/greetd.nix
../common/optional/gdm.nix
../common/optional/i3.nix
../common/optional/openssh.nix
../common/optional/greetd.nix
../common/optional/authentication.nix
../common/optional/pcmanfm.nix
../common/optional/pipewire.nix
../common/optional/virtualbox.nix
# ../common/optional/gdm.nix
# ../common/optional/i3.nix
../common/optional/openssh.nix
../common/optional/podman.nix
../common/optional/flatpak.nix
];
@@ -32,14 +34,17 @@
# Not using the drivers leads to way better results
# services.xserver.videoDrivers = [ "nvidia" ];
networking.networkmanager.insertNameservers = [ "192.168.3.252" ];
programs.kdeconnect.enable = true;
programs.hyprland.enable = true;
services.desktopManager.plasma6.enable = true;
# Enable CUPS to print documents.
services.printing.enable = true;
services.printing.browsing = true;
services.printing.drivers = with pkgs; [gutenprint];
services.printing.drivers = with pkgs; [ gutenprint ];
services.libinput.enable = true;
}

View File

@@ -26,6 +26,26 @@
../common/optional/avahi.nix
];
environment.systemPackages = [
(pkgs.python3.withPackages (p:
with p; [
numpy
pillow
flask
rpi-gpio
webcolors
psutil
mido
rtmidi-python
spidev
waitress
websockets
werkzeug
pkgs.frajul.rpi-ws281x-python
]))
];
# disko.devices.disk.main.device = "/dev/mmcblk1";
# enabled by fish, disabling speeds up builds
@@ -169,7 +189,7 @@
};
};
networking.firewall.enable = true;
networking.firewall.enable = false;
networking.firewall.allowedTCPPorts = [
5900 # for vnc
];
@@ -201,7 +221,7 @@
hardware.raspberry-pi."4".apply-overlays-dtmerge.enable = true;
hardware.deviceTree = {
enable = true;
filter = lib.mkForce "*-rpi-*.dtb";
filter = lib.mkForce "*-rpi-4*.dtb";
overlays = [
{
name = "spi";
@@ -234,4 +254,23 @@
## My own Piano LED Visualizer
services.piano-led-visualizer.enable = true;
## Crude fix for avahi
systemd.timers.avahiRestart = {
description = "Restart avahi-daemon every 5 minutes";
wantedBy = ["timers.target"];
timerConfig = {
OnBootSec = "5min";
OnUnitActiveSec = "5min";
Unit = "avahiRestart.service";
};
};
systemd.services.avahiRestart = {
description = "Restart avahi-daemon service";
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.systemd}/bin/systemctl restart avahi-daemon.service";
};
};
}

View File

@@ -15,6 +15,7 @@
boot.kernelModules = [];
boot.extraModulePackages = [];
boot.kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
boot.blacklistedKernelModules = ["snd_bcm2835"]; # Disables sound, required for ws281x to work
# boot.supportedFilesystems = lib.mkForce [
# # remove zfs, since its incompatible with latest kernel
# "vfat"

View File

@@ -27,6 +27,10 @@ in {
};
config = lib.mkIf cfg.enable {
security.sudo.extraConfig = ''
root ALL=(julian) NOPASSWD: ${pkgs.git}/bin/git -C "${cfg.flakePath}" commit -m *
'';
# Ensure the flag directory exists
systemd.tmpfiles.rules = [
"d /var/lib/frajul-auto-upgrade 0755 root root -"
@@ -67,11 +71,16 @@ in {
echo $$ > "$LOCK_FILE"
trap 'rm -f "$LOCK_FILE"' EXIT
if /run/current-system/sw/bin/nix flake update --flake "${cfg.flakePath}" && /run/current-system/sw/bin/nixos-rebuild switch --flake "${cfg.flakePath}"; then
# Back up flake.lock
cp -f "${cfg.flakePath}/flake.lock" /var/lib/frajul-auto-upgrade/flake.lock.bak
# Try updating
if /run/current-system/sw/bin/nix flake update --flake "${cfg.flakePath}" && /run/current-system/sw/bin/nixos-rebuild switch --flake "${cfg.flakePath}" && ${pkgs.sudo}/bin/sudo -u julian git -C "${cfg.flakePath}" commit -m "Auto-update flake.lock" -- flake.lock; then
echo "success" > "$LAST_STATUS_FILE"
else
echo "failure" > "$LAST_STATUS_FILE"
git -C "${cfg.flakePath}" restore flake.lock
# Restore flake.lock
cp -f /var/lib/frajul-auto-upgrade/flake.lock.bak "${cfg.flakePath}/flake.lock"
fi
# Write full timestamp

View File

@@ -26,6 +26,9 @@ in {
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
createHome = true;
home = "/home/${cfg.user}";
extraGroups = ["wheel" "gpio"];
};
users.groups.${cfg.group} = {};
@@ -36,11 +39,12 @@ in {
wantedBy = ["multi-user.target"];
serviceConfig = {
WorkingDirectory = "/home/${cfg.user}/Piano-LED-Visualizer";
ExecStart = "${pkgs.frajul.piano-led-visualizer}/bin/piano-led-visualizer";
Restart = "always";
Type = "simple";
User = cfg.user;
Group = cfg.group;
# User = cfg.user;
# Group = cfg.group;
};
};
};

View File

@@ -14,5 +14,7 @@
wl-ocr = pkgs.callPackage ./wl-ocr {};
rtklib = pkgs.qt6Packages.callPackage ./rtklib {};
pob2-frajul = pkgs.callPackage ./pob2-frajul {};
rpi-ws281x-python = pkgs.callPackage ./rpi-ws281x-python {};
piano-led-visualizer = pkgs.callPackage ./piano-led-visualizer {};
}

View File

@@ -1,10 +1,12 @@
{
lib,
python3,
callPackage,
fetchFromGitHub,
...
}: let
pythonPackages = python3.pkgs;
rpi-ws281x-python = callPackage ../rpi-ws281x-python {inherit python3;};
in
pythonPackages.buildPythonApplication rec {
pname = "piano-led-visualizer";
@@ -36,7 +38,8 @@ in
waitress
websockets
werkzeug
# rpi_ws281x
rpi-ws281x-python
];
format = "setuptools";

View File

@@ -0,0 +1,37 @@
{
lib,
python3,
fetchFromGitHub,
pkgs,
}:
python3.pkgs.buildPythonPackage rec {
pname = "rpi-ws281x";
version = "5.0.0";
src = fetchFromGitHub {
owner = "rpi-ws281x";
repo = "rpi-ws281x-python";
rev = "v${version}";
sha256 = "sha256-CVPibDs1QLeXhtoEBw3JplKIIUpzahjgJKy8GVy99Wk=";
fetchSubmodules = true;
};
format = "setuptools";
propagatedBuildInputs = with python3.pkgs; [
setuptools
wheel
];
postUnpack = ''
sourceRoot="$sourceRoot/library"
'';
meta = with lib; {
description = "Python bindings for the rpi_ws281x C library";
homepage = "https://github.com/rpi-ws281x/rpi-ws281x-python";
license = licenses.mit;
maintainers = [];
platforms = platforms.linux;
};
}