update

flake.lock

@@ -7,16 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1746171682,
-        "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
+        "lastModified": 1749154018,
+        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "50eee705bbdbac942074a8c120e8194185633675",
+        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -43,27 +43,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746557022,
-        "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
+        "lastModified": 1750400657,
+        "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
+        "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1746663147,
-        "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
+        "lastModified": 1750506804,
+        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
+        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746485181,
-        "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
+        "lastModified": 1750119275,
+        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
+        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,10 +2,10 @@
   description = "Nixos config flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    home-manager.url = "github:nix-community/home-manager/release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     sops-nix.url = "github:Mic92/sops-nix";
@@ -36,10 +36,11 @@
         allowUnfreePredicate = pkg:
           builtins.elem (nixpkgs.lib.getName pkg) [
             "discord"
-            "samsung-UnifiedLinuxDriver"
+            "samsung-unified-linux-driver"
             "steam"
             "steam-unwrapped"
             "stm32cubemx"
+            "obsidian"
           ];
       };
     };
@@ -48,7 +49,7 @@
       "MaxNixosLaptop" = nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = {
-          inherit inputs pkgs system;
+          inherit inputs system;
         };
         modules = [
           ./hosts/MaxNixosLaptop/configuration.nix
@@ -62,6 +63,27 @@
             ];
           }
           musnix.nixosModules.musnix
+          {
+            nixpkgs = {
+              overlays = [
+                # make unstable packages available via overlay
+                (final: prev: {
+                  unstable = nixpkgs-unstable.legacyPackages.${prev.system};
+                })
+              ];
+              config = {
+                allowUnfreePredicate = pkg:
+                  builtins.elem (nixpkgs.lib.getName pkg) [
+                    "discord"
+                    "samsung-unified-linux-driver"
+                    "steam"
+                    "steam-unwrapped"
+                    "stm32cubemx"
+                    "obsidian"
+                  ];
+              };
+            };
+          }
         ];
       };
       ServerIso = nixpkgs.lib.nixosSystem {

modules/home/programs/default.nix

@@ -46,7 +46,7 @@ in {
       freecad
       wine
       prusa-slicer
-      unstable.kicad
+      kicad
       element-desktop
       chromium
       wl-clipboard
@@ -55,6 +55,8 @@ in {
       ripgrep-all
       stm32cubemx
       flatpak
+      obsidian
+      marksman
     ];
   };
 }

modules/home/shell/neovim.nix

@@ -66,6 +66,8 @@ in {
         texliveMedium
         biber
         gcc
+        just-lsp
+        marksman
       ];
     };
 

modules/home/shell/nvim-lua/community.lua

