Merge branch 'main' of https://git.marty.tf/marty/config.nix

home/apps/internet/zen-browser.nix

@@ -76,7 +76,7 @@ in
                 ExtensionSettings = builtins.listToAttrs extensions;
 
                 SearchEngines = {
-                  Default = "MartyTF's Series of Tubes";
+                  Default = "kagi";
                   Add = [
                     {
                       Name = "MartyTF's Series of Tubes";
@@ -84,6 +84,12 @@ in
                       IconURL = "https://wiki.nixos.org/favicon.ico";
                       Alias = "@sgx";
                     }
+                    {
+                      Name = "kagi";
+                      URLTemplate = "https://kagi.com/search?q={searchTerms}";
+                      IconURL = "https://kagi.com/asset/597c5c3/kagi_assets/logos/search.png?v=679b1c5d38deac3ff084fc704aa36694454572a2";
+                      Alias = "@k";
+                    }
                   ];
                 };
               };

home/desktop/shell/noctalia.nix

@@ -20,6 +20,34 @@
       if osConfig.desktop.shell.noctalia.enable then
         {
           enable = true;
+          settings = {
+            bar = {
+              density = "compact";
+              position = "center";
+              showCapsule = true;
+              widgets = {
+                left = [
+                  {
+                    id = "ControlCenter";
+                    useDistroLogo = true;
+                  }
+                  {
+                    id = "Network";
+                  }
+                  {
+                    id = "Bluetooth";
+                  }
+                ];
+                center = [
+                  {
+                    id = "Workspace";
+                    labelMode = "none";
+                    hideUnoccupied = false;
+                  }
+                ];
+              };
+            };
+          };
         }
       else
         { };

home/desktop/window-managers/hyprland.nix

