chore: update flake

flake.nix

@@ -65,6 +65,11 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
+    titrack = {
+      url = "github:Daholli/TiTrack";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
     ###
     # hyprland stuff
     hyprland = {
@@ -95,12 +100,17 @@
     };
 
     dankMaterialShell = {
-      url = "github:AvengeMedia/DankMaterialShell/v1.2.3";
+      url = "github:AvengeMedia/DankMaterialShell";
       inputs = {
         nixpkgs.follows = "nixpkgs-unstable";
       };
     };
 
+    danksearch = {
+      url = "github:AvengeMedia/danksearch";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     dgop = {
       url = "github:AvengeMedia/dgop";
       inputs.nixpkgs.follows = "nixpkgs-unstable";

modules/desktop/addons/dms/default.nix

@@ -11,6 +11,7 @@
       imports = [
         inputs.dankMaterialShell.homeModules.dank-material-shell
         inputs.dankMaterialShell.homeModules.niri
+        inputs.danksearch.homeModules.dsearch
       ];
 
       config = lib.mkIf osConfig.programs.niri.enable {
@@ -40,6 +41,8 @@
           enableAudioWavelength = false;
           enableCalendarEvents = false;
         };
+
+        programs.dsearch.enable = true;
       };
     };
 }

modules/desktop/addons/dms/settings.json

@@ -9,12 +9,15 @@
     }
   },
   "matugenScheme": "scheme-tonal-spot",
+  "matugenContrast": 0,
   "runUserMatugenTemplates": true,
   "matugenTargetMonitor": "",
   "popupTransparency": 1,
   "dockTransparency": 1,
   "widgetBackgroundColor": "sch",
   "widgetColorMode": "default",
+  "controlCenterTileColorMode": "primary",
+  "buttonColorMode": "primary",
   "cornerRadius": 12,
   "niriLayoutGapsOverride": -1,
   "niriLayoutRadiusOverride": -1,
@@ -25,12 +28,35 @@
   "mangoLayoutGapsOverride": -1,
   "mangoLayoutRadiusOverride": -1,
   "mangoLayoutBorderSize": -1,
+  "firstDayOfWeek": -1,
+  "showWeekNumber": true,
   "use24HourClock": true,
   "showSeconds": false,
+  "padHours12Hour": false,
   "useFahrenheit": false,
+  "windSpeedUnit": "kmh",
   "nightModeEnabled": false,
   "animationSpeed": 1,
   "customAnimationDuration": 500,
+  "syncComponentAnimationSpeeds": true,
+  "popoutAnimationSpeed": 1,
+  "popoutCustomAnimationDuration": 150,
+  "modalAnimationSpeed": 1,
+  "modalCustomAnimationDuration": 150,
+  "enableRippleEffects": true,
+  "m3ElevationEnabled": true,
+  "m3ElevationIntensity": 12,
+  "m3ElevationOpacity": 30,
+  "m3ElevationColorMode": "default",
+  "m3ElevationLightDirection": "top",
+  "m3ElevationCustomColor": "#000000",
+  "modalElevationEnabled": true,
+  "popoutElevationEnabled": true,
+  "barElevationEnabled": true,
+  "blurEnabled": false,
+  "blurBorderColor": "outline",
+  "blurBorderCustomColor": "#ffffff",
+  "blurBorderOpacity": 1,
   "wallpaperFillMode": "Fill",
   "blurredWallpaperLayer": false,
   "blurWallpaperOnOverview": false,
@@ -115,13 +141,17 @@
   "showWorkspacePadding": false,
   "workspaceScrolling": false,
   "showWorkspaceApps": true,
+  "workspaceDragReorder": true,
   "maxWorkspaceIcons": 3,
+  "workspaceAppIconSizeOffset": 0,
   "groupWorkspaceApps": true,
   "workspaceFollowFocus": false,
   "showOccupiedWorkspacesOnly": true,
   "reverseScrolling": false,
   "dwlShowAllTags": false,
+  "workspaceActiveAppHighlightEnabled": false,
   "workspaceColorMode": "default",