@@ -6,6 +6,7 @@ return {
 	{ import = "astrocommunity.pack.docker" },
 	{ import = "astrocommunity.pack.html-css" },
 	{ import = "astrocommunity.pack.json" },
+	{ import = "astrocommunity.pack.just" },
 	{ import = "astrocommunity.pack.lua" },
 	{ import = "astrocommunity.pack.markdown" },
 	{ import = "astrocommunity.pack.nix" },

modules/home/shell/zsh.nix

@@ -44,7 +44,7 @@ in {
       };
       syntaxHighlighting.enable = true;
       syntaxHighlighting.highlighters = ["main" "brackets"];
-      initExtra = ''
+      initContent = ''
         # auto completion
         bindkey '^I' complete-word
         bindkey '^[[Z' autosuggest-accept

modules/home/sway/default.nix

@@ -69,7 +69,8 @@ in {
 
       # fonts
       noto-fonts
-      nerdfonts
+      nerd-fonts.fira-code
+      nerd-fonts.fira-mono
       fira
     ];
 
@@ -151,6 +152,7 @@ in {
             "${modifier}+2" = "workspace term";
             "${modifier}+3" = "workspace msg";
             "${modifier}+4" = "workspace music";
+            "${modifier}+o" = "workspace obsidian";
             "${modifier}+Shift+1" = "move container to workspace main";
             "${modifier}+Shift+2" = "move container to workspace term";
             "${modifier}+Shift+3" = "move container to workspace msg";
@@ -161,8 +163,8 @@ in {
             "${modifier}+Shift+Print" = ''exec ${pkgs.wf-recorder}/bin/wf-recorder -g "$(${pkgs.slurp}/bin/slurp)" -f "$HOME/Videos/screencapture_$(${pkgs.coreutils}/bin/date +%F-%T).mp4"'';
 
             # brightness
-            "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 5";
-            "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 5";
+            "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -T 0.9";
+            "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -T 1.1";
             # volume
             "XF86AudioRaiseVolume" = "exec '${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +1%'";
             "XF86AudioLowerVolume" = "exec '${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -1%'";
@@ -185,6 +187,7 @@ in {
             {app_id = "Element";}
           ];
           "music" = [{app_id = "org.rncbc.qpwgraph";}];
+          "obsidian" = [{app_id = "obsidian";} {class = "obsidian";}];
         };
         bars = [];
 
@@ -207,6 +210,7 @@ in {
             {command = "${pkgs.wezterm}/bin/wezterm start --class start-terminal";}
             {command = "${pkgs.networkmanagerapplet}/bin/nm-applet";}
             {command = "${pkgs.firefox}/bin/firefox";}
+            {command = "${pkgs.obsidian}/bin/obsidian";}
           ]
           ++ lib.optionals cfg.laptop [
             {command = "${pkgs.squeekboard}/bin/squeekboard";}
@@ -242,6 +246,10 @@ in {
             workspace = "5";
             output = ["DP-3" "DP-4" "DP-6" "HDMI-A-1" "eDP-1"];
           }
+          {
+            workspace = "obsidian";
+            output = ["eDP-1"];
+          }
         ];
 
         floating.criteria = [

modules/home/sway/kanshi.nix

@@ -274,8 +274,8 @@ in {
           profile.exec = [
             "${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to '\"ViewSonic Corporation VG2448 V5E201864188\"'"
             "${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to eDP-1"
-            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to '\"ViewSonic Corporation VG2448 V5E201864188\"'"
-            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to '\"ViewSonic Corporation VG2448 V5E201864188\"'"
+            "${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1"
+            "${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1"
             "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to '\"ViewSonic Corporation VG2448 V5E201864188\"'"
           ];
         }

modules/home/sway/mako.nix

@@ -12,18 +12,20 @@ in {
   config = lib.mkIf cfg.enable {
     services.mako = {
       enable = true;
+      settings = {
         actions = true;
         anchor = "top-right";
 
-      borderRadius = 10;
-      borderSize = 2;
+        border-radius = 10;
+        border-size = 2;
         height = 100;
         width = 400;
 
-      defaultTimeout = 10000; # ms
+        default-timeout = 10000; # ms
         font = "FiraCode Nerd Font 11";
         icons = true;
         markup = true;
       };
     };
+  };
 }

modules/home/sway/theme.nix

@@ -116,15 +116,14 @@ in {
     };
     xsession.enable = true;
 
-    services.mako = {
-      backgroundColor = "#313131";
-      borderColor = "#00FFEE";
-      progressColor = "#338833";
-      textColor = "#e0e0e0";
-      extraConfig = ''
-        [urgency=low]
-        border-color=#008877
-      '';
+    services.mako.settings = {
+      background-color = "#313131";
+      border-color = "#00FFEE";
+      progress-color = "#338833";
+      text-color = "#e0e0e0";
+      "urgency=low" = {
+        border-color = "#008877";
+      };
     };
   };
 }

modules/nixos/greetd.nix

@@ -44,8 +44,6 @@ in {
       extraGroups = [];
     };
 
-    services.greetd.enable = true;
-
     environment.etc."greetd/environments".text = ''
       sway
     '';

modules/nixos/nix.nix

@@ -5,6 +5,7 @@
       auto-optimise-store = true;
       max-jobs = "auto";
       cores = 12;
+      download-buffer-size = 524288000;
     };
   };
 }

secrets/rclone.yaml

@@ -1,16 +1,12 @@
 cloud:
     url: ENC[AES256_GCM,data:BoSdQrtLNKYpaHIWUj5Ak8PGMJz3hj/z88XVBgN6AbyT2K/bC412p3oi+X9MmYATR3A=,iv:wez+v5kEN+niZmZXzaJoygHf4mqKVI6CINktAZe8WTs=,tag:20W87Kcn94smiLtX9mMdOw==,type:str]
     user: ENC[AES256_GCM,data:kFza,iv:OrDNF/h+xLuuyq2cpaHnQuRM1lwuXhe8Ue0rm/wRmkY=,tag:9t+hEx38r/yBIzWIFD0GnQ==,type:str]
