diff --git a/flake.lock b/flake.lock
index d2b963b..524a1e3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -26,11 +26,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1743801669,
- "narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=",
+ "lastModified": 1744793570,
+ "narHash": "sha256-BzulTVLpbapBxsJ1b1ZNPSg94YIbgs/75fNyiv2uWNg=",
"owner": "catppuccin",
"repo": "nix",
- "rev": "07beb389d69a52c4dd5895da9553463c3740a26a",
+ "rev": "192378974a131c402633bee18dc892b804a663e0",
"type": "github"
},
"original": {
@@ -122,11 +122,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1744337628,
- "narHash": "sha256-ghjocOkjH1pSMiyX7h6+gJmLsgcief/+D+Cbcum8HsI=",
+ "lastModified": 1744795771,
+ "narHash": "sha256-aXkUfupefUJWdAGwIOYsllP5lyFSSbRvHzCcEKWffHI=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "8aa1c071bbcb8a270bb841e4797a0d14528709d4",
+ "rev": "bb1a28197681dc640b89a9a9bec75cdcd7e8d6ec",
"type": "github"
},
"original": {
@@ -387,11 +387,11 @@
]
},
"locked": {
- "lastModified": 1744343724,
- "narHash": "sha256-DkiOZlkXbdf6f09pSulJPE0IaaJi1p7sqia/G2kqNKI=",
+ "lastModified": 1744812667,
+ "narHash": "sha256-2AJZwXMO82YGw6B/RRCPz8Wz2zSRCZIdjhdFuiw7Ymg=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "f1ffd097e717a8d1b441577b8d23f9d2c96e0657",
+ "rev": "5d48f3ded3b55ef32d5853c9022fb4df29b3fc45",
"type": "github"
},
"original": {
@@ -569,11 +569,11 @@
},
"nixosHardware": {
"locked": {
- "lastModified": 1743420942,
- "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
+ "lastModified": 1744633460,
+ "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
+ "rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
"type": "github"
},
"original": {
@@ -647,11 +647,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1744168086,
- "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=",
+ "lastModified": 1744440957,
+ "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73",
+ "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
"type": "github"
},
"original": {
@@ -679,11 +679,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1743583204,
- "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
+ "lastModified": 1744098102,
+ "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
+ "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
"type": "github"
},
"original": {
@@ -711,11 +711,11 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1744098102,
- "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+ "lastModified": 1744463964,
+ "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
+ "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github"
},
"original": {
@@ -742,11 +742,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1744098102,
- "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+ "lastModified": 1744463964,
+ "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
+ "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github"
},
"original": {
@@ -1009,11 +1009,11 @@
]
},
"locked": {
- "lastModified": 1743748085,
- "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
+ "lastModified": 1744707583,
+ "narHash": "sha256-IPFcShGro/UUp8BmwMBkq+6KscPlWQevZi9qqIwVUWg=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
+ "rev": "49d05555ccdd2592300099d6a657cc33571f4fe0",
"type": "github"
},
"original": {
diff --git a/hmModules/cura/default.nix b/hmModules/cura/default.nix
index 96a2f2c..a4999b8 100644
--- a/hmModules/cura/default.nix
+++ b/hmModules/cura/default.nix
@@ -1,31 +1,6 @@
{ pkgs, ... }:
{
home.packages = [
- (
- 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[@]}"
- ''
- )
+ pkgs.cura-appimage
];
}
diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl
index a7baef7..eecbd3b 100644
--- a/hmModules/niri/config.kdl
+++ b/hmModules/niri/config.kdl
@@ -335,6 +335,11 @@ 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 87197a3..7ed6ca8 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -19,7 +19,7 @@
in
builtins.getFlake "github:NixOS/nixpkgs/${rev}";
extraHmModules = [
- inputs.catppuccin.homeManagerModules.catppuccin
+ inputs.catppuccin.homeModules.catppuccin
];
vpn = {
ip = "10.100.0.5";
@@ -50,7 +50,7 @@
];
extraHmModules = [
"${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
- inputs.catppuccin.homeManagerModules.catppuccin
+ inputs.catppuccin.homeModules.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.homeManagerModules.catppuccin
+ inputs.catppuccin.homeModules.catppuccin
];
secrets = {
"picard-wireguard-private-key" = { };
@@ -131,10 +131,9 @@
inputs.catppuccin.nixosModules.catppuccin
];
extraHmModules = [
- inputs.impermanence.homeManagerModules.impermanence
"${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
inputs.vscode-server.nixosModules.home
- inputs.catppuccin.homeManagerModules.catppuccin
+ inputs.catppuccin.homeModules.catppuccin
];
secrets = {
"pike-wireguard-private-key" = { };
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index 03fbb85..58038d3 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 b41a811..83ae586 100644
--- a/hosts/pike/default.nix
+++ b/hosts/pike/default.nix
@@ -2,7 +2,6 @@
fleetModules,
lib,
config,
- pkgs,
...
}:
{
@@ -31,14 +30,12 @@
"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 f2fba3d..99cdc60 100644
--- a/modules/ccr/default.nix
+++ b/modules/ccr/default.nix
@@ -146,7 +146,7 @@ in
}
]
++ [
- (lib.mkIf cfg.impermanence.enable {
+ (lib.optionalAttrs cfg.impermanence.enable {
home.persistence."/persist/home/${cfg.username}" = {
inherit (cfg.impermanence) directories files;
allowOther = true;