diff options
| -rw-r--r-- | darwinConfigurations/mairon/default.nix | 1 | ||||
| -rw-r--r-- | flake.lock | 72 | ||||
| -rw-r--r-- | modules/nixos/docker.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/firefox/default.nix | 12 | ||||
| -rw-r--r-- | modules/nixos/kde.nix | 6 | ||||
| -rw-r--r-- | modules/nixos/podman.nix | 2 | ||||
| -rw-r--r-- | nixosConfigurations/eonwe/default.nix | 4 |
7 files changed, 54 insertions, 45 deletions
diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix index c989699..d2c4067 100644 --- a/darwinConfigurations/mairon/default.nix +++ b/darwinConfigurations/mairon/default.nix @@ -28,6 +28,7 @@ with lib; { ]; casks = [ {name = "burp-suite";} + {name = "docker";} {name = "jetbrains-toolbox";} {name = "krita";} {name = "obs";} diff --git a/flake.lock b/flake.lock index 18da9ed..d4def94 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1707119614, - "narHash": "sha256-bwytZcm2PLKhTGWGqbJS2WTzQvHku0rHoHLQnDnLn/g=", + "lastModified": 1709114531, + "narHash": "sha256-ctZ6aPhmaDdxLF2L3uahrtgLMxD1Guj/dR5XkxvZRNg=", "owner": "pinpox", "repo": "alertmanager-ntfy", - "rev": "1c5d171b97bdb7334cc39e981cf4bd9942c26fae", + "rev": "9aa539bb4fccdc812e4cfc9098002a320a0ed698", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1708231718, - "narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=", + "lastModified": 1709112925, + "narHash": "sha256-5y8Dhw1HYdc+BWv+qQjJUIwc+ByoudtoGaHEcrXYlXw=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0e6857fa1d632637488666c08e7b02c08e3178f8", + "rev": "283d59778e6b8c41cac4bdeac5b2512d6de51150", "type": "github" }, "original": { @@ -199,11 +199,11 @@ ] }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1708294481, - "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", + "lastModified": 1708988456, + "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", + "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "impermanence": { "locked": { - "lastModified": 1706639736, - "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=", + "lastModified": 1708968331, + "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045", + "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", "type": "github" }, "original": { @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1708305364, - "narHash": "sha256-6m58olvOak9+2UgWfkV4ZWJRs+93eTepQd/cINtRSWE=", + "lastModified": 1709169244, + "narHash": "sha256-Vy0CagmMkeQINRxlTHfnskt6OPHZikiqK8R4qlkjskU=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "1a5a7a0b0aaada25c21481d63d75acd7ed52d904", + "rev": "7815be5abbf1dfc5ba9f2f7abe000aadf08b04a3", "type": "github" }, "original": { @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1708225687, - "narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=", + "lastModified": 1708830466, + "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127", + "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b", "type": "github" }, "original": { @@ -349,11 +349,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1708091350, - "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", + "lastModified": 1709147990, + "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", + "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "type": "github" }, "original": { @@ -364,11 +364,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708341091, - "narHash": "sha256-3R7doGV1AoB5VKFifEd5elj8t4cld6VpJRpn9NaYr1Y=", + "lastModified": 1709169036, + "narHash": "sha256-j+ywPKUS0JLpidNcz6vA0z1xI/rU5PcLV7pwZMce+Tw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "86ef6bd96b6279e1a4a53236d341f5df1ede3803", + "rev": "ec25c90d35d24e36c0af3b3d58a09542367ebbee", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1708366181, - "narHash": "sha256-YnsUXXxfZWQwpxlWuswDJnK8sLYY2I+qsro5f1qe9Uw=", + "lastModified": 1709195395, + "narHash": "sha256-n8gWV5FsXGJDoFvzJp/AjoQq2ICDmBLjySOyyHYrKIc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "abf7f7afff7d7835e8d8e334219d9cdfab533214", + "rev": "fdfe8b3a0cb581dc2ba28258cb56fd7c9217d9c2", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1708353490, - "narHash": "sha256-PAZZCyg5VK+PD4cpG2ueSLAjGTjUJiMMSUrRctM7CiY=", + "lastModified": 1709187865, + "narHash": "sha256-d0CGRTBc7ZxqpAf9MI2n3/zIJEWyl1L8NHtxIV8dNyI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f74663f3fbba3fc2134233b18d30e09038c76fa2", + "rev": "bc3c6abcbad87c2e1dd831b3febd6f31ff823488", "type": "github" }, "original": { @@ -531,11 +531,11 @@ ] }, "locked": { - "lastModified": 1708305444, - "narHash": "sha256-hCDR72rsHC3z2YvDywRgXLiPK8emn+jtl5fdoH30aeY=", + "lastModified": 1709169242, + "narHash": "sha256-yxKmbUdSYyvzyOA5FI3965fdzfQFXZkStOI+TGOMqDM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "35e0cabb16c66709d6c91eda8067d740492172d5", + "rev": "0865dd098cd9dc4fa80157d8b19f1c3a242de238", "type": "github" }, "original": { diff --git a/modules/nixos/docker.nix b/modules/nixos/docker.nix index 3b38ff1..0795386 100644 --- a/modules/nixos/docker.nix +++ b/modules/nixos/docker.nix @@ -13,7 +13,7 @@ in { config = mkIf cfg.enable { assertions = [ { - assertion = !config.nixfiles.modules.podman.enable; + assertion = cfg.enable -> !config.nixfiles.modules.podman.enable; message = "Pick only one!"; } ]; diff --git a/modules/nixos/firefox/default.nix b/modules/nixos/firefox/default.nix index 19bad24..ce8b3ee 100644 --- a/modules/nixos/firefox/default.nix +++ b/modules/nixos/firefox/default.nix @@ -536,13 +536,17 @@ in { }; "5000" = { enable = true; - "5003".enable = true; - "5017".enable = true; - "5019".enable = true; + "5003"."signon.rememberSignons".enable = true; + "5017" = { + "extensions.formautofill.addresses.enabled".enable = true; + "extensions.formautofill.creditCards.enabled".enable = true; + }; + "5019"."browser.pagethumbnails.capturing_disabled".enable = true; }; "5500" = { enable = true; - "5508".enable = true; + "5508"."media.eme.enabled".enable = true; + "5508"."browser.eme.ui.enabled".enable = true; }; "6000".enable = true; "7000".enable = true; diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix index adec490..58990f1 100644 --- a/modules/nixos/kde.nix +++ b/modules/nixos/kde.nix @@ -27,17 +27,17 @@ in { }; services.xserver = { - desktopManager.plasma5.enable = true; + desktopManager.plasma6.enable = true; displayManager.sddm.enable = true; }; environment = { systemPackages = with pkgs; [pinentry-qt]; - plasma5.excludePackages = with pkgs.plasma5Packages; [ + plasma6.excludePackages = with pkgs.kdePackages; [ elisa gwenview + kate khelpcenter - okular print-manager ]; }; diff --git a/modules/nixos/podman.nix b/modules/nixos/podman.nix index 60f208e..5e369a6 100644 --- a/modules/nixos/podman.nix +++ b/modules/nixos/podman.nix @@ -13,7 +13,7 @@ in { config = mkIf cfg.enable { assertions = [ { - assertion = !config.nixfiles.modules.docker.enable; + assertion = cfg.enable -> !config.nixfiles.modules.docker.enable; message = "Pick only one!"; } ]; diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix index e0ae7d6..002d150 100644 --- a/nixosConfigurations/eonwe/default.nix +++ b/nixosConfigurations/eonwe/default.nix @@ -5,6 +5,10 @@ ... }: with lib; { + imports = [ + ./hidden.nix + ]; + nixfiles.modules = { ark.enable = true; |