Update flake.lock 2025-04-28

Normally I wont have VPN access on standalone

Readme.org

@@ -1,7 +1,12 @@
 #+title: My dotfiles
 
-My dotfiles for which I am using =nix=.
+* Quick start for home-manger only (no need to pull this repo)
-The structure is managed by [[https://snowfall.org/guides/lib/quickstart/][Snowfall lib]]
+- Install nix using the https://github.com/DeterminateSystems/nix-installer
+- Then run
+ #+begin_src shell
+nix run nixpkgs#home-manager -- switch --flake git+https://gitlab.julian-mutter.de/julian/dotfiles.git#julian@quickstart
+ #+end_src 
+- Done
 
 * Machine selection
 =home-manager= automatically searches for =user= or =user@hostname= config in the flake, so specify one of those or you will have to manually specify them:

flake.nix

@@ -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 = {
@@ -100,12 +100,12 @@
         };
       };
       # Piano raspberry pi
-      pianonix = lib.nixosSystem {
+      # pianonix = lib.nixosSystem {
-        modules = [./hosts/pianonix];
+      #   modules = [./hosts/pianonix];
-        specialArgs = {
+      #   specialArgs = {
-          inherit inputs outputs;
+      #     inherit inputs outputs;
-        };
+      #   };
-      };
+      # };
       kardorf = lib.nixosSystem {
         modules = [./hosts/kardorf];
         specialArgs = {
@@ -134,16 +134,16 @@
         };
       };
       # Media server (RPi)
-      "julian@pianonix" = lib.homeManagerConfiguration {
+      # "julian@pianonix" = lib.homeManagerConfiguration {
-        modules = [
+      #   modules = [
-          ./homes/julian/pianonix.nix
+      #     ./homes/julian/pianonix.nix
-          ./homes/julian/hm-standalone-config.nix
+      #     ./homes/julian/hm-standalone-config.nix
-        ];
+      #   ];
-        pkgs = pkgsFor.aarch64-linux;
+      #   pkgs = pkgsFor.aarch64-linux;
-        extraSpecialArgs = {
+      #   extraSpecialArgs = {
-          inherit inputs outputs;
+      #     inherit inputs outputs;
-        };
+      #   };
-      };
+      # };
       "julian@kardorf" = lib.homeManagerConfiguration {
         modules = [
           ./homes/julian/kardorf.nix
@@ -164,19 +164,29 @@
           inherit inputs outputs;
         };
       };
+      "julian@quickstart" = lib.homeManagerConfiguration {
+        modules = [
+          ./homes/julian/quickstart.nix
+          ./homes/julian/hm-standalone-config.nix
+        ];
+        pkgs = pkgsFor.x86_64-linux;
+        extraSpecialArgs = {
+          inherit inputs outputs;
+        };
+      };
     };
 
     # deploy-rs node configuration
     deploy.nodes = {
-      pianonix = {
+      # pianonix = {
-        hostname = "pianonix.local";
+      #   hostname = "pianonix.local";
-        profiles.system = {
+      #   profiles.system = {
-          sshUser = "root";
+      #     sshUser = "root";
-          user = "root";
+      #     user = "root";
-          path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pianonix;
+      #     path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pianonix;
-          confirmTimeout = 90; # default: 30s; raspberrypi takes a little longer restarting services
+      #     confirmTimeout = 90; # default: 30s; raspberrypi takes a little longer restarting services
-        };
+      #   };
-      };
+      # };
 
       builder = {
         hostname = "builder.julian-mutter.de";

homes/julian/aspi.nix

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

homes/julian/features/emacs/default.nix

@@ -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
@@ -59,6 +67,27 @@ in {
       # neocmakelsp # cmake
 
       emacs-all-the-icons-fonts
+      frajul.typst-languagetool
+      ltex-ls-plus
+
+      (texlive.combine {
+        inherit
+          (texlive)
+          scheme-basic
+          # for rendering latex in inkscape
+          standalone
+          amsmath
+          preview
+          # needed for org mode preview
+          dvisvgm
+          dvipng # for preview and export as html
+          wrapfig
+          # amsmath
+          ulem
+          hyperref
+          capt-of
+          ;
+      })
     ]
     ++ lib.optional config.is-nixos emacs;
 

homes/julian/features/fish/default.nix

@@ -27,6 +27,11 @@ with lib; {
     enableFishIntegration = true;
   };
 
+  programs.zoxide = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
   programs.fish = {
     enable = true;
 
@@ -38,14 +43,14 @@ with lib; {
         cd $argv
       '';
       run = ''
-        nix run nixpkgs#"$argv[1]" -- $argv[2..-1]
+        nix run --impure nixpkgs#"$argv[1]" -- $argv[2..-1]
       '';
       shell = ''
         set args
         for arg in $argv
             set args $args nixpkgs#$arg
         end
-        nix shell $args
+        nix shell --impure $args
       '';
       fish_user_key_bindings = ''
         bind ctrl-space 'zi; commandline -f repaint'

homes/julian/features/fonts/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   pkgs,
-  config,
   ...
 }:
 with lib; {
@@ -12,7 +11,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

homes/julian/features/hyprland/default.nix

@@ -152,6 +152,37 @@ in {
       # hyprlandPlugins.hyprbars
     ];
 
+    submaps = {
+      "resize".settings = {
+        binde = [
+          ", right, resizeactive, 20"
+          ", left, resizeactive, -20 0"
+          ", up, resizeactive, 0 -20"
+          ", down, resizeactive, 0 20"
+          ", l, resizeactive, 20"
+          ", h, resizeactive, -20 0"
+          ", k, resizeactive, 0 -20"
+          ", j, resizeactive, 0 20"
+        ];
+
+        bind = [
+          ", q, submap, reset"
+          ", escape, submap, reset"
+
+          ", catchall, submap, reset" # make any other keypress cancel the submap
+        ];
+      };
+      "open, reset".settings = {
+        bind = [
+          ", e, exec, emacs"
+          ", m, exec, open-messaging"
+          ", b, exec, firefox"
+
+          ", catchall, submap, reset" # make any other keypress cancel the submap
+        ];
+      };
+    };
+
     settings = {
       "$mod" = "SUPER";
 
@@ -228,6 +259,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 +279,10 @@ in {
       windowrulev2 = [
         "suppressevent maximize, class:.*"
         "workspace 1, class:firefox"
+        "workspace 8, class:Zotero"
         "workspace 9, class:nheko"
+        "workspace 9, class:Element"
+        "workspace 9, class:discord"
         "workspace 9, class:org.telegram.desktop"
         "workspace 10, class:thunderbird"
         "float, class:qalculate-gtk"
@@ -274,12 +312,18 @@ in {
       bind =
         [
           # compositor commands
-          "$mod, Space, focuswindow, floating"
+          #
-          "$mod SHIFT, Space, togglefloating,"
+          #
+          "$mod, R, submap, resize"
+          "$mod, O, submap, open"
+          #
+
+          "$mod, SPACE, focuswindow, floating"
+          "$mod SHIFT, SPACE, togglefloating,"
           "$mod, F, fullscreen,"
           "$mod, X, killactive,"
 
-          "$mod, O, togglesplit," # dwindle
+          "$mod, -, togglesplit," # dwindle
 
           # opening applications
           "$mod, D, exec, wofi --show drun,run"

homes/julian/features/neovim/default.nix

@@ -1,10 +1,9 @@
 {
-  lib,
   pkgs,
   inputs,
   ...
 }: {
-  imports = [inputs.nixvim.homeManagerModules.nixvim];
+  imports = [inputs.nixvim.homeModules.nixvim];
 
   home.sessionVariables = {
     EDITOR = "nvim";
@@ -78,6 +77,7 @@
       neogit.enable = true; # like magit
       trouble.enable = true;
       web-devicons.enable = true;
+      orgmode.enable = true; # org-mode support
 
       # Shows file trees
       oil = {
@@ -90,7 +90,7 @@
       # Code formatting
       conform-nvim = {
         enable = true;
-        settings.formatters_by_ft = with pkgs; {
+        settings.formatters_by_ft = {
           lua = ["stylua"];
           python = ["black"];
           nix = ["nixfmt"];

homes/julian/features/qt-distrobox/default.nix

@@ -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"
+      ];
+    };
+  };
+}

homes/julian/features/suites/cli/default.nix

@@ -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

homes/julian/features/suites/desktop/default.nix

@@ -27,12 +27,12 @@
     # element-desktop
     # rocketchat-desktop
     thunderbird
-    tdesktop # telegram
+    telegram-desktop # telegram
     # schildichat-desktop # not updated regularly
     nheko
+    element-desktop
     evince # Simple pdf reader, good for focusing on document content
     firefox
-    vivaldi
     # geogebra
     cheese
     handbrake
@@ -51,8 +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
-    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

homes/julian/features/suites/development/default.nix

@@ -1,4 +1,9 @@
 {pkgs, ...}: {
+  programs.opencode = {
+    enable = true;
+    package = pkgs.unstable.opencode;
+  };
+
   home.packages = with pkgs; [
     watchexec # Run command when any file in current dir changes
     android-tools # adb
@@ -9,7 +14,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 +26,21 @@
     unstable.zed-editor
     jdk
     julia-bin
-    (texlive.combine {
+    # (texlive.combine {
-      # for rendering latex in inkscape
+    #   # for rendering latex in inkscape
-      inherit
+    #   inherit
-        (texlive)
+    #     (texlive)
-        scheme-medium
+    #     scheme-medium
-        standalone
+    #     standalone
-        amsmath
+    #     amsmath
-        preview
+    #     preview
-        # needed for org mode export
+    #     # needed for org mode export
-        wrapfig
+    #     wrapfig
-        capt-of
+    #     capt-of
-        biblatex
+    #     biblatex
-        ;
+    #     ;
-    })
+    # })
+    vagrant
     matlab # Using nix-matlab overlay defined in flake
     maven
     nodejs

homes/julian/features/tmux/default.nix

@@ -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
+  };
+}

homes/julian/features/yazi/default.nix

@@ -3,14 +3,11 @@
   inputs,
   ...
 }: {
-  programs.zoxide.enable = true;
-  programs.zoxide.enableFishIntegration = true;
-
   home.packages = with pkgs; [
     exiftool
     unar # extract archives
-    xdragon # dragndrop
+    dragon-drop # dragndrop
-    poppler_utils # pdf preview
+    poppler-utils # pdf preview
     fd
     ripgrep
     fzf

homes/julian/global/default.nix

@@ -24,6 +24,11 @@
     };
   };
 
+  # To allow unfree with 'nix run'
+  xdg.configFile."nixpkgs/config.nix".text = ''
+    { allowUnfree = true; }
+  '';
+
   colorscheme.name = "catppuccin-mocha";
 
   # systemd.user.startServices = "sd-switch"; # TODO: what is this

homes/julian/hm-standalone-config.nix

@@ -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 = [

homes/julian/kardorf.nix

@@ -8,11 +8,14 @@
     ./features/neovim
     ./features/ghostty
     ./features/wezterm
+    ./features/alacritty
     ./features/yazi
     ./features/emacs
 
-    # ./features/hyprland
+    ./features/tmux
-    ./features/i3
+    ./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 |

homes/julian/quickstart.nix

@@ -0,0 +1,32 @@
+# Quick configuration for setting up basic things on a standalone home-manager device
+# If you want to adapt it to a specific device, copy this file with the correct hostname
+{pkgs, ...}: {
+  imports = [
+    ./global
+
+    ./features/fish
+    ./features/direnv
+    ./features/neovim
+    ./features/yazi
+    ./features/emacs
+    ./features/nix-helper
+    ./features/tmux
+  ];
+
+  is-nixos = false;
+
+  home.sessionPath = ["/snap/bin"];
+
+  # Essential packages
+  home.packages = with pkgs; [
+    bat
+    dust
+    fd
+    ripgrep
+    fzf
+    lazygit
+    mc
+    tree
+    wget
+  ];
+}

homes/julian/v3ms/default.nix

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

homes/julian/v3ms/fonts.nix

@@ -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

homes/julian/v3ms/packages.nix

@@ -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

hosts/aspi/default.nix

@@ -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.lidSwitch = "lock";
-  services.logind.lidSwitchDocked = "lock";
+  # services.logind.lidSwitchDocked = "lock";
 
   programs.kdeconnect.enable = true;
 

hosts/builder/default.nix

@@ -101,10 +101,17 @@
   };
 
   # Ollama used by open-webui as llm backend
-  # services.ollama = {
+  services.ollama = {
-  #   enable = true;
+    enable = true;
-  #   # acceleration = "rocm";
+    # acceleration = "rocm";
-  # };
+    openFirewall = true;
+  };
+
+  services.nextjs-ollama-llm-ui = {
+    enable = true;
+    hostname = "192.168.3.118";
+    port = 3001;
+  };
   # services.open-webui = {
   #   enable = true;
   #   port = 8080;
@@ -114,6 +121,7 @@
 
   networking.firewall.allowedTCPPorts = [
     80
+    3001 # ollama-ui
   ];
 
   services.openssh = {

hosts/common/global/default.nix

@@ -30,19 +30,17 @@
       networkmanager-openconnect
     ];
   };
-  services.resolved.enable = true;
+  services.resolved.enable = false;
   # MDNS Taken by avahi
-  services.resolved.extraConfig = ''
+  # networking.networkmanager.dns = "none";
-    MulticastDNS=false
-  '';
-
   networking.nameservers = lib.mkDefault [
     "1.1.1.1"
     "8.8.8.8"
   ];
 
-  # HM
+  # HM module
-  home-manager.useGlobalPkgs = true;
+  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;
   };

hosts/common/global/nix.nix

@@ -18,7 +18,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 +31,11 @@
   nix.gc = {
     automatic = true;
     dates = "weekly";
-    # Keep the last 3 generations
+    options = "--delete-older-than 30d";
-    options = "--delete-older-than +3";
+  };
+  nix.optimise = {
+    automatic = true;
+    dates = ["weekly"]; # Optional; allows customizing optimisation schedule
   };
 
   programs.nix-ld.enable = true;

hosts/common/optional/greetd.nix

@@ -1,26 +1,9 @@
-{
+{config, ...}: let
-  pkgs,
-  lib,
-  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 = {
+    # TODO: setting keyboard language does not work
-    enable = true;
+    # settings = {
-    settings.default_session.command = sway-kiosk (lib.getExe config.programs.regreet.package);
+    #   env = {
+    #     XKB_DEFAULT_LAYOUT = "de";
+    #     # XKB_DEFAULT_VARIANT = "altgr-intl";
+    #   };
+    # };
   };
 }

hosts/common/optional/pcmanfm.nix

@@ -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
   ];
 

hosts/common/users/yukari/default.nix

@@ -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

hosts/kardorf/default.nix

@@ -7,21 +7,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/greetd.nix
-
-    ../common/optional/gdm.nix
-    ../common/optional/i3.nix
-
-    ../common/optional/openssh.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,8 +33,12 @@
   # Not using the drivers leads to way better results
   # services.xserver.videoDrivers = [ "nvidia" ];
 
-  programs.kdeconnect.enable = true;
+  networking.networkmanager.insertNameservers = ["192.168.3.252"];
 
+  programs.kdeconnect.enable = true;
+  programs.steam.enable = true;
+
+  programs.hyprland.enable = true;
   services.desktopManager.plasma6.enable = true;
 
   # Enable CUPS to print documents.

hosts/pianonix/default.nix

@@ -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";
+    };
+  };
 }

hosts/pianonix/hardware-configuration.nix

@@ -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"

modules/nixos/frajul-auto-upgrade.nix

@@ -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

modules/nixos/piano-led-visualizer.nix

@@ -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;
+        # User = cfg.user;
-        Group = cfg.group;
+        # Group = cfg.group;
       };
     };
   };

overlays/default.nix

@@ -2,19 +2,19 @@
   # For every flake input, aliases 'pkgs.inputs.${flake}' to
   # 'inputs.${flake}.packages.${pkgs.system}' or
   # 'inputs.${flake}.legacyPackages.${pkgs.system}'
-  flake-inputs = final: _: {
+  # flake-inputs = final: _: {
-    inputs =
+  #   inputs =
-      builtins.mapAttrs (
+  #     builtins.mapAttrs (
-        _: flake: let
+  #       _: flake: let
-          legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
+  #         legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
-          packages = (flake.packages or {}).${final.system} or {};
+  #         packages = (flake.packages or {}).${final.system} or {};
-        in
+  #       in
-          if legacyPackages != {}
+  #         if legacyPackages != {}
-          then legacyPackages
+  #         then legacyPackages
-          else packages
+  #         else packages
-      )
+  #     )
-      inputs;
+  #     inputs;
-  };
+  # };
 
   input-flake-packages = final: prev: {
     sheet-organizer = inputs.sheet-organizer.packages.${prev.system}.default; # TODO: change sheet-organizer package output
@@ -26,11 +26,11 @@
 
   nixpkgs-stable-unstable = final: prev: {
     unstable = import inputs.nixpkgs-unstable {
-      system = prev.system;
+      system = prev.stdenv.hostPlatform.system;
       config.allowUnfree = true;
     };
     stable = import inputs.nixpkgs {
-      system = prev.system;
+      system = prev.stdenv.hostPlatform.system;
       config.allowUnfree = true;
     };
   };

pkgs/default.nix

@@ -13,6 +13,9 @@
   pob2 = pkgs.callPackage ./pob2 {};
   wl-ocr = pkgs.callPackage ./wl-ocr {};
   rtklib = pkgs.qt6Packages.callPackage ./rtklib {};
+  typst-languagetool = pkgs.callPackage ./typst-languagetool {};
   pob2-frajul = pkgs.callPackage ./pob2-frajul {};
-  piano-led-visualizer = pkgs.callPackage ./piano-led-visualizer {};
+
+  # rpi-ws281x-python = pkgs.callPackage ./rpi-ws281x-python {};
+  # piano-led-visualizer = pkgs.callPackage ./piano-led-visualizer {};
 }

pkgs/open-messaging/default.nix

@@ -1,6 +1,6 @@
 {
   writeShellApplication,
-  nheko,
+  element-desktop,
   telegram-desktop,
   thunderbird,
   discord, # TODO: discord not available for aarch64, this leads to flake evaluation for this arch fail.
@@ -9,7 +9,7 @@ writeShellApplication {
   name = "open-messaging";
 
   runtimeInputs = [
-    nheko
+    element-desktop
     telegram-desktop
     thunderbird
     discord
@@ -18,7 +18,7 @@ writeShellApplication {
   text = ''
     thunderbird &
     sleep 0.1
-    nheko &
+    element-desktop &
     sleep 0.1
     Telegram &
     sleep 0.1

pkgs/piano-led-visualizer/default.nix

@@ -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";

pkgs/rpi-ws281x-python/default.nix

@@ -10,15 +10,12 @@ python3.pkgs.buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "rpi-ws281x";
-    repo = "rpi-ws281x-pytho";
+    repo = "rpi-ws281x-python";
     rev = "v${version}";
-    sha256 = "sha256-tnjvFDBa+sNX6dK6/I1/rRt62k15kTP+9J8eyFRFs/I=";
+    sha256 = "sha256-CVPibDs1QLeXhtoEBw3JplKIIUpzahjgJKy8GVy99Wk=";
     fetchSubmodules = true;
-    deepClone = true;
   };
 
-  # sourceRoot = "${src}/library";
-
   format = "setuptools";
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -30,9 +27,6 @@ python3.pkgs.buildPythonPackage rec {
     sourceRoot="$sourceRoot/library"
   '';
 
-  # Some of the bindings compile C code, so you may need these
-  nativeBuildInputs = [python3.pkgs.setuptools pkgs.scons];
-
   meta = with lib; {
     description = "Python bindings for the rpi_ws281x C library";
     homepage = "https://github.com/rpi-ws281x/rpi-ws281x-python";

pkgs/typst-languagetool/default.nix

@@ -0,0 +1,27 @@
+{
+  rustPlatform,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  ...
+}:
+rustPlatform.buildRustPackage {
+  pname = "typst-languagetool";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "antonWetzel";
+    repo = "typst-languagetool";
+    rev = "b667a7ed94c8d671b23dd4ec018c58039277f0d6";
+    sha256 = "sha256-sxE8mQW/bH58oZzamjxTQIcSjQh4FaYvrYfNJrnm8Io=";
+  };
+
+  cargoHash = "sha256-80Dfpy2MB7ty841azRwBtA7hhO/yUXh2N4cvtrgTd2g=";
+
+  buildFeatures = ["server"];
+  cargoBuildFlags = "-p cli";
+
+  # optional dependencies
+  buildInputs = [openssl];
+  nativeBuildInputs = [pkg-config];
+}