diff --git a/flake.lock b/flake.lock index 7b4be833..5b98215d 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1757513924, - "narHash": "sha256-XGgFzYiqmT1zR4Mh8m4Zo7jZF9tKkZ/zhc+o/lUckcI=", + "lastModified": 1758204241, + "narHash": "sha256-xKl3mXyML/NCWUYrZ9ww/fXfTWvGvNnXgDBrpDy/c2Y=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "1af76efcc8030080ceef792df1c468304c5050df", + "rev": "82745470e3fa50e1bdcc8f59745121aa29f1ac7a", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757320803, - "narHash": "sha256-7PUIQOMQSJLkNtV42SAYUDw0mRdbBNl6q8pLN8GViwM=", + "lastModified": 1758270360, + "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=", "owner": "catppuccin", "repo": "nix", - "rev": "d75e3fe67f49728cb5035bc791f4b9065ff3a2c9", + "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645", "type": "github" }, "original": { @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1757033802, - "narHash": "sha256-BLUHtWWoHFR6UJJJwkmivSv7RTjo92wlT0Y7kbCd2MY=", + "lastModified": 1757699119, + "narHash": "sha256-iOOoVdrkcyk95Xg68TuPeAwpz+v80mgZCqil0jpPZuY=", "owner": "DeterminateSystems", "repo": "determinate", - "rev": "e154f8433851f8f2509490f33680e3285d553df4", + "rev": "1e16c8f8a44573bb0648c76b6c98352436f5171e", "type": "github" }, "original": { @@ -167,37 +167,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-Dym4kTLMTxAxNyZcrHRKRVMBINQPA7qgr+7dHozNrps=", + "narHash": "sha256-q1tqDvmfjDgLk/wbYf4pRhyHDS94iY85Q79FPBtcv7g=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-eYVSpk+ly2YRSYvgT47ABmFRwG0DliNO/8ntBkoRmjI=", + "narHash": "sha256-E1vGfcQ5dqtRG9EDP6eOQWCnCIRB2XFkFBp2C4FgQ8c=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-ZvRoKG/v0WS2XrDgkV+/hq3ARGokGisyelncKwlefvk=", + "narHash": "sha256-GtxtkI0cOC2A30Xw6gCDTN7JxN1zJGh7/eIXr6AlTSA=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" } }, "dix": { @@ -211,12 +211,12 @@ "nixpkgs-regression": [] }, "locked": { - "lastModified": 1757029043, - "narHash": "sha256-/XtKs/hpYXJPeT3WppFVFZH1WvPDmeTt11hMWt/Bwas=", - "rev": "7143558a0989008c8e08cc27c3cb6a031f30b356", - "revCount": 22309, + "lastModified": 1757694985, + "narHash": "sha256-3Ia+y7Hbwnzcuf1hyuVnFtbnSR6ErQeFjemHdVxjCNE=", + "rev": "766f43aa6acb1b3578db488c19fbbedf04ed9f24", + "revCount": 22340, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.1/01991737-661d-7932-b7c9-d3a0499b4c3f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.2/01993ee9-f8e7-7b80-80df-ec0a20a32514/source.tar.gz" }, "original": { "type": "tarball", @@ -370,34 +370,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "zig": "zig", - "zon2nix": "zon2nix" - }, - "locked": { - "lastModified": 1757528268, - "narHash": "sha256-+modXb/AipwdYIierR6M8/iCX8SfIwIH/yyM/++ISms=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "5aac5a764b7058587489e728191fcc36f09c33e7", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -456,11 +428,11 @@ ] }, "locked": { - "lastModified": 1755723022, - "narHash": "sha256-464mc57zaWCfrHiJunUM+LKWPbDHbOv3XdUUU4Bg1wc=", + "lastModified": 1757610027, + "narHash": "sha256-EYc0BuEchmltffjrQaT3O8HDBWf4gaK9ejAkriFToTM=", "owner": "tailscale", "repo": "golink", - "rev": "b54cbbbb609ce8425193e7171a35af023cb5066d", + "rev": "e33c1c26e134a3f1ee61233d4108c4e7bb5530b5", "type": "github" }, "original": { @@ -493,11 +465,11 @@ }, "hardware": { "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -518,11 +490,11 @@ ] }, "locked": { - "lastModified": 1755233722, - "narHash": "sha256-AavrbMltJKcC2Fx0lfJoZfmy7g87ebXU0ddVenhajLA=", + "lastModified": 1758022363, + "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "99e03e72e3f7e13506f80ef9ebaedccb929d84d0", + "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", "type": "github" }, "original": { @@ -538,11 +510,11 @@ ] }, "locked": { - "lastModified": 1757529548, - "narHash": "sha256-If5AT3dPXH0BM+q+pwyZvtWLTmlqJmGW6IDZ2MqlGRU=", + "lastModified": 1758375677, + "narHash": "sha256-BLtD+6qWz7fQjPk2wpwyXQLGI0E30Ikgf2ppn2nVadI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e0154ae41614e32a443c43ee51eee9eed3ad9a48", + "rev": "edc7468e12be92e926847cb02418e649b02b59dd", "type": "github" }, "original": { @@ -727,11 +699,11 @@ ] }, "locked": { - "lastModified": 1757218147, - "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -768,11 +740,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { @@ -830,32 +802,19 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1755972213, - "narHash": "sha256-VYK7aDAv8H1enXn1ECRHmGbeY6RqLnNwUJkOwloIsko=", - "rev": "73e96df7cff5783f45e21342a75a1540c4eddce4", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre850642.73e96df7cff5/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 315532800, - "narHash": "sha256-PEuQKa11BPUDAEoMH4NDp7RsifVlhT+mPE0D7czYP7w=", - "rev": "ca77296380960cd497a765102eeb1356eb80fed0", + "narHash": "sha256-8r/4FEFTGoeVUP6sjnNvvDANaDmbXJnBflzNPYZPPLo=", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre856744.ca7729638096/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre863969.12bd230118a1/nixexprs.tar.xz" }, "original": { "type": "tarball", "url": "https://nixpkgs.dev/channel/nixpkgs-unstable" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1751984180, "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", @@ -883,7 +842,6 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-utils": "flake-utils", - "ghostty": "ghostty", "golink": "golink", "hardware": "hardware", "home-manager": "home-manager", @@ -893,7 +851,7 @@ "nix-index": "nix-index", "nix-index-database": "nix-index-database", "nix-search": "nix-search", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-lib": "nixpkgs-lib", "nixpkgs-stalwart-fix": "nixpkgs-stalwart-fix", "snowfall-lib": "snowfall-lib", @@ -1010,15 +968,15 @@ "indigo": "indigo", "inter-fonts-src": "inter-fonts-src", "lucide-src": "lucide-src", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1757495794, - "narHash": "sha256-8EAnVa4enfEVGNTDAioSI0Snhf3utto9ros9eemIf9w=", + "lastModified": 1758343819, + "narHash": "sha256-lXoRA/zM7V8f5SvSZMdPSMpZiFkFnx3RV0RfovQbqzg=", "ref": "refs/heads/master", - "rev": "005cd178e92c5bc20ee9f6e56338b3539152979a", - "revCount": 1347, + "rev": "796f739caf7df25436e0ac3a8880dca54d6238db", + "revCount": 1366, "type": "git", "url": "https://tangled.sh/@tangled.sh/core" }, @@ -1047,54 +1005,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty", - "flake-compat" - ], - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748261582, - "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "aafb1b093fb838f7a02613b719e85ec912914221", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zon2nix": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1757167408, - "narHash": "sha256-4XyJ6fmKd9wgJ7vHUQuULYy5ps2gUgkkDk/PrJb2OPY=", - "owner": "jcollie", - "repo": "zon2nix", - "rev": "dc78177e2ad28d5a407c9e783ee781bd559d7dd5", - "type": "github" - }, - "original": { - "owner": "jcollie", - "repo": "zon2nix", - "rev": "dc78177e2ad28d5a407c9e783ee781bd559d7dd5", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4e6e492a..013f7bbd 100644 --- a/flake.nix +++ b/flake.nix @@ -89,12 +89,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - ghostty = { - url = "github:ghostty-org/ghostty"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.flake-compat.follows = "flake-compat"; - }; golink = { url = "github:tailscale/golink"; inputs.systems.follows = "systems"; diff --git a/modules/home/programs/ghostty/default.nix b/modules/home/programs/ghostty/default.nix index 52f18b01..13568009 100644 --- a/modules/home/programs/ghostty/default.nix +++ b/modules/home/programs/ghostty/default.nix @@ -1,8 +1,6 @@ { lib, config, - inputs, - pkgs, ... }: let @@ -13,7 +11,6 @@ in config.catppuccin.ghostty.enable = cfg.enable; config.programs.ghostty = lib.mkIf cfg.enable { enable = true; - package = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default; enableFishIntegration = true; installBatSyntax = true; enableBashIntegration = true; diff --git a/modules/home/services/swayidle/default.nix b/modules/home/services/swayidle/default.nix index 6881b9ad..4faa0a18 100644 --- a/modules/home/services/swayidle/default.nix +++ b/modules/home/services/swayidle/default.nix @@ -14,7 +14,11 @@ in events = [ { event = "lock"; - command = "${pkgs.swaylock}/bin/swaylock -C ~/.config/swaylock/config"; + command = "lock"; + } + { + event = "before-sleep"; + command = lib.getExe pkgs.swaylock-effects; } { event = "after-resume"; @@ -23,8 +27,8 @@ in ]; timeouts = [ { - timeout = 180; - command = "${pkgs.swaylock}/bin/swaylock -C ~/.config/swaylock/config"; + timeout = 300; + command = lib.getExe pkgs.swaylock-effects; } ]; }; diff --git a/systems/x86_64-linux/zaphod/bootloader.nix b/systems/x86_64-linux/zaphod/bootloader.nix index fdc27402..105ff277 100644 --- a/systems/x86_64-linux/zaphod/bootloader.nix +++ b/systems/x86_64-linux/zaphod/bootloader.nix @@ -43,5 +43,7 @@ in efi.canTouchEfiVariables = true; }; plymouth.enable = true; + plymouth.font = "${pkgs.ibm-plex}/share/fonts/opentype/IBMPlexMono-Regular.otf"; }; + catppuccin.plymouth.enable = true; } diff --git a/systems/x86_64-linux/zaphod/misc.nix b/systems/x86_64-linux/zaphod/misc.nix index 2aa0c223..523f4e19 100644 --- a/systems/x86_64-linux/zaphod/misc.nix +++ b/systems/x86_64-linux/zaphod/misc.nix @@ -20,10 +20,10 @@ # systemd.tmpfiles.rules = ["L+ /lib64 - - - - /run/current-system/sw/lib64"]; virtualisation.virtualbox = { - host.enable = true; - host.enableExtensionPack = true; + host.enable = false; + host.enableExtensionPack = false; guest = { - enable = true; + enable = false; clipboard = true; seamless = false; dragAndDrop = true; diff --git a/systems/x86_64-linux/zaphod/packages.nix b/systems/x86_64-linux/zaphod/packages.nix index 2b4f9bee..1c24e81d 100644 --- a/systems/x86_64-linux/zaphod/packages.nix +++ b/systems/x86_64-linux/zaphod/packages.nix @@ -10,7 +10,6 @@ pkgs.file pkgs.gamescope pkgs.gnupg - pkgs.hibernate pkgs.goverlay pkgs.libappindicator pkgs.kdePackages.kdenlive diff --git a/systems/x86_64-linux/zaphod/services/greetd.nix b/systems/x86_64-linux/zaphod/services/greetd.nix deleted file mode 100644 index 450e2fc9..00000000 --- a/systems/x86_64-linux/zaphod/services/greetd.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd 'sway -c /home/thehedgehog/.config/sway/config'"; - user = "greeter"; - }; - }; - }; -} diff --git a/systems/x86_64-linux/zaphod/services/greeter.nix b/systems/x86_64-linux/zaphod/services/greeter.nix new file mode 100644 index 00000000..2c80e8da --- /dev/null +++ b/systems/x86_64-linux/zaphod/services/greeter.nix @@ -0,0 +1,10 @@ +{ + services.displayManager.ly = { + enable = true; + x11Support = false; + settings = { + clear_password = true; + hide_version_string = true; + }; + }; +} diff --git a/systems/x86_64-linux/zaphod/services/modules.nix b/systems/x86_64-linux/zaphod/services/modules.nix index 8471f005..a400380a 100644 --- a/systems/x86_64-linux/zaphod/services/modules.nix +++ b/systems/x86_64-linux/zaphod/services/modules.nix @@ -5,7 +5,7 @@ ./flatpak.nix ./fprintd.nix ./fwupd.nix - ./greetd.nix + ./greeter.nix ./kmscon.nix ./misc.nix ./packagekit.nix