+  "workspaceOccupiedColorMode": "none",
   "workspaceUnfocusedColorMode": "sc",
   "workspaceUrgentColorMode": "default",
   "workspaceFocusedBorderEnabled": false,
@@ -130,14 +160,26 @@
   "workspaceNameIcons": {},
   "waveProgressEnabled": true,
   "scrollTitleEnabled": true,
+  "mediaAdaptiveWidthEnabled": true,
   "audioVisualizerEnabled": true,
   "audioScrollMode": "volume",
+  "audioWheelScrollAmount": 5,
   "clockCompactMode": false,
   "focusedWindowCompactMode": false,
   "runningAppsCompactMode": true,
+  "barMaxVisibleApps": 0,
+  "barMaxVisibleRunningApps": 0,
+  "barShowOverflowBadge": true,
+  "appsDockHideIndicators": false,
+  "appsDockColorizeActive": false,
+  "appsDockActiveColorMode": "primary",
+  "appsDockEnlargeOnHover": false,
+  "appsDockEnlargePercentage": 125,
+  "appsDockIconSizePercentage": 100,
   "keyboardLayoutNameCompactMode": false,
   "runningAppsCurrentWorkspace": true,
   "runningAppsGroupByApp": false,
+  "runningAppsCurrentMonitor": false,
   "appIdSubstitutions": [
     {
       "pattern": "Spotify",
@@ -168,20 +210,43 @@
   "centeringMode": "index",
   "clockDateFormat": "yyyy-MM-dd",
   "lockDateFormat": "",
+  "greeterRememberLastSession": true,
+  "greeterRememberLastUser": true,
+  "greeterEnableFprint": false,
+  "greeterEnableU2f": false,
+  "greeterWallpaperPath": "/home/cholli/Pictures/horizon-zero-dawn-aloy.jpg",
+  "greeterUse24HourClock": true,
+  "greeterShowSeconds": false,
+  "greeterPadHours12Hour": false,
+  "greeterLockDateFormat": "",
+  "greeterFontFamily": "",
+  "greeterWallpaperFillMode": "",
   "mediaSize": 1,
   "appLauncherViewMode": "list",
   "spotlightModalViewMode": "list",
+  "browserPickerViewMode": "grid",
+  "browserUsageHistory": {},
+  "appPickerViewMode": "grid",
+  "filePickerUsageHistory": {},
   "sortAppsAlphabetically": false,
   "appLauncherGridColumns": 4,
   "spotlightCloseNiriOverview": true,
+  "rememberLastQuery": false,
+  "spotlightSectionViewModes": {},
+  "appDrawerSectionViewModes": {},
   "niriOverviewOverlayEnabled": true,
+  "dankLauncherV2Size": "compact",
+  "dankLauncherV2BorderEnabled": false,
+  "dankLauncherV2BorderThickness": 2,
+  "dankLauncherV2BorderColor": "primary",
+  "dankLauncherV2ShowFooter": true,
+  "dankLauncherV2UnloadOnClose": false,
   "useAutoLocation": false,
   "weatherEnabled": true,
   "networkPreference": "auto",
-  "vpnLastConnected": "",
   "iconTheme": "System Default",
   "cursorSettings": {
-    "theme": "System Default",
+    "theme": "catppuccin-mocha-lavender-cursors",
     "size": 24,
     "niri": {
       "hideWhenTyping": false,
@@ -215,6 +280,7 @@
   "notepadLastCustomTransparency": 0.7,
   "soundsEnabled": true,
   "useSystemSoundTheme": false,
+  "soundLogin": false,
   "soundNewNotification": false,
   "soundVolumeChanged": true,
   "soundPluggedIn": true,
@@ -246,7 +312,11 @@
   "gtkThemingEnabled": false,
   "qtThemingEnabled": false,
   "syncModeWithPortal": true,
-  "terminalsAlwaysDark": false,
+  "terminalsAlwaysDark": true,
+  "muxType": "tmux",
+  "muxUseCustomCommand": false,
+  "muxCustomCommand": "",
+  "muxSessionFilter": "",
   "runDmsMatugenTemplates": true,
   "matugenTemplateGtk": true,
   "matugenTemplateNiri": true,
@@ -268,9 +338,24 @@
   "matugenTemplateDgop": true,
   "matugenTemplateKcolorscheme": true,
   "matugenTemplateVscode": true,
+  "matugenTemplateEmacs": true,
+  "matugenTemplateZed": true,
+  "matugenTemplateNeovimSettings": {
+    "dark": {
+      "baseTheme": "github_dark",
+      "harmony": 0.5
+    },
+    "light": {
+      "baseTheme": "github_light",
+      "harmony": 0.5
+    }
+  },
+  "matugenTemplateNeovimSetBackground": true,
   "showDock": false,
   "dockAutoHide": false,
+  "dockSmartAutoHide": false,
   "dockGroupByApp": false,
+  "dockRestoreSpecialWorkspaceOnClick": false,
   "dockOpenOnOverview": false,
   "dockPosition": 1,
   "dockSpacing": 4,
@@ -283,7 +368,19 @@
   "dockBorderOpacity": 1,
   "dockBorderThickness": 1,
   "dockIsolateDisplays": false,
-  "notificationOverlayEnabled": false,
+  "dockLauncherEnabled": false,
+  "dockLauncherLogoMode": "apps",
+  "dockLauncherLogoCustomPath": "",
+  "dockLauncherLogoColorOverride": "",
+  "dockLauncherLogoSizeOffset": 0,
+  "dockLauncherLogoBrightness": 0.5,
+  "dockLauncherLogoContrast": 1,
+  "dockMaxVisibleApps": 0,
+  "dockMaxVisibleRunningApps": 0,
+  "dockShowOverflowBadge": true,
+  "notificationOverlayEnabled": true,
+  "notificationPopupShadowEnabled": true,
+  "notificationPopupPrivacyMode": false,
   "modalDarkenBackground": true,
   "lockScreenShowPowerActions": true,
   "lockScreenShowSystemIcons": true,
@@ -291,27 +388,40 @@
   "lockScreenShowDate": true,
   "lockScreenShowProfileImage": true,
   "lockScreenShowPasswordField": true,
+  "lockScreenShowMediaPlayer": true,
+  "lockScreenPowerOffMonitorsOnLock": false,
+  "lockAtStartup": false,
   "enableFprint": false,
   "maxFprintTries": 15,
+  "enableU2f": false,
+  "u2fMode": "or",
   "lockScreenActiveMonitor": "all",
   "lockScreenInactiveColor": "#000000",
   "lockScreenNotificationMode": 0,
+  "lockScreenVideoEnabled": false,
+  "lockScreenVideoPath": "",
+  "lockScreenVideoCycling": false,
   "hideBrightnessSlider": false,
   "notificationTimeoutLow": 5000,
   "notificationTimeoutNormal": 5000,
   "notificationTimeoutCritical": 0,
   "notificationCompactMode": false,
   "notificationPopupPosition": 0,
+  "notificationAnimationSpeed": 1,
+  "notificationCustomAnimationDuration": 400,
   "notificationHistoryEnabled": true,
   "notificationHistoryMaxCount": 50,
   "notificationHistoryMaxAgeDays": 7,
   "notificationHistorySaveLow": true,
   "notificationHistorySaveNormal": true,
   "notificationHistorySaveCritical": true,
-  "osdAlwaysShowValue": false,
+  "notificationRules": [],
+  "notificationFocusedMonitor": false,
+  "osdAlwaysShowValue": true,
   "osdPosition": 5,
   "osdVolumeEnabled": true,
   "osdMediaVolumeEnabled": true,
+  "osdMediaPlaybackEnabled": false,
   "osdBrightnessEnabled": true,
   "osdIdleInhibitorEnabled": true,
   "osdMicMuteEnabled": true,
@@ -385,6 +495,11 @@
   },
   "niriOutputSettings": {},
   "hyprlandOutputSettings": {},
+  "displayProfiles": {},
+  "activeDisplayProfile": {},
+  "displayProfileAutoSelect": false,
+  "displayShowDisconnected": false,
+  "displaySnapToEdge": true,
   "barConfigs": [
     {
       "id": "default",
@@ -549,5 +664,8 @@
       "trigger": "?"
     }
   },
+  "clipboardEnterToPaste": false,
+  "launcherPluginVisibility": {},
+  "launcherPluginOrder": [],
   "configVersion": 5
 }

modules/desktop/default.nix

@@ -13,22 +13,25 @@
       in
 
       {
-        security.pam.services.gdm.enableGnomeKeyring = true;
-        services.displayManager.gdm = {
-          enable = true;
-          wayland = true;
-        };
-
         environment = {
           systemPackages = with pkgs; [
             zenbrowser
 
             sourcegit
+
+            (pkgs.catppuccin-kvantum.override {
+              accent = "lavender";
+              variant = "mocha";
+            })
+            pkgs.adwaita-icon-theme
           ];
 
           sessionVariables = {
             DEFAULT_BROWSER = "${zenbrowser}/bin/zen-beta";
             BROWSER = "zen-beta";
+
+            QT_QPA_PLATFORMTHEME = "kvantum";
+            QS_ICON_THEME = "adwaita";
           };
 
           etc = lib.mkIf config.programs._1password.enable {
@@ -57,11 +60,19 @@
         #   };
         # };
 
-        # qt = {
-        #   enable = true;
-        #   platformTheme.name = "gnome";
-        #   style.name = "adwaita-dark";
-        # };
+        qt = {
+          enable = true;
+          platformTheme = "qtct";
+          style = {
+            package = (
+              pkgs.catppuccin-kvantum.override {
+                accent = "lavender";
+                variant = "mocha";
+              }
+            );
+            name = "kvantum";
+          };
+        };
 
         systemd.user.sessionVariables = osConfig.home-manager.users.cholli.home.sessionVariables;
 

modules/desktop/niri.nix

@@ -3,11 +3,32 @@
     nixos.niri =
       { inputs, pkgs, ... }:
       {
+        imports = [
+          inputs.dankMaterialShell.nixosModules.greeter
+        ];
+
         programs.niri = {
           enable = true;
           package = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable;
         };
 
+        programs.dank-material-shell = {
+          greeter = {
+            enable = true;
+            compositor.name = "niri";
+
+            configHome = "/home/cholli";
+          };
+        };
+
+        security = {
+          pam = {
+            services.greetd.enableGnomeKeyring = true;
+          };
+        };
+
+        services.accounts-daemon.enable = true;
+
         environment.systemPackages = with pkgs; [
           kitty
 
@@ -220,6 +241,15 @@
                 open-on-output = "DP-1";
 
               }
+              {
+                matches = [
+                  {
+                    app-id = "zen-beta";
+                  }
+                ];
+
+                open-on-workspace = "01-zen";
+              }
               {
                 matches = [
                   {
@@ -233,7 +263,9 @@
               {
                 matches = [
                   {
-                    app-id = "obsidian";
+                    app-id = "electron";
+                    title = "Obsidian";
+                    at-startup = true;
                   }
                   {
                     app-id = "teams-for-linux";
@@ -258,13 +290,14 @@
                 open-on-workspace = "02-games";
                 default-column-width.proportion = 1.0;
                 default-window-height.proportion = 1.0;
-                min-width = 3440;
-                min-height = 1440;
               }
               {
                 matches = [
                   {
-                    app-id = "discord";
+                    app-id = "Element";
+                  }
+                  {
+                    app-id = "vesktop";
                   }
                   {
                     app-id = "steam";
@@ -293,7 +326,10 @@
                     app-id = "1Password";
                   }
                   {
-                    app-id = "discord";
+                    app-id = "vesktop";
+                  }
+                  {
+                    app-id = "Element";
                   }
                   {
                     app-id = "steam";
@@ -415,6 +451,7 @@
                   "Mod+R".action = actions.switch-preset-column-width;
                   "Mod+Shift+R".action = actions.switch-preset-window-height;
                   "Mod+Ctrl+R".action = actions.reset-window-height;
+                  "Mod+G".action = actions.toggle-window-floating;
                   "Mod+F".action = actions.maximize-column;
                   "Mod+Shift+F".action = actions.fullscreen-window;
                   "Mod+Ctrl+F".action = actions.expand-column-to-available-width;
@@ -436,7 +473,8 @@
             spawn-at-startup = [
               { argv = [ "zen-beta" ]; }
               { argv = [ "obsidian" ]; }
-              { argv = [ "discord" ]; }
+              { argv = [ "element-desktop" ]; }
+              { argv = [ "vesktop" ]; }
               { argv = [ "1password" ]; }
               { sh = "sleep 1 && steam"; }
             ];

modules/games/communication.nix

@@ -3,8 +3,9 @@
     { pkgs, ... }:
     {
       environment.systemPackages = with pkgs; [
-        discord
+        vesktop
         teamspeak6-client
+        element-desktop
       ];
 
       programs.obs-studio = {

modules/games/various-games.nix

@@ -2,6 +2,10 @@
   flake.modules.nixos.games =
     { inputs, pkgs, ... }:
     {
+      imports = [
+        inputs.titrack.nixosModules.default
+      ];
+
       environment.systemPackages = with pkgs; [
         prismlauncher
         starsector
@@ -10,5 +14,9 @@
         pyfa
         inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.rusty-path-of-building
       ];
+
+      services.titrack = {
+        enable = true;
+      };
     };
 }

modules/hosts/loptland/default.nix

@@ -31,7 +31,7 @@ topLevel: {
         forgejo-runner
 
         # game server
-        minecraft-server
+        # minecraft-server
         factorio-server
 
         # apps

modules/hosts/loptland/nginx.nix

@@ -59,6 +59,22 @@
             };
           };
 
+          "cholli.de" = {
+            forceSSL = true;
+            useACMEHost = "cholli.de";
+            globalRedirect = domainName;
+          };
+
+          "~^(?<subdomain>.+)\\.cholli\\.de$" = {
+            forceSSL = true;
+            useACMEHost = "cholli.de";
+            locations."/" = {
+              extraConfig = ''
+                return 301 https://$subdomain.${domainName}$request_uri;
+              '';
+            };
+          };
+
           "_" = {
             forceSSL = true;
             useACMEHost = domainName;

modules/hosts/yggdrasil/hardware.nix

@@ -44,7 +44,10 @@
           "usb_storage"
           "sd_mod"
         ];
-        kernelModules = [ "kvm-amd" ];
+        kernelModules = [
+          "kvm-amd"
+          "ntsync"
+        ];
 
       };
 

modules/server/acme.nix

@@ -54,6 +54,11 @@ topLevel: {
           dnsResolver = "1.1.1.1:53";
           extraDomainNames = [ "*.${domainname}" ];
         };
+
+        certs."cholli.de" = {
+          dnsResolver = "1.1.1.1:53";
+          extraDomainNames = [ "*.cholli.de" ];
+        };
       };
 
     };

modules/users/cholli/default.nix

@@ -58,6 +58,8 @@ topLevel: {
               "networkmanager"
               "sound"
               "tty"
+              "usb"
+              "systemd-journal"
               "wheel"
             ];
             shell = pkgs.fish;
@@ -68,6 +70,14 @@ topLevel: {
 
           nix.settings.trusted-users = [ topLevel.config.flake.meta.users.cholli.username ];
 
+          systemd.tmpfiles.rules =
+            let
+              username = "cholli";
+            in
+            [
+              "f+ /var/lib/AccountsService/users/${username}  0600 root root - [User]\\nIcon=/var/lib/AccountsService/icons/${username}\\n" # notice the "\\n" we don't want nix to insert a new line in our string, just pass it as \n to systemd
+              "L+ /var/lib/AccountsService/icons/${username}  - - - - ${./profile.png}"
+            ];
         };
 
       homeManager.cholli =