@@ -80,6 +80,7 @@
         ];
         exec-once = [
           (lib.mkIf (osConfig.desktop.shell.walker.enable) "elephant")
+          (lib.mkIf (osConfig.desktop.shell.walker.enable) "walker --gapplication-service")
           (lib.mkIf (osConfig.desktop.shell.waybar.enable) "waybar")
           (lib.mkIf (osConfig.desktop.shell.noctalia.enable) "noctalia-shell")
           (lib.mkIf (osConfig.desktop.shell.noctalia.enable) "noctalia-shell ipc call wallpaper random")

home/desktop/window-managers/niri.nix

@@ -81,7 +81,7 @@ in
 
               spawn-at-startup "elephant"
               spawn-at-startup "noctalia-shell"
-
+                spawn-at-startup "walker --gapplication-service"
 
               layout {
                   gaps 20

hosts/marty-pc/custom.nix

@@ -6,6 +6,16 @@
 }:
 
 {
+  networking = {
+    interfaces = {
+      enp42s0 = {
+        wakeOnLan = {
+          enable = true;
+          policy = [ "magic" ];
+        };
+      };
+    };
+  };
   services.flatpak.enable = true;
   virtualisation.docker.enable = true;
   security.polkit = {

hosts/marty-pc/default.nix

@@ -8,28 +8,13 @@
   ...
 }:
 
-let
-  hostname = "marty-pc";
-in
-
 {
-  networking = {
-    hostName = hostname;
-    interfaces = {
-      enp42s0 = {
-        wakeOnLan = {
-          enable = true;
-          policy = [ "magic" ];
-        };
-      };
-    };
-  };
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     useGlobalPkgs = true;
     useUserPackages = true;
     users = {
-      marty = import ./home.nix;
+      "${config.user.userName}"  = import ./home.nix;
     };
   };
   imports = [

hosts/marty-pc/home.nix

@@ -13,31 +13,6 @@
   home.homeDirectory = "/home/${osConfig.user.userName}";
   home.stateVersion = "25.11";
 
-  desktop = {
-    hyprland = {
-      numlock = true;
-      monitors = [
-        "desc:AOC Q27G2WG4 0x00005F45, 2560x1440@144, 3840x0, 1   # main monitor"
-        "desc:Samsung Electric Company S24D330 0x5A5A5131, 1920x1080@60, 3840x1440, 1 # side monitor"
-        "desc:Panasonic Industry Company Panasonic-TV, 3840x2160@30, 0x0, 1  # tv"
-        "desc:Valve Corporation Index HMD 0x3DEBE38D, preffered, auto, 1"
-      ];
-      workspaces.workspaces = [
-
-        "1, monitor:DP-1, persistent:true"
-        "2, monitor:DP-1, persistent:true"
-        "3, monitor:DP-1, persistent:true"
-        "4, monitor:DP-1, persistent:true"
-        "5, monitor:HDMI-A-1, persistent:true"
-        "6, monitor:HDMI-A-1, persistent:true"
-        "7, monitor:HDMI-A-1, persistent:true"
-        "8, monitor:HDMI-A-1, persistent:true"
-        "9, monitor:DP-3, persistent:true"
-        "special:magic"
-      ];
-    };
-  };
-
   imports = [
     ./../../home
   ];

hosts/marty-pc/options.nix

@@ -15,6 +15,7 @@
       timezone = "Europe/Berlin";
       language = "en_GB.UTF-8";
       locale = "de_DE.UTF-8";
+      hostname = "marty-thinkpad";
     };
     apps = {
       audio = {
@@ -118,7 +119,7 @@
     desktop = {
       window-managers = {
         hyprland = {
-          enable = true;
+          enable = false;
         };
         niri = {
           enable = true;

hosts/marty-thinkpad/custom.nix

@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  services.flatpak.enable = true;
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.nvidia.modesetting.enable = true;
+  hardware.nvidia.open = true;
+}

hosts/marty-thinkpad/default.nix

@@ -8,37 +8,20 @@
 }:
 
 {
-  networking = {
-    hostName = "marty-thinkpad";
-  };
-
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     useGlobalPkgs = true;
     useUserPackages = true;
     users = {
-      marty = import ./home.nix;
+      "${config.user.userName}" = import ./home.nix;
     };
   };
 
-  main-user = {
-    userName = "marty";
-    shell = pkgs.fish;
-  };
-
   imports = [
     ./hardware.nix
-    # ../../modules/server/nginx.nix
+    ./custom.nix
+    ./options.nix
   ];
 
-  desktop.niri.enable = true;
-
-  programs = {
-    light.enable = true;
-  };
-  services.flatpak.enable = true;
-  services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.nvidia.modesetting.enable = true;
-  hardware.nvidia.open = true;
   system.stateVersion = "24.11"; # Did you read the comment?
 }

hosts/marty-thinkpad/home.nix

@@ -3,95 +3,18 @@
   pkgs,
   inputs,
   lib,
+  osConfig,
   ...
 }:
 
 {
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
-  home.username = "marty";
-  home.homeDirectory = "/home/marty";
 
-  # This value determines the Home Manager release that your configuration is
+  home.username = osConfig.user.userName;
-  # compatible with. This helps avoid breakage when a new Home Manager release
+  home.homeDirectory = "/home/${osConfig.user.userName}";
-  # introduces backwards incompatible changes.
+  home.stateVersion = "24.11";
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  home.stateVersion = "24.11"; # Please read the comment before changing.
-
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
-
-  programs.fish.enable = true;
-
-  home.packages = with pkgs; [
-    # # Adds the 'hello' command to your environment. It prints a friendly
-    # # "Hello, world!" when run.
-    # hello
-
-    # # It is sometimes useful to fine-tune packages, for example, by applying
-    # # overrides. You can do that directly here, just don't forget the
-    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
-    # # fonts?
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
-
-    # # You can also create simple shell scripts directly inside your
-    # # configuration. For example, this adds a command 'my-hello' to your
-    # # environment:
-    # (pkgs.writeShellScriptBin "my-hello" ''
-    #   echo "Hello, ${config.home.username}!"
-    # '')
-  ];
-
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/marty/etc/profile.d/hm-session-vars.sh
-  #
-
-  device.type.laptop = true;
-
-  desktop.hyprland = {
-    monitors = [
-      "desc:AU Optronics 0x313E,1600x900@60,0x0,1"
-    ];
-  };
 
   imports = [
-    inputs.walker.homeManagerModules.default
-    inputs.noctalia.homeModules.default
-    ./../../modules
     ./../../home
-
   ];
-  # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }

hosts/marty-thinkpad/options.nix

@@ -0,0 +1,157 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  config = {
+    user = {
+      userName = "marty";
+      shell = pkgs.fish;
+    };
+    system = {
+      timezone = "Europe/Berlin";
+      language = "en_GB.UTF-8";
+      locale = "de_DE.UTF-8";
+      hostname = "marty-thinkpad";
+    };
+    apps = {
+      audio = {
+        base.enable = true;
+        media.enable = true;
+        editing.enable = true;
+      };
+      development = {
+        editor = {
+          vscodium.enable = true;
+          emacs.enable = true;
+          default = "vscodium";
+        };
+        languages = {
+          python.enable = true;
+        };
+        godot.enable = true;
+      };
+      gaming = {
+        enable = true;
+        steam.enable = true;
+        minecraft.enable = true;
+      };
+      image = {
+        base.enable = true;
+        editing.enable = true;
+      };
+      internet = {
+        browsers = {
+          zen-browser.enable = true;
+          tor-browser.enable = true;
+          default = "zen";
+        };
+        mail = {
+          enable = true;
+          providers = {
+            protonmail.enable = true;
+          };
+        };
+      };
+      messaging = {
+        signal.enable = true;
+        element = {
+          enable = true;
+          selfhosted = true;
+        };
+      };
+      misc = {
+        obsidian.enable = true;
+        bitwarden.enable = true;
+        blender.enable = true;
+      };
+      sync = {
+        kde-connect.enable = true;
+        nextcloud.enable = true;
+        syncthing = {
+          devices = {
+            marty-pc = {
+              id = "6PJZD52-EEWIO7U-MZMJJ5B-33DGNSU-O7DJVRT-GAE7QZG-ZY3VIMV-VSMBDQP";
+              autoAcceptFolder = true;
+            };
+            marty-server = {
+              id = "UDMXEKZ-HYIFI5S-VAKE75O-K3C65QV-LS43QA5-3JTHWKL-CI5C3Y6-P4NSQQM";
+              autoAcceptFolders = true;
+            };
+            marty-latitude = {
+              id = "SOAWHKA-BCQGO5G-IJ24WTO-RDETP5M-LNTVO66-MHIOUU2-NNQ57P6-FFKNSA6";
+              autoAcceptFolders = true;
+            };
+            marty-thinkpad = {
+              id = "NWHFQSW-FOBGFLV-YMZR77Q-KNRR3YC-4C6PKXT-TTPDCOL-CDB6QX4-3QJE2AN";
+              autoAcceptFolders = true;
+            };
+            marty-pixel = {
+              id = "GSBXOGW-6SYLDUQ-HPH7FBJ-CKHWQIK-K5YORB4-CYKGYT6-DLCVSAK-LA2RMAK";
+              autoAcceptFolders = true;
+            };
+            marty-fairphone = {
+              id = "2ISVWQV-4USY5IA-2OU55CE-Q7VLPD7-4RVQ5WX-FXQSJMY-2ES4EZG-IGFB7QG";
+              autoAcceptFolders = true;
+            };
+          };
+        };
+      };
+      terminal = {
+        kitty = {
+          enable = true;
+        };
+        default = "kitty";
+        tui = {
+          ranger.enable = true;
+        };
+        toys = true;
+      };
+      video = {
+        base.enable = true;
+        media.enable = true;
+        editing.enable = true;
+      };
+    };
+    desktop = {
+      window-managers = {
+        hyprland = {
+          enable = false;
+        };
+        niri = {
+          enable = true;
+        };
+        sway = {
+          enable = true;
+        };
+      };
+      shell = {
+        noctalia = {
+          enable = true;
+        };
+        swww = {
+          enable = false;
+        };
+        walker = {
+          enable = true;
+        };
+        waybar = {
+          enable = false;
+        };
+      };
+      utilities = {
+        grimblast = {
+          enable = true;
+        };
+      };
+    };
+    server = {
+      synapse = {
+        subdomain = "yap";
+      };
+    };
+  };
+}

modules/desktop/display-manager.nix

@@ -30,36 +30,35 @@
   programs = {
     uwsm = {
       enable = true;
-      waylandCompositors = {
+      waylandCompositors =
-        hyprland =
         if config.desktop.window-managers.hyprland.enable then
           {
+            hyprland = {
               prettyName = "Hyprland";
               comment = "Hyprland";
               binPath = "${config.programs.hyprland.package}/bin/start-hyprland";
+            };
           }
-          else
+        else if config.desktop.window-managers.sway.enable then
-            { };
-        sway =
-          if config.desktop.window-managers.sway.enable then
           {
+            sway = {
               prettyName = "Sway";
               comment = "Sway";
               binPath = "${config.programs.sway.package}/bin/sway --session";
+            };
           }
-          else
+        else if config.desktop.window-managers.niri.enable then
-            { };
+
-        niri =
-          if config.desktop.window-managers.niri.enable then
           {
+            niri = {
               prettyName = "Niri";
               comment = "Niri";
               binPath = "${config.programs.niri.package}/bin/niri-session";
+            };
           }
         else
           { };
     };
   };
-  };
   xdg.portal.enable = true;
 }

modules/server/cloud/default.nix

@@ -8,5 +8,6 @@
 {
   imports = [
     ./immich.nix
+    ./nextcloud.nix
   ];
 }

modules/server/cloud/nextcloud.nix

@@ -0,0 +1,93 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    server.cloud.nextcloud = {
+      enable = lib.mkEnableOption "enable nextcloud";
+      port = lib.mkOption {
+        default = 8009;
+        description = "nextcloud port";
+      };
+      public = lib.mkEnableOption "make nextcloud public";
+      subdomain = lib.mkOption {
+        default = "nextcloud";
+        description = "nextcloud subdomain";
+      };
+    };
+  };
+  config = {
+    services = {
+      nextcloud = {
+        enable = config.server.cloud.nextcloud.enable;
+        configureRedis = true;
+        package = pkgs.nextcloud33;
+        hostName = "nextcloud-net";
+        config = {
+          dbtype = "pgsql";
+          dbuser = "nextcloud";
+          dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
+          dbname = "nextcloud";
+          adminpassFile = "/home/marty/secrets/nextcloud";
+          adminuser = "admin";
+        };
+        settings = {
+          trusted_proxies = [
+            "localhost"
+            "127.0.0.1"
+            "${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
+            config.networking.hostName
+          ];
+          trusted_domains = [
+            "${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
+            config.networking.hostName
+          ];
+          skeletondirectory = "";
+          preview_ffmpeg_path = "${pkgs.ffmpeg}/bin/ffmpeg";
+          log_type = "file";
+          logfile = "nextcloud.log";
+          loglevel = 0;
+        };
+      };
+      postgresql = {
+        enable = true;
+        ensureDatabases = [ "nextcloud" ];
+        ensureUsers = [
+          {
+            name = "nextcloud";
+            ensureDBOwnership = true;
+          }
+        ];
+      };
+      nginx = {
+        virtualHosts = {
+          "nextcloud-net".listen = [
+            {
+              addr = "0.0.0.0";
+              port = config.server.cloud.nextcloud.port;
+            }
+          ];
+          "${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}" =
+            if config.server.cloud.nextcloud.public then
+              {
+                enableACME = true;
+                forceSSL = true;
+                locations."/" = {
+                  proxyPass = "http://127.0.0.1:${toString config.server.cloud.nextcloud.port}";
+                };
+              }
+            else
+              { };
+        };
+      };
+    };
+    systemd.services."nextcloud-setup" = {
+      requires = [ "postgresql.service" ];
+      after = [ "postgresql.service" ];
+    };
+  };
+}

