diff --git a/flake.lock b/flake.lock index 32a5f5f..585f55c 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1716561646, - "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "lastModified": 1718371084, + "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", "owner": "ryantm", "repo": "agenix", - "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "rev": "3a56735779db467538fb2e577eda28a9daacaca6", "type": "github" }, "original": { @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1715703984, - "narHash": "sha256-0BZkMui6aCqswMCouvp0G90tAxDOxVnxTvG6TDZsDaI=", + "lastModified": 1718921313, + "narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=", "owner": "Aylur", "repo": "ags", - "rev": "11150225e62462bcd431d1e55185e810190a730a", + "rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1718178283, - "narHash": "sha256-Syt2bvPvzcdx+VQEXckhfLw96Q2yY++vw0wHQK1NkhQ=", + "lastModified": 1719592953, + "narHash": "sha256-pvWudX7LM7nFkutIxi5KCjv8RITAuiA547MtRZJ25LE=", "owner": "catppuccin", "repo": "nix", - "rev": "d34a94a17c6ec4a0c4e24b3e4336ea504d021f6d", + "rev": "63e0859743908a53e58b3ceeca06a145a45c4435", "type": "github" }, "original": { @@ -90,12 +90,12 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1718192721, - "narHash": "sha256-WZapX7ItutPs9Dxr8p4IAjmNNTmI5wNur4bBj6CONqw=", - "rev": "798d56d819cd7d46ba9202afe81040887ac868ef", - "revCount": 1192, + "lastModified": 1719505223, + "narHash": "sha256-7DGqcG5tespj/+5lYl7weWJwsvFjmFNcsWZaO9GDjP8=", + "rev": "71a44f1448c037dbd9ef5df4eaedeb699499c506", + "revCount": 1229, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1192%2Brev-798d56d819cd7d46ba9202afe81040887ac868ef/01900c57-3b10-76dd-8bca-f0bb0f4ec856/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1229%2Brev-71a44f1448c037dbd9ef5df4eaedeb699499c506/01905a81-fdb1-7aed-b87a-74b0c7e113f6/source.tar.gz" }, "original": { "type": "tarball", @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", "owner": "ipetkov", "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718151613, - "narHash": "sha256-1jWQBp8kdrSm72MdzDoEMMlf4QyYIivt8I9F9pFaOq0=", + "lastModified": 1719642638, + "narHash": "sha256-0YArMhhTohlfQFP1FAtbqd09ubzbNfU/S21kC8b8u50=", "owner": "helix-editor", "repo": "helix", - "rev": "9123d3fbb843d778d19569dfee48555584014ee8", + "rev": "c6dbb9c2708a3a224d1ff29758ea54003445ac72", "type": "github" }, "original": { @@ -454,11 +454,11 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1719588253, + "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", "type": "github" }, "original": { @@ -475,11 +475,11 @@ ] }, "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", + "lastModified": 1719438532, + "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", + "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1717181720, - "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -533,11 +533,11 @@ ] }, "locked": { - "lastModified": 1716309977, - "narHash": "sha256-4jDQIcMDSFOOMBxVTEiC6Ck1vdc0kAFvv+StxnnE59Q=", + "lastModified": 1719068457, + "narHash": "sha256-q2p1YzCg9Dq2jt+6+kjHec9lb6BjCbg5rnVP2Uc/840=", "owner": "hyprwm", "repo": "hypridle", - "rev": "cb169c4e06cec9b4349e3668427e729d22328a54", + "rev": "7c5747b7855d06b4a63a4f515625ab3229278298", "type": "github" }, "original": { @@ -557,11 +557,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718139749, - "narHash": "sha256-VcWBqYRI82PuyqD5jZrmSkvVKGq4Ax0iNO5HI0aFRV0=", + "lastModified": 1719613382, + "narHash": "sha256-7hyD99NjqNVsRb2MGgxbMfRcU4km06lb+EN1mGh1wWo=", "ref": "refs/heads/main", - "rev": "8412ffcc42012888757cd00a004871e8bc353cf2", - "revCount": 4805, + "rev": "9c5dd59d4b1927b7d88e8e3c2e260eb01d95794b", + "revCount": 4895, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -580,11 +580,11 @@ ] }, "locked": { - "lastModified": 1716228712, - "narHash": "sha256-y+LOXuSRMfkR2Vfwl5K2NVrszi1h5MJpML+msLnVS8U=", + "lastModified": 1718476555, + "narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=", "owner": "hyprwm", "repo": "contrib", - "rev": "33b38358559054d316eb605ccb733980dfa7dc63", + "rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60", "type": "github" }, "original": { @@ -610,11 +610,11 @@ ] }, "locked": { - "lastModified": 1718111105, - "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=", + "lastModified": 1719318037, + "narHash": "sha256-TnlAcO5K2gkab0mpKurP5Co6eWRycP/KbFqWNS2rsMA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", + "rev": "3ae670253a5a3ae1e3a3104fb732a8c990a31487", "type": "github" }, "original": { @@ -637,11 +637,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -720,11 +720,11 @@ ] }, "locked": { - "lastModified": 1717881334, - "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "lastModified": 1719316102, + "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "type": "github" }, "original": { @@ -745,11 +745,11 @@ ] }, "locked": { - "lastModified": 1717784906, - "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1718081048, - "narHash": "sha256-dwKvamucNK8gB6RTTfnBeBbBgjARQgHQph8PdHZoL3s=", + "lastModified": 1719380852, + "narHash": "sha256-Li7zNOomyu0FVtm3TyyeUUCZex6L8QpGAJtiFQKGZGw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f27db3a9a8c21a65c1ef50cacca3ef2bfff04cb9", + "rev": "fd232b7d5d328619b21b867199b31ce799ae29f3", "type": "github" }, "original": { @@ -813,11 +813,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "lastModified": 1718782018, + "narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", "type": "github" }, "original": { @@ -855,11 +855,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1718068951, - "narHash": "sha256-wt9iAsStd4ghkkxKgByOnRfQ+9VRQoCc06nQ+VvsH/E=", + "lastModified": 1719623891, + "narHash": "sha256-vngpeaH1J7LXmnEva5ZQZRy8jq1RqyWCMHtRyQnI7aE=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "58f43669b808e4a2679ce0e5ff12665e7082cc85", + "rev": "290c76318713ee241cc47cd4c78d08b17cf65c8c", "type": "github" }, "original": { @@ -898,11 +898,11 @@ ] }, "locked": { - "lastModified": 1718011381, - "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", + "lastModified": 1719111455, + "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", + "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "type": "github" }, "original": { @@ -961,11 +961,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718811006, + "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "type": "github" }, "original": { @@ -977,11 +977,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -1009,11 +1009,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1717794163, - "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", + "lastModified": 1718541509, + "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755", + "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", "type": "github" }, "original": { @@ -1041,11 +1041,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1717774105, - "narHash": "sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI=", + "lastModified": 1718983919, + "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d226935fd75012939397c83f6c385e4d6d832288", + "rev": "90338afd6177fc683a04d934199d693708c85a3b", "type": "github" }, "original": { @@ -1057,11 +1057,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -1081,11 +1081,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -1186,11 +1186,11 @@ ] }, "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "lastModified": 1718504420, + "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", "type": "github" }, "original": { @@ -1342,11 +1342,11 @@ ] }, "locked": { - "lastModified": 1717918856, - "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "72907822c19afc0983c69d59d299204381623725", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 67982ab..718305c 100644 --- a/flake.nix +++ b/flake.nix @@ -76,7 +76,12 @@ }; # hyprwm - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + hyprland = { + type = "git"; + url = "https://github.com/hyprwm/Hyprland"; + submodules = true; + # rev = "fe7b748eb668136dd0558b7c8279bfcd7ab4d759"; + }; hypridle = { url = "github:hyprwm/hypridle"; diff --git a/home/default.nix b/home/default.nix index 02bffa0..b1bf1f2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -7,6 +7,7 @@ imports = [ ./specialisations.nix ./terminal + ./theme inputs.matugen.nixosModules.default inputs.nix-index-db.hmModules.nix-index self.nixosModules.theme diff --git a/home/programs/default.nix b/home/programs/default.nix index b3691c3..0082781 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -16,6 +16,5 @@ wineWowPackages.wayland ledger-live-desktop pinentry-gnome3 - zoom-us ]; } diff --git a/home/programs/games/default.nix b/home/programs/games/default.nix index e96f06e..56613cc 100644 --- a/home/programs/games/default.nix +++ b/home/programs/games/default.nix @@ -7,10 +7,8 @@ { home.packages = with pkgs; [ # inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin - #gamescope winetricks adwsteamgtk steam-run - # steamtinkerlaunch ]; } diff --git a/home/programs/gtk.nix b/home/programs/gtk.nix index b84cc76..c08a108 100644 --- a/home/programs/gtk.nix +++ b/home/programs/gtk.nix @@ -11,6 +11,8 @@ x11.enable = true; }; + catppuccin.pointerCursor.enable = false; + gtk = { enable = true; @@ -22,24 +24,15 @@ gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders.override { - flavor = "mocha"; + catppuccin = { + enable = true; + accent = "pink"; + flavor = "mocha"; + size = "compact"; + icon = { + enable = true; accent = "pink"; - }; - }; - - theme = { - name = - if config.theme.name == "light" - then "Catppuccin-Mocha-Compact-Pink" - else "Catppuccin-Mocha-Compact-Pink-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = ["pink"]; - size = "compact"; - # tweaks = [ "rimless" "black" ]; - variant = "mocha"; + flavor = "mocha"; }; }; }; diff --git a/home/programs/office/zathura.nix b/home/programs/office/zathura.nix index 6929e3d..fe2e558 100644 --- a/home/programs/office/zathura.nix +++ b/home/programs/office/zathura.nix @@ -5,39 +5,10 @@ }: { programs.zathura = { enable = true; - options = { - recolor-lightcolor = "rgba(0,0,0,0)"; - default-bg = "rgba(0,0,0,0.7)"; - font = "Inter 12"; - selection-notification = true; - - selection-clipboard = "clipboard"; - adjust-open = "best-fit"; - pages-per-row = "1"; - scroll-page-aware = "true"; - scroll-full-overlap = "0.01"; - scroll-step = "100"; - zoom-min = "10"; - }; - - extraConfig = - "include catppuccin-" - + ( - if config.theme.name == "light" - then "latte" - else "mocha" - ); - }; - - xdg.configFile = { - "zathura/catppuccin-latte".source = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-latte"; - hash = "sha256-KuJ4KG5vWP8v4J4eUQfW++XAriSVh15t0rwz9/xPZbk="; - }; - "zathura/catppuccin-mocha".source = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-mocha"; - hash = "sha256-QZypNMfVlTzMRaQ286DDWL9dAvQZ8INkllzo8t0aHf4="; + catppuccin = { + enable = true; + flavor = "mocha"; }; }; } diff --git a/home/programs/wayland/hyprland/rules.nix b/home/programs/wayland/hyprland/rules.nix index 2cca800..476ab73 100644 --- a/home/programs/wayland/hyprland/rules.nix +++ b/home/programs/wayland/hyprland/rules.nix @@ -43,9 +43,7 @@ "immediate, class:.*" # Games - "workspace name:Gaming, float, center, stayfocused, class:gamescope" - "workspace name:Gaming, float, center, stayfocused, class:cs2" - "workspace name:Gaming, float, center, stayfocused, class:hearthstone" + "workspace name:Gaming, class:gamescope" # make Firefox PiP window floating and sticky "float, title:^(Picture-in-Picture)$" diff --git a/home/programs/wayland/hyprland/settings.nix b/home/programs/wayland/hyprland/settings.nix index e54a757..fef807b 100644 --- a/home/programs/wayland/hyprland/settings.nix +++ b/home/programs/wayland/hyprland/settings.nix @@ -106,7 +106,9 @@ in { use_nearest_neighbor = false; }; - debug.disable_logs = true; + debug = { + disable_logs = true; + }; }; wayland.windowManager.hyprland.extraConfig = '' diff --git a/home/services/wayland/mako.nix b/home/services/wayland/mako.nix index 075a78f..8d38dbe 100644 --- a/home/services/wayland/mako.nix +++ b/home/services/wayland/mako.nix @@ -11,14 +11,11 @@ anchor = "top-center"; defaultTimeout = 3000; - backgroundColor = "#1e1e2e"; - textColor = "#cdd6f4"; - borderColor = "#f5c2e7"; - progressColor = "over #313244"; - extraConfig = '' - [urgency=high] - border-color=#fab387 - ''; + catppuccin = { + enable = true; + flavor = "mocha"; + }; + borderRadius = 16; }; } diff --git a/home/terminal/programs/bat.nix b/home/terminal/programs/bat.nix index d138afd..94391f0 100644 --- a/home/terminal/programs/bat.nix +++ b/home/terminal/programs/bat.nix @@ -12,24 +12,11 @@ in { enable = true; config = { pager = "less -FR"; - theme = "Catppuccin-${variant}"; }; - themes = let - src = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "bat"; - rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; - hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; - }; - in { - Catppuccin-mocha = { - inherit src; - file = "Catppuccin-mocha.tmTheme"; - }; - Catppuccin-latte = { - inherit src; - file = "Catppuccin-latte.tmTheme"; - }; + + catppuccin = { + enable = true; + flavor = "mocha"; }; }; diff --git a/home/terminal/programs/btop.nix b/home/terminal/programs/btop.nix index 1eeced2..ccd05fa 100644 --- a/home/terminal/programs/btop.nix +++ b/home/terminal/programs/btop.nix @@ -10,17 +10,9 @@ in { programs.btop = { enable = true; - settings.color_theme = "catppuccin_${variant}"; - }; - - xdg.configFile = { - "btop/themes/catppuccin_latte.theme".source = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/catppuccin/btop/7109eac2884e9ca1dae431c0d7b8bc2a7ce54e54/themes/catppuccin_latte.theme"; - hash = "sha256-Dp/4A4USHAri+QgIM/dJFQyLSR6KlWtMc7aYlFgmHr0="; - }; - "btop/themes/catppuccin_mocha.theme".source = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/catppuccin/btop/7109eac2884e9ca1dae431c0d7b8bc2a7ce54e54/themes/catppuccin_mocha.theme"; - hash = "sha256-KnXUnp2sAolP7XOpNhX2g8m26josrqfTycPIBifS90Y="; + catppuccin = { + enable = true; + flavor = variant; }; }; } diff --git a/home/theme/catppuccin.nix b/home/theme/catppuccin.nix new file mode 100644 index 0000000..927f2aa --- /dev/null +++ b/home/theme/catppuccin.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + catppuccin = { + enable = true; + accent = "pink"; + flavor = "mocha"; + }; +} diff --git a/home/theme/default.nix b/home/theme/default.nix new file mode 100644 index 0000000..fc1193a --- /dev/null +++ b/home/theme/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./catppuccin.nix + ]; +} diff --git a/system/core/default.nix b/system/core/default.nix index 72e9adf..6a5e25c 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -21,7 +21,12 @@ # don't touch this system.stateVersion = lib.mkDefault "23.11"; - time.timeZone = lib.mkDefault "Europe/Ljubljana"; + time = { + timeZone = lib.mkDefault "Europe/Ljubljana"; + + # Windows dual-boot time fix + hardwareClockInLocalTime = true; + }; # compresses half the ram for use as swap zramSwap.enable = false; diff --git a/system/hardware/opengl.nix b/system/hardware/opengl.nix index 5647894..9f508a8 100644 --- a/system/hardware/opengl.nix +++ b/system/hardware/opengl.nix @@ -1,8 +1,7 @@ {pkgs, ...}: { # graphics drivers / HW accel - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; extraPackages = with pkgs; [ libva diff --git a/system/nix/nh.nix b/system/nix/nh.nix index 727bb19..45e2f45 100644 --- a/system/nix/nh.nix +++ b/system/nix/nh.nix @@ -1,10 +1,10 @@ {inputs, ...}: { programs.nh = { enable = true; - # weekly cleanup + # monthly cleanup clean = { enable = true; - extraArgs = "--keep-since 7d"; + extraArgs = "--keep-since 30d"; }; flake = "/home/amadejk/Documents/dotfiles"; }; diff --git a/system/programs/gaming/default.nix b/system/programs/gaming/default.nix index 1193fcd..64e9bf2 100644 --- a/system/programs/gaming/default.nix +++ b/system/programs/gaming/default.nix @@ -2,15 +2,14 @@ imports = [ ./steam.nix ./gamemode.nix + ./gamescope.nix ]; environment.systemPackages = with pkgs; [ mangohud bottles - gamescope ]; - # Downgrade gamescope nixpkgs.overlays = [ (final: prev: { gamescope = prev.gamescope.overrideAttrs (old: { diff --git a/system/programs/gaming/gamescope.nix b/system/programs/gaming/gamescope.nix new file mode 100644 index 0000000..832e9b3 --- /dev/null +++ b/system/programs/gaming/gamescope.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + programs.gamescope = { + enable = true; + args = [ + #"--backend sdl" + ]; + }; +} diff --git a/system/programs/gaming/steam.nix b/system/programs/gaming/steam.nix index 9626663..fd9e814 100644 --- a/system/programs/gaming/steam.nix +++ b/system/programs/gaming/steam.nix @@ -11,14 +11,12 @@ in { programs.steam = { enable = true; - extest.enable = false; + extest.enable = true; extraCompatPackages = with pkgs; [ proton-ge-bin ]; - gamescopeSession.enable = true; - # fix gamescope inside steam package = pkgs.steam.override { extraEnv = { @@ -64,8 +62,7 @@ in { }; hardware = { - # https://github.com/NixOS/nixpkgs/issues/47932#issuecomment-447508411 - opengl.driSupport32Bit = true; + graphics.enable32Bit = true; steam-hardware.enable = true; }; }