-    pass: ENC[AES256_GCM,data:Jp0Zpzw6NZzvE+N5cehvgW7nV5F1WQteZcPFB8FGZMyvX+uhVfUDvp8/UHU/2Vd/zT+A+NVp/EQDd8Wv,iv:O5rdJ+lgqXF+JqZc9yJVUM7Sy4yGRGLKGuFLxfD5Jpc=,tag:UT/AeIYQDqck2Y+wLTmNUw==,type:str]
+    pass: ENC[AES256_GCM,data:p3c8PeE54fjCIJlwDMLmE9gaYexjcXFa05xExJkKJJTNcLKVhMqQCZxeBZReTKxK18dMbTHd6eaFqPKH,iv:IC2MFF4Aj01a9iE5SVk+Os/0sX+8COsD9p8Jdh98VSs=,tag:e/Z9CjP/iXsnGWtD5jlJlQ==,type:str]
 luhbots:
     url: ENC[AES256_GCM,data:5hnCSyNcr3un83FaNGYaiZdbxCJe87+hzpoRtWozbn0OW31pxONIEQnSikXh59/OlVJN9TEmv+bd3uO210NPoKUL0D2MWw==,iv:fvY7fLbiAVGq0hh4ifs/LRgixlZsIDczw0hpiUvFSw0=,tag:gXNgNWMDXnRMdyhTjnG6oA==,type:str]
     user: ENC[AES256_GCM,data:ucJ21fRmDKvHtyA=,iv:IYfNwBBWYxVb7ptwhfBiBgXwaoj5oCWg6gCI3WD8sjE=,tag:sB6/PJuquUL/GugpfzNMRw==,type:str]
     pass: ENC[AES256_GCM,data:3gkyN51YvL/SrtP3kbG4OVhc5KBzu33dYVx4u8pJs9h3GJ9Wh1A5NCaBFJa7VFWfKuysNmr4CQwQEYBX,iv:U5foeasbN/TrrR0mA1mNcqYWZFXHYIAqXLmP/RvC+Os=,tag:x7ck7quJG7npMGwi/ss3ZA==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
     age:
         - recipient: age1d6ze98387f0gryqwvrdlcxgz3wgs607ach4duwmnp72dzaa63cxqchc78n
           enc: |
@@ -21,8 +17,7 @@ sops:
             cVV3dFpNbjY1bkZtUlltanpSNDlPd28KQ4FQrC6KyZEzzkmByh07q1RAGnWnCNtr
             XTDQhlbSq/LdptpqNbUD2g9H9vC2CAC0av39ExvT55JiK4dEWmrwUA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-04-14T10:40:29Z"
-    mac: ENC[AES256_GCM,data:PM6xAylhbEoG17McCCxT9k1cf0rIrORhndSAe8jqiwnezj2rRVkwTsCCWrf678GZpaBwdvYc1sauK0GRxLsk9qoMaeMh0knDMKOYjIxacrlJdYJkOZq8Ze1UWxyAd6PLtR9EQEsbJEnup+AcKGwvjJ5iySD8dWB2kcBnCVeaHdE=,iv:7DhkICFMJ4iRs1BHCGpZo8ZvJwpF5EolgP0egyMUyPY=,tag:SST1xwIwyOfLhfH5oasnjQ==,type:str]
-    pgp: []
+    lastmodified: "2025-06-12T07:55:51Z"
+    mac: ENC[AES256_GCM,data:WXOmWalZiENdsqVQqGfwXrt3OJ0HoMPNTHkk9C7oASv+wl1eX/7yryQ5GWgXe5GGqhBrtnKPIxKNDGABiXqA7zhR31Bp3Kctyztum8ygcv9+7rs2S+8Ya9LxC0/q/mhbsFOiu3UYw9icwig9rRXmx8I41VxaWGLbL/TLryFzWjI=,iv:ygdWjZespGdXVaMqdwbXIr1gD2SengMoAVHuUUswBEw=,tag:5DV6lEmIZvyzoj/JEh9sCw==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.9.4
+    version: 3.10.2