modules/server/media/default.nix

@@ -8,5 +8,6 @@
 {
   imports = [
     ./jellyfin.nix
+    ./navidrome.nix
   ];
 }

modules/server/media/navidrome.nix

@@ -0,0 +1,66 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    server.media.navidrome = {
+      enable = lib.mkEnableOption "enable navidrome";
+      port = lib.mkOption {
+        default = 4533;
+        description = "navidrome port";
+      };
+      public = lib.mkEnableOption "make navidrome public";
+      subdomain = lib.mkOption {
+        default = "music";
+        description = "navidrome subdomain";
+      };
+    };
+  };
+  config = {
+    services = {
+      navidrome = {
+        enable = config.server.media.navidrome.enable;
+        user = config.user.userName;
+        group = "users";
+        settings = {
+          Address = "0.0.0.0";
+          Port = config.server.media.navidrome.port;
+          MusicFolder = "/mnt/Data/Media/Music";
+          Agents = "lastfm";
+          AlbumPlayCountMode = "normalized";
+          EnableDownloads = true;
+          EnableFavourites = true;
+          EnableNowPlaying = true;
+          EnableStarRating = true;
+          EnableUserEditing = true;
+          LastFM.Enabled = true;
+          LastFM.Language = "en";
+          LastFM.ScrobbleFirstArtistOnly = false;
+          ListenBrainz.Enabled = true;
+          Scanner.Enabled = true;
+          Scanner.Schedule = "1h";
+          Subsonic.ArtistParticipations = true;
+        };
+      };
+      nginx = {
+        virtualHosts = {
+          "${config.server.media.navidrome.subdomain}.${config.networking.domain}" =
+            if config.server.media.navidrome.public then
+              {
+                enableACME = true;
+                forceSSL = true;
+                locations."/" = {
+                  proxyPass = "http://127.0.0.1:${toString config.server.media.navidrome.port}";
+                };
+              }
+            else
+              { };
+        };
+      };
+    };
+  };
+}

