Update flake.lock 2025-04-28

Readme.org

@@ -1,7 +1,12 @@
 #+title: My dotfiles
 
-My dotfiles for which I am using =nix=.
-The structure is managed by [[https://snowfall.org/guides/lib/quickstart/][Snowfall lib]]
+* Quick start for home-manger only (no need to pull this repo)
+- 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

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

homes/julian/features/emacs/default.nix

@@ -67,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; {

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";
 
@@ -250,6 +281,7 @@ in {
         "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"
@@ -280,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,8 @@
 {
-  lib,
   pkgs,
   inputs,
   ...
-}:
-{
+}: {
   imports = [inputs.nixvim.homeModules.nixvim];
 
   home.sessionVariables = {
@@ -92,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/suites/desktop/default.nix

@@ -30,9 +30,9 @@
     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

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

homes/julian/features/yazi/default.nix

@@ -3,9 +3,6 @@
   inputs,
   ...
 }: {
-  programs.zoxide.enable = true;
-  programs.zoxide.enableFishIntegration = true;
-
   home.packages = with pkgs; [
     exiftool
     unar # extract archives

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

hosts/builder/default.nix

@@ -101,10 +101,17 @@
   };
 
   # Ollama used by open-webui as llm backend
-  # services.ollama = {
-  #   enable = true;
-  #   # acceleration = "rocm";
-  # };
+  services.ollama = {
+    enable = true;
+    # 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,12 +30,9 @@
       networkmanager-openconnect
     ];
   };
-  services.resolved.enable = true;
+  services.resolved.enable = false;
   # MDNS Taken by avahi
-  services.resolved.extraConfig = ''
-    MulticastDNS=false
-  '';
-
+  # networking.networkmanager.dns = "none";
   networking.nameservers = lib.mkDefault [
     "1.1.1.1"
     "8.8.8.8"

hosts/common/global/nix.nix

@@ -2,8 +2,7 @@
   lib,
   outputs,
   ...
-}:
-{
+}: {
   # Apply overlays
   nixpkgs = {
     # TODO: apply this to hm and nixos without duplicate code

hosts/kardorf/default.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   imports = [
     ./hardware-configuration.nix
 
@@ -37,6 +36,7 @@
   networking.networkmanager.insertNameservers = ["192.168.3.252"];
 
   programs.kdeconnect.enable = true;
+  programs.steam.enable = true;
 
   programs.hyprland.enable = true;
   services.desktopManager.plasma6.enable = true;

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: _: {
-    inputs =
-      builtins.mapAttrs (
-        _: flake: let
-          legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
-          packages = (flake.packages or {}).${final.system} or {};
-        in
-          if legacyPackages != {}
-          then legacyPackages
-          else packages
-      )
-      inputs;
-  };
+  # flake-inputs = final: _: {
+  #   inputs =
+  #     builtins.mapAttrs (
+  #       _: flake: let
+  #         legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
+  #         packages = (flake.packages or {}).${final.system} or {};
+  #       in
+  #         if legacyPackages != {}
+  #         then legacyPackages
+  #         else packages
+  #     )
+  #     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,8 +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 {};
 
-  rpi-ws281x-python = pkgs.callPackage ./rpi-ws281x-python {};
-  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/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];
+}