diff --git a/flake.lock b/flake.lock index 7e20c43..4533c3a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1708573384, - "narHash": "sha256-l4MSfNXfPdY1hPtKwsAvqMuIhnjDqgmE2Bq6J8h5wyw=", + "lastModified": 1708575290, + "narHash": "sha256-x27Tmy+TARiOSkhuessMaYhRj2iwl+zaBt2dimhePK0=", "ref": "refs/heads/master", - "rev": "4d7f82fe9b5d7d3881455577f7477049d1db130c", - "revCount": 81, + "rev": "4d9fc841112c267e1a17c1812ad13753618e7eb4", + "revCount": 82, "type": "git", "url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git" }, @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1708305517, - "narHash": "sha256-WYnEspeTTksC21obnnxWOGOAQbnBD0GES0S0XOLsJjs=", + "lastModified": 1708910350, + "narHash": "sha256-cTuJVlOm05aQFIgGuYikgkrI61P2vTO2OfXwIRWEzUg=", "owner": "nix-community", "repo": "disko", - "rev": "1ae1f57dad13595600dd57b6a55fcbaef6673804", + "rev": "a13f36255cf4ce99cc4236a34251c2e7106e101d", "type": "github" }, "original": { @@ -137,11 +137,11 @@ }, "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": { @@ -158,11 +158,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708348106, - "narHash": "sha256-CWmdEWqzPYYGqPJcrGJHMTXo+b4oMp/QGzKGKnvwDB0=", + "lastModified": 1709171350, + "narHash": "sha256-k4oKXdZHPVgGeH4cu3mfzYw7FUDjpkrcKCSS4oRfI9w=", "owner": "helix-editor", "repo": "helix", - "rev": "cdef4f8a701f921c29fdfe66f104a2edac7fe05c", + "rev": "e51a1e4e2ae99b8e1ad751e7dfa024a7d0e4ba8f", "type": "github" }, "original": { @@ -179,11 +179,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": { @@ -227,16 +227,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1709169684, + "narHash": "sha256-YV5OIxSYU+PcQMmqvAVQNCDEKka7tPwLmSCqOUOqnPA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "c6caed479a521fd96b847d287c3fbdc611ffdca3", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -329,11 +329,11 @@ ] }, "locked": { - "lastModified": 1708225343, - "narHash": "sha256-Q0uVUOfumc1DcKsIJIfMCHph08MjkOvZxvPb/Vi8hWw=", + "lastModified": 1708987867, + "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ffed177a9d2c685901781c3c6c9024ae0ffc252b", + "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ca314a1..251c39d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/master"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/home-manager/linux-desktop.nix b/modules/home-manager/linux-desktop.nix index ef07bed..b24708a 100644 --- a/modules/home-manager/linux-desktop.nix +++ b/modules/home-manager/linux-desktop.nix @@ -26,7 +26,7 @@ home.pointerCursor = { name = "Bibata-Modern-Classic"; package = pkgs.bibata-cursors; - size = 64; # TODO: this doesn't seem to work -- at least in Sway + size = 40; # TODO: this doesn't seem to work -- at least in Sway # some icons are also missing (hand2?) }; } diff --git a/modules/nixos/kde-plasma.nix b/modules/nixos/kde-plasma.nix index 0369f0a..787b55e 100644 --- a/modules/nixos/kde-plasma.nix +++ b/modules/nixos/kde-plasma.nix @@ -7,11 +7,11 @@ # qt.platformTheme = "gnome"; - services.xserver.displayManager.defaultSession = "plasmawayland"; + services.xserver.displayManager.defaultSession = "plasma"; services.xserver.enable = lib.mkDefault true; services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + services.xserver.desktopManager.plasma6.enable = true; hardware.pulseaudio.enable = false; diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix index 0cc50d9..2ce15f7 100644 --- a/nixos/foxtrot.nix +++ b/nixos/foxtrot.nix @@ -1,4 +1,5 @@ { + lib, inputs, outputs, pkgs, @@ -53,8 +54,13 @@ in { home = { stateVersion = "24.05"; + pointerCursor = { + size = 40; + }; }; + services.mako.enable = lib.mkForce false; # don't use mako when using plasma + wayland.windowManager.hyprland = { settings = { # See https://wiki.hyprland.org/Configuring/Keywords/ for more