modules/server/misc/lauti.nix

@@ -21,29 +21,32 @@
     };
   };
   config = {
-
     services = {
-      eintopf = {
+      lauti = {
         enable = config.server.misc.lauti.enable;
         settings = {
-          LAUTI_ADMIN_EMAIL = "test@example.org";
+          LAUTI_ADMIN_EMAIL = "lauti@${config.networking.domain}";
-          LAUTI_BASE_URL = "https://freising.space";
+          LAUTI_BASE_URL = "https://${config.server.misc.lauti.subdomain}.${config.networking.domain}";
-          LAUTI_OSM_TILE_CACHE_DIR = "/var/lib/eintopf/osm";
+          LAUTI_OSM_TILE_CACHE_DIR = "/var/lib/lauti/osm";
           LAUTI_OSM_TILE_SERVER = "https://tile.openstreetmap.org/{z}/{x}/{y}.png";
           LAUTI_TIMEZONE = "Europe/Berlin";
-          LAUTI_LANGUAGE = "en";
+          LAUTI_LANGUAGE = config.console.keyMap;
         };
-        secrets = [ /etc/lauti-secrets ];
+        secrets = [ /home/${config.user.userName}/secrets/lauti ];
       };
       nginx = {
         virtualHosts = {
-          ${"freising.space"} = {
+          "${config.server.misc.lauti.subdomain}.${config.networking.domain}" =
+            if config.server.misc.lauti.public then
+              {
                 enableACME = true;
                 forceSSL = true;
                 locations."/" = {
-              proxyPass = "http://127.0.0.1:3333";
+                  proxyPass = "http://127.0.0.1:${toString config.server.misc.lauti.port}";
-            };
                 };
+              }
+            else
+              { };
         };
       };
     };

modules/server/social/synapse.nix

@@ -57,6 +57,7 @@ in
               media_store_path = "/mnt/Data/Matrix/Media";
               max_upload_size = "10G";
               enable_registration = false;
+              registration_shared_secret = "";
               generic = {
                 enabled = true;
                 outbound = true;

modules/system/networking.nix

@@ -1,8 +1,21 @@
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
+  options = {
+    system.hostname = lib.mkOption {
+      default = "${config.user.userName}-device";
+      description = "hostname";
+    };
+  };
+  config = {
     networking = {
       domain = "marty.tf";
+      hostName = config.system.hostname;
       networkmanager.enable = true;
       firewall = {
         enable = true;
@@ -42,4 +55,8 @@
     environment.systemPackages = with pkgs; [
       oniux
     ];
+  };
+  environment.systemPackages = with pkgs; [
+    oniux
+  ];
 }