diff --git a/flake.lock b/flake.lock index 29beafb..bb6cb3e 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765245541, - "narHash": "sha256-Q4KU8bvFL3tJb1sTAPFG6qvi0KP8HvAfLG7mGqdSQV8=", + "lastModified": 1764169039, + "narHash": "sha256-9DabwGlLz2mEOV7nw97HP6LLx1xv4RAHhnQSICbW+mE=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "f251969383969412b94a98c9378deaa114a76338", + "rev": "c4a5f08a6ff74624ac576525765b06c79d2077e3", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1764714051, - "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", + "lastModified": 1764370710, + "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a43bedcceced5c21ad36578ed823e6099af78214", + "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1765042799, - "narHash": "sha256-G7UJDUNcuHm1n2EuA+2iKPNISSWoUgqk85ktncJoelo=", + "lastModified": 1763546214, + "narHash": "sha256-vc9seqvw2ElF8jPetsCoCQ5lo9P3fmgiTle3HlOMezk=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "2e5c725be0a7da2c749a345e09f3df3b9ef8c209", + "rev": "76ccb66f8e4875671fd746fb6b50931454ab8cd8", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1765204341, - "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", + "lastModified": 1764847736, + "narHash": "sha256-FMYnfCH2TMNnTJvbc/mraZpRszIL7nc5YI6w/pWNyNs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "aacb796ccd42be1555196c20013b9b674b71df75", + "rev": "e3f8349d60d5daf58951b9ccd089fecb79ea5443", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1765326679, - "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", + "lastModified": 1764627417, + "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=", "owner": "nix-community", "repo": "disko", - "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", + "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1765435076, - "narHash": "sha256-nhxa4Axl3DFPnbpVxBt2PLnVQ3Ezj02xUk0WepbIYOc=", + "lastModified": 1764865815, + "narHash": "sha256-2AbdDDM9zINH8Jrv6WCRcqbPo63MZVKfcZ1Go3niZm0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2941caef802f703984412ad503af47d45f16513a", + "rev": "ee6f974aab6c923b460c869c0069b9ad67f07bde", "type": "github" }, "original": { @@ -410,24 +410,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1765495779, - "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -559,11 +541,11 @@ ] }, "locked": { - "lastModified": 1765404074, - "narHash": "sha256-+ZDU2d+vzWkEJiqprvV5PR26DVFN2vgddwG5SnPZcUM=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "2d6f58930fbcd82f6f9fd59fb6d13e37684ca529", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -779,11 +761,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1764788330, + "narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d", "type": "github" }, "original": { @@ -799,11 +781,11 @@ ] }, "locked": { - "lastModified": 1765337252, - "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", + "lastModified": 1764872372, + "narHash": "sha256-uZuXRz9CzeCHsRbc2MQvKomwoX6GcFC5BUMEk3ouSFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", + "rev": "05a56dbf24f195c62286e3273a2671d3b4904b00", "type": "github" }, "original": { @@ -907,11 +889,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1759490292, + "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", "type": "github" }, "original": { @@ -939,11 +921,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1765414245, - "narHash": "sha256-4ReuIaR6nPVdBTnn/26nwJR+gefbVd0NUJvmJRswM4c=", + "lastModified": 1764871577, + "narHash": "sha256-gjozSzaKmwHLZCLB8SSSMAp3i5FZVuWWlHb3AS0fcj0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9aa313402b1be3df2925076bb1292d03e68bb47f", + "rev": "279a07c2ce0c189625ad5dea0a17a07e345304fc", "type": "github" }, "original": { @@ -985,11 +967,11 @@ ] }, "locked": { - "lastModified": 1764812575, - "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", + "lastModified": 1764616927, + "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", + "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52", "type": "github" }, "original": { @@ -1068,11 +1050,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", "type": "github" }, "original": { @@ -1093,11 +1075,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1765358139, - "narHash": "sha256-1hIq5gSfV0xc7gaBQDVk3XPv47vjhlc8qbAskOqT4b0=", + "lastModified": 1761675634, + "narHash": "sha256-Et1jNDB2d3e0b4okIKuyAMktECS+5hk+vMAA7X598ao=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "e2da7c6b1fceee9358229a3b5ca48127cd2c427c", + "rev": "98b86752fe4867bd14ef96a92ea788229af93130", "type": "github" }, "original": { @@ -1170,11 +1152,11 @@ ] }, "locked": { - "lastModified": 1764962281, - "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", + "lastModified": 1764637132, + "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", + "rev": "2f2413801beee37303913fc3c964bbe92252a963", "type": "github" }, "original": { @@ -1195,11 +1177,11 @@ ] }, "locked": { - "lastModified": 1764962281, - "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", + "lastModified": 1759619523, + "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", + "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", "type": "github" }, "original": { @@ -1245,11 +1227,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -1274,11 +1256,11 @@ ] }, "locked": { - "lastModified": 1764872015, - "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "lastModified": 1764773840, + "narHash": "sha256-9UcCdwe7vPgEcJJ64JseBQL0ZJZoxp/2iFuvfRI+9zk=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", + "rev": "3f1997d6aeced318fb141810fded2255da811293", "type": "github" }, "original": { @@ -1296,11 +1278,11 @@ ] }, "locked": { - "lastModified": 1764922999, - "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", + "lastModified": 1764746434, + "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", + "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", "type": "github" }, "original": { @@ -1362,11 +1344,11 @@ ] }, "locked": { - "lastModified": 1765411465, - "narHash": "sha256-rwrGoscS1AXRsiB100JduKO9ySKEjC8zsSBIDfKi1G8=", + "lastModified": 1764806730, + "narHash": "sha256-snSD+ytHuPZDg3xv7xNz56LiXjRfabyIs7GGSTh7wjI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d47f5957732f763696803b564eb9c608a486014e", + "rev": "8ae167f2813ae99030aac0b50f855907f2acc56c", "type": "github" }, "original": { @@ -1378,11 +1360,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1765391613, - "narHash": "sha256-6tqSpj8b33kSY/0rYEdQRHsICdkZD/AtXSoC0EH/hFY=", + "lastModified": 1764741526, + "narHash": "sha256-2M2e0NGkkAtZGc9IhC9+wbcQ5xyUVKgB9oN+WUteeeI=", "owner": "neovim", "repo": "neovim", - "rev": "78bbe53f7615e8b38d5289d9ce0579996109579b", + "rev": "e62dd13f83a200105a2b8466e729c39485fa766d", "type": "github" }, "original": { @@ -1430,25 +1412,6 @@ "type": "github" } }, - "nix-gaming": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1765677811, - "narHash": "sha256-35xcopucfVwsD51Qbzwotj2c38hLtlNadwk0Qrl3LvM=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "b94559105b220cfcb1a25c43d75b86968f5edb98", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1479,11 +1442,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1764475780, + "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", "type": "github" }, "original": { @@ -1568,28 +1531,13 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1764939437, - "narHash": "sha256-4TLFHUwXraw9Df5mXC/vCrJgb50CRr3CzUzF0Mn3CII=", + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d2457e2f608b4be6fe8b470b0a36816324b0ae", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", "type": "github" }, "original": { @@ -1633,27 +1581,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1765457389, - "narHash": "sha256-ddhDtNYvleZeYF7g7TRFSmuQuZh7HCgqstg5YBGwo5s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f997fa0f94fb1ce55bccb97f60d41412ae8fde4c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -1794,11 +1726,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -1845,10 +1777,9 @@ "nbfc-linux": "nbfc-linux", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-flatpak": "nix-flatpak", - "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "note": "note", "stylix": "stylix", "upfast": "upfast", @@ -1860,11 +1791,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764470739, - "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", + "lastModified": 1764124769, + "narHash": "sha256-vcoOEy3i8AGJi3Y2C48hrf6CuL2h8W1gLe1gNt72Kxg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", + "rev": "5da8c00313b4434f00aed6b4c94cd3b207bafdc5", "type": "github" }, "original": { @@ -1881,11 +1812,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1764729618, + "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", "type": "github" }, "original": { @@ -1917,7 +1848,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -1931,11 +1862,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765386911, - "narHash": "sha256-YLjQpnTZCMjCho7ZDs5O1yFVw+fDlXq4lSJDuLWHHeA=", + "lastModified": 1764860352, + "narHash": "sha256-bWrh2T6EPiiZC7jY0jK5cWRwkG0hltnPT1etfHIHiXM=", "owner": "danth", "repo": "stylix", - "rev": "cb6bbed75eaca21deb8950c2ec0036ae5cde18ca", + "rev": "61a01b75f0a7e58dac486ddf022c628a71528399", "type": "github" }, "original": { @@ -2282,11 +2213,11 @@ ] }, "locked": { - "lastModified": 1765430623, - "narHash": "sha256-YfJwnCXF3V+WFedx4RtrIdZ8XxF6zB1Oh2ij/EHzoWk=", + "lastModified": 1764825646, + "narHash": "sha256-QkKEkj3GXpkPxJz9S1RgaMlxstkyaj5IKVWvxIbtC8w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f2881ba36cbfc86ef1fe741cec871fe523aea5bd", + "rev": "8c9284cc227a5c7cd8f1e1fa7a6882b0907187c8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3d94b98..866753c 100644 --- a/flake.nix +++ b/flake.nix @@ -134,9 +134,6 @@ url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # Some gaming related stuff ( actual osu! ) - nix-gaming.url = "github:fufexan/nix-gaming"; }; outputs = { diff --git a/hosts/skadi/configuration.nix b/hosts/skadi/configuration.nix index 3780de5..c85986d 100644 --- a/hosts/skadi/configuration.nix +++ b/hosts/skadi/configuration.nix @@ -160,44 +160,6 @@ enable = true; support32Bit = true; }; - wireplumber.extraConfig = { - "51-disable-suspension" = { - "monitor.alsa.rules" = [ - { - matches = [ - { - node.name = "~alsa_input.*"; - } - { - node.name = "~alsa_output.*"; - } - ]; - actions = { - update-props = { - "session.suspend-timeout-seconds" = 0; - }; - }; - } - ]; - "monitor.bluez.rules" = [ - { - matches = [ - { - node.name = "~alsa_input.*"; - } - { - node.name = "~alsa_output.*"; - } - ]; - actions = { - update-props = { - "session.suspend-timeout-seconds" = 0; - }; - }; - } - ]; - }; - }; extraConfig = { pipewire."99-silent.bell.conf" = { "context.properties" = { @@ -270,7 +232,6 @@ "https://nix-community.cachix.org" "https://hyprland.cachix.org" "https://ezkea.cachix.org" - "https://nix-gaming.cachix.org" ]; trusted-substituters = [ "https://hyprland.cachix.org" @@ -279,7 +240,6 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" - "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; }; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index f64edbb..217e64a 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -174,10 +174,8 @@ crony.wireguard.enable = true; crony.additional-hardware.enable = true; crony.secrets.enable = true; - crony.ryzenadj.enable = false; crony.auto-cpufreq.enable = true; crony.hyprland-nixos.enable = true; - crony.ollama.enable = false; crony.sunshine.enable = true; crony.nfs-share.enable = true; crony.sddm.enable = true; diff --git a/hosts/ymir/home.nix b/hosts/ymir/home.nix index ea620c3..9c7070b 100644 --- a/hosts/ymir/home.nix +++ b/hosts/ymir/home.nix @@ -32,16 +32,14 @@ crony.gaming.enable = true; crony.flatpak.enable = true; crony.wayland.enable = true; - crony.river.enable = false; crony.hyprland.enable = true; crony.home-secrets.enable = true; crony.restic.enable = true; crony.neovim.enable = true; - crony.qutebrowser.enable = true; crony.mpv.enable = true; - crony.browsers.enable = true; crony.desktop.enable = true; crony.shell-additions.enable = true; + crony.zen-browser.enable = true; # DO NOT CHANGE ALSO home.stateVersion = "24.11"; # Please read the comment before changing. diff --git a/modules/linux/home-manager/gaming.nix b/modules/linux/home-manager/gaming.nix index 4466005..12a4f58 100644 --- a/modules/linux/home-manager/gaming.nix +++ b/modules/linux/home-manager/gaming.nix @@ -1,6 +1,5 @@ { config, - inputs, pkgs, lib, ... @@ -18,7 +17,6 @@ itch wineWowPackages.staging osu-lazer-bin - inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.osu-stable gzdoom qzdl xonotic diff --git a/modules/linux/home-manager/hyprland.nix b/modules/linux/home-manager/hyprland.nix index 93c4ef9..570f27e 100644 --- a/modules/linux/home-manager/hyprland.nix +++ b/modules/linux/home-manager/hyprland.nix @@ -59,6 +59,18 @@ esac ''; grim = "${pkgs.grim}/bin/grim"; + vpn-toggle = pkgs.writeShellScriptBin "vpn-toggle" '' + #!/usr/bin/env sh + + if [ "$(nmcli --overview -f GENERAL.STATE connection show hetz)" = "" ]; then + nmcli con up hetz + ${pkgs.libnotify}/bin/notify-send "VPN" "UP" + else + nmcli con down hetz + ${pkgs.libnotify}/bin/notify-send "VPN" "DOWN" + fi + + ''; playerctl = "${pkgs.playerctl}/bin/playerctl"; in { options = { @@ -72,6 +84,8 @@ in { # Enable hyprpaper services.hyprpaper.enable = true; + + # Disable it by default and have it started manually by hyprland systemd.user.services.hyprpaper.Install.WantedBy = lib.mkForce []; # Setup portal for hyprland @@ -110,6 +124,7 @@ in { ]; }; }; + # Disable it by default and have it started manually by hyprland systemd.user.services.hypridle.Install.WantedBy = lib.mkForce []; # Setup and enable hyprland @@ -138,9 +153,10 @@ in { ]; cursor = { + # Breaks mouse in fullscreen no_break_fs_vrr = 1; no_hardware_cursors = 1; - use_cpu_buffer = 0; + # use_cpu_buffer = 0; }; exec-once = [ @@ -158,7 +174,7 @@ in { "HDMI-A-1, 1920x1080@144, 0x0, 1" "DP-1, 1920x1080@165, 0x0, 1" "eDP-1, 1920x1080, 0x0, 1" - "sunshine, 1920x1080@165, 0x0, 1" + "sunshine, 1920x1080@144, 0x0, 1" ]; animations = { @@ -191,7 +207,7 @@ in { input = { kb_layout = "us,hr"; - kb_options = "grp:alt_space_toggle"; + kb_options = "caps:escape,grp:alt_space_toggle"; accel_profile = "flat"; }; @@ -214,7 +230,7 @@ in { "$mod, F, fullscreen" - "$mod SHIFT, L, exec, hyprlock" + "$mod SHIFT, L, exec, hyprlock --immediate" "$mod, B, exec, zen-beta" "$mod SHIFT, B, exec, librewolf" @@ -222,6 +238,7 @@ in { "$mod, G, exec, ${hyprgamemode}/bin/gamemode" "$mod, F1, exec, ${toggle-sound-output}/bin/toggle-sound-output" "$mod SHIFT, E, exec, ${power-menu}/bin/power-menu" + "$mod, w, exec, ${vpn-toggle}/bin/vpn-toggle" "$mod, F12, exec, ${grim} ${config.xdg.userDirs.pictures}/screenshots/$(date +'%s_grim.png')" diff --git a/modules/linux/nixos/default.nix b/modules/linux/nixos/default.nix index 390bb1d..fc66e83 100644 --- a/modules/linux/nixos/default.nix +++ b/modules/linux/nixos/default.nix @@ -27,7 +27,6 @@ ./oom.nix ./boot.nix ./kanata.nix - ./keyd.nix ]; crony.bluetooth.enable = lib.mkDefault true; @@ -57,5 +56,4 @@ crony.oom.enable = lib.mkDefault true; crony.boot.enable = lib.mkDefault false; crony.kanata.enable = lib.mkDefault false; - crony.keyd.enable = lib.mkDefault true; } diff --git a/modules/linux/nixos/keyd.nix b/modules/linux/nixos/keyd.nix deleted file mode 100644 index 4f91133..0000000 --- a/modules/linux/nixos/keyd.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - ... -}: { - options = { - crony.keyd.enable = lib.mkEnableOption "Enable and setup keyd layers"; - }; - - config = lib.mkIf config.crony.keyd.enable { - services.keyd = { - enable = true; - keyboards.default = { - ids = ["*"]; - settings = { - main = { - capslock = "overload(control, esc)"; - esc = "toggle(gaming)"; - }; - gaming = { - capslock = "esc"; - rightshift = "rightshift"; - }; - }; - }; - }; - }; -} diff --git a/modules/linux/nixos/stylix.nix b/modules/linux/nixos/stylix.nix index df0d85c..12f9f00 100644 --- a/modules/linux/nixos/stylix.nix +++ b/modules/linux/nixos/stylix.nix @@ -13,7 +13,7 @@ stylix.enable = true; stylix.autoEnable = true; stylix.image = ./tokyonight.png; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; # Change Cursor stylix.cursor.package = pkgs.bibata-cursors;