diff --git a/flake.lock b/flake.lock index 524a1e3..cda2224 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1744793570, - "narHash": "sha256-BzulTVLpbapBxsJ1b1ZNPSg94YIbgs/75fNyiv2uWNg=", + "lastModified": 1744447794, + "narHash": "sha256-z5uK5BDmFg0L/0EW2XYLGr39FbQeXyNVnIEhkZrG8+Q=", "owner": "catppuccin", "repo": "nix", - "rev": "192378974a131c402633bee18dc892b804a663e0", + "rev": "c44fe73ed8e5d5809eded7cc6156ca9c40044e42", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1744795771, - "narHash": "sha256-aXkUfupefUJWdAGwIOYsllP5lyFSSbRvHzCcEKWffHI=", + "lastModified": 1744710563, + "narHash": "sha256-bbYWW6VVeVM+kaJJzo6IkdIqplYpfdedEaLFC6bN8Bo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bb1a28197681dc640b89a9a9bec75cdcd7e8d6ec", + "rev": "cc39626b787d64e5df5364a529423d624543b6a6", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1744812667, - "narHash": "sha256-2AJZwXMO82YGw6B/RRCPz8Wz2zSRCZIdjhdFuiw7Ymg=", + "lastModified": 1744663884, + "narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d48f3ded3b55ef32d5853c9022fb4df29b3fc45", + "rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", "type": "github" }, "original": { diff --git a/hmModules/cura/default.nix b/hmModules/cura/default.nix index a4999b8..96a2f2c 100644 --- a/hmModules/cura/default.nix +++ b/hmModules/cura/default.nix @@ -1,6 +1,31 @@ { pkgs, ... }: { home.packages = [ - pkgs.cura-appimage + ( + let + cura5 = pkgs.appimageTools.wrapType2 rec { + pname = "cura5"; + version = "5.8.0"; + src = pkgs.fetchurl { + url = "https://github.com/Ultimaker/Cura/releases/download/${version}/UltiMaker-Cura-${version}-linux-X64.AppImage"; + hash = "sha256-EojVAe+o43W80ES5BY3QgGRTxztwS+B6kIOfJOtULOg="; + }; + }; + in + pkgs.writeScriptBin "cura" '' + #! ${pkgs.bash}/bin/bash + # AppImage version of Cura loses current working directory and treats all paths relateive to $HOME. + # So we convert each of the files passed as argument to an absolute path. + # This fixes use cases like `cd /path/to/my/files; cura mymodel.stl anothermodel.stl`. + args=() + for a in "$@"; do + if [ -e "$a" ]; then + a="$(realpath "$a")" + fi + args+=("$a") + done + QT_QPA_PLATFORM=xcb exec "${cura5}/bin/cura5" "''${args[@]}" + '' + ) ]; } diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl index eecbd3b..a7baef7 100644 --- a/hmModules/niri/config.kdl +++ b/hmModules/niri/config.kdl @@ -335,11 +335,6 @@ window-rule { open-focused true } -window-rule { - match title=r#"^Authentication Required"# - open-floating true - open-focused true -} diff --git a/hosts/default.nix b/hosts/default.nix index 7ed6ca8..87197a3 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -19,7 +19,7 @@ in builtins.getFlake "github:NixOS/nixpkgs/${rev}"; extraHmModules = [ - inputs.catppuccin.homeModules.catppuccin + inputs.catppuccin.homeManagerModules.catppuccin ]; vpn = { ip = "10.100.0.5"; @@ -50,7 +50,7 @@ ]; extraHmModules = [ "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix" - inputs.catppuccin.homeModules.catppuccin + inputs.catppuccin.homeManagerModules.catppuccin ]; secrets = { "kirk-wireguard-private-key" = { }; @@ -76,7 +76,7 @@ extraHmModules = [ "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix" inputs.vscode-server.nixosModules.home - inputs.catppuccin.homeModules.catppuccin + inputs.catppuccin.homeManagerModules.catppuccin ]; secrets = { "picard-wireguard-private-key" = { }; @@ -131,9 +131,10 @@ inputs.catppuccin.nixosModules.catppuccin ]; extraHmModules = [ + inputs.impermanence.homeManagerModules.impermanence "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix" inputs.vscode-server.nixosModules.home - inputs.catppuccin.homeModules.catppuccin + inputs.catppuccin.homeManagerModules.catppuccin ]; secrets = { "pike-wireguard-private-key" = { }; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 58038d3..03fbb85 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -40,7 +40,7 @@ "mount-sisko" "adb" "prometheus-exporters" - # "promtail" + "promtail" "zerotier" ] ++ [ ./disko.nix ]; diff --git a/hosts/pike/default.nix b/hosts/pike/default.nix index 83ae586..b41a811 100644 --- a/hosts/pike/default.nix +++ b/hosts/pike/default.nix @@ -2,6 +2,7 @@ fleetModules, lib, config, + pkgs, ... }: { @@ -30,12 +31,14 @@ "binfmt" "greetd" # "syncthing" + "hass-poweroff" + "forgejo-runners" "teamviewer" "sunshine" "mount-sisko" "adb" "prometheus-exporters" - # "promtail" + "promtail" "zerotier" ]; diff --git a/modules/ccr/default.nix b/modules/ccr/default.nix index 99cdc60..f2fba3d 100644 --- a/modules/ccr/default.nix +++ b/modules/ccr/default.nix @@ -146,7 +146,7 @@ in } ] ++ [ - (lib.optionalAttrs cfg.impermanence.enable { + (lib.mkIf cfg.impermanence.enable { home.persistence."/persist/home/${cfg.username}" = { inherit (cfg.impermanence) directories files; allowOther = true;