diff --git a/desktop/default.nix b/desktop/default.nix index 4589acb..df4ce12 100644 --- a/desktop/default.nix +++ b/desktop/default.nix @@ -31,7 +31,7 @@ in eww.enable = lib.mkDefault true; hypr.enable = lib.mkDefault true; services.enable = lib.mkDefault true; - login.sddm.enable = lib.mkDefault true; + login.enable = lib.mkDefault true; rofi.enable = lib.mkDefault true; misc.enable = lib.mkDefault true; }; diff --git a/desktop/login/default.nix b/desktop/login/default.nix index 291846a..c879a9d 100644 --- a/desktop/login/default.nix +++ b/desktop/login/default.nix @@ -1,6 +1,16 @@ +{ config, lib, ... }: +let + cfg = config.desktop.login; +in { imports = [ ./tuigreet.nix ./sddm.nix ]; + + options.desktop.login.enable = lib.mkEnableOption "Desktop Login"; + + config = lib.mkIf cfg.enable { + desktop.login.tuigreet.enable = lib.mkDefault true; + }; } diff --git a/desktop/login/tuigreet.nix b/desktop/login/tuigreet.nix index 489a799..17f41c6 100644 --- a/desktop/login/tuigreet.nix +++ b/desktop/login/tuigreet.nix @@ -16,7 +16,7 @@ in config.services.greetd = { inherit (cfg) enable; settings.default_session = { - command = "${tuigreet} --time --cmd hyprland"; + command = "${tuigreet} --time"; user = username; }; }; diff --git a/flake.lock b/flake.lock index 40dbeb9..1a82fd0 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,7 @@ "ags": { "inputs": { "astal": "astal", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1734091628, @@ -76,7 +76,7 @@ }, "astal_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1734814417, @@ -165,12 +165,12 @@ ] }, "locked": { - "lastModified": 1732104555, - "narHash": "sha256-BS1EcK6ChKS0073IPEMsYXr56sax9fut8Rfm8uk8YJw=", - "rev": "35b4a56ef326c382c01d148142f45cb83374b654", - "revCount": 128, + "lastModified": 1734963688, + "narHash": "sha256-Pgt9FcqUJD/Mg+L2cMlvKw5z/WNDJRTg2ZvIho/2upE=", + "rev": "91297beb20864e611af6017c5eeef1b4564d7157", + "revCount": 132, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.11/0193497b-0d96-7d62-b941-1fe51ce62934/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.12/01940c9d-feca-7111-a812-8d8ba9dd4fbd/source.tar.gz" }, "original": { "type": "tarball", @@ -178,12 +178,21 @@ } }, "catppuccin": { + "inputs": { + "catppuccin-v1_1": "catppuccin-v1_1", + "catppuccin-v1_2": "catppuccin-v1_2", + "home-manager": "home-manager", + "home-manager-stable": "home-manager-stable", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "nuscht-search": "nuscht-search" + }, "locked": { - "lastModified": 1734734291, - "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", + "lastModified": 1736069220, + "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", "owner": "catppuccin", "repo": "nix", - "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", + "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", "type": "github" }, "original": { @@ -256,13 +265,41 @@ "type": "github" } }, + "catppuccin-v1_1": { + "locked": { + "lastModified": 1734055249, + "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", + "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", + "revCount": 326, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" + } + }, + "catppuccin-v1_2": { + "locked": { + "lastModified": 1734728407, + "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", + "rev": "23ee86dbf4ed347878115a78971d43025362fab1", + "revCount": 341, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" + } + }, "crane": { "locked": { - "lastModified": 1730652660, - "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -299,11 +336,11 @@ ] }, "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", + "lastModified": 1736199437, + "narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=", "owner": "nix-community", "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", + "rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf", "type": "github" }, "original": { @@ -312,6 +349,22 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1734969791, + "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -401,6 +454,24 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": [ "systems" @@ -436,6 +507,37 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_4", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -502,6 +604,28 @@ "type": "github" } }, + "gitignore_4": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -520,17 +644,60 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "catppuccin", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1736277415, + "narHash": "sha256-kPDXF6cIPsVqSK08XF5EC6KM7BdMnM9vtJDzsnf+lLU=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "5c4302313d9207f7ec0886d68f8ff4a3c71209a1", "type": "github" }, "original": { @@ -568,6 +735,35 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprlock", + "hyprutils" + ], + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1736115290, + "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprgrass": { "inputs": { "hyprland": [ @@ -600,11 +796,11 @@ ] }, "locked": { - "lastModified": 1731958956, - "narHash": "sha256-21R5LD61oUqjdo9Vz0kLn0qSHCDMXyUMXbbod3kX+ho=", + "lastModified": 1734384160, + "narHash": "sha256-zy2uzmlIORQV6VjIqSPhaoUKPLqfzpUQ5UTjmRfrkdg=", "owner": "hyprwm", "repo": "hypridle", - "rev": "9f23e70bb494107df8f959c925d4521a298c65eb", + "rev": "413564cb986cfc67aeb7c4e750b42dc93ff9810f", "type": "github" }, "original": { @@ -621,9 +817,9 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -726,11 +922,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1734364628, + "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", "type": "github" }, "original": { @@ -784,11 +980,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1735393019, + "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "type": "github" }, "original": { @@ -799,8 +995,10 @@ }, "hyprlock": { "inputs": { + "hyprgraphics": "hyprgraphics", "hyprlang": "hyprlang_3", "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], @@ -809,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1732023353, - "narHash": "sha256-FbHP2io0nKSC0qEjTdAhrfmlqiv9oB1P/DcV3jFAnWY=", + "lastModified": 1736169493, + "narHash": "sha256-btbk2tgg8LcOZZoKkaRutZLTylR9bJ6Gn/dadnYjCvc=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "578246b9967dec77c56993dc55ca192d35ba9bb7", + "rev": "de844d39adb09a827f15f4246a10bb7876f3c341", "type": "github" }, "original": { @@ -847,7 +1045,7 @@ "hyprpicker": { "inputs": { "hyprutils": "hyprutils_4", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": [ "nixpkgs" ], @@ -897,7 +1095,7 @@ "inputs": { "hyprland-protocols": "hyprland-protocols_2", "hyprutils": "hyprutils_6", - "hyprwayland-scanner": "hyprwayland-scanner_3", + "hyprwayland-scanner": "hyprwayland-scanner_4", "nixpkgs": [ "nixpkgs" ], @@ -931,11 +1129,11 @@ ] }, "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "lastModified": 1733502241, + "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", + "rev": "104117aed6dd68561be38b50f218190aa47f2cd8", "type": "github" }, "original": { @@ -981,11 +1179,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1736164519, + "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "3c895da64b0eb19870142196fa48c07090b441c4", "type": "github" }, "original": { @@ -1095,6 +1293,31 @@ } }, "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ "hyprpicker", @@ -1119,7 +1342,7 @@ "type": "github" } }, - "hyprwayland-scanner_3": { + "hyprwayland-scanner_4": { "inputs": { "nixpkgs": [ "hyprsunset", @@ -1146,11 +1369,11 @@ }, "impermanence": { "locked": { - "lastModified": 1731242966, - "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", + "lastModified": 1734945620, + "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", "owner": "nix-community", "repo": "impermanence", - "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", + "rev": "d000479f4f41390ff7cf9204979660ad5dd16176", "type": "github" }, "original": { @@ -1159,6 +1382,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "catppuccin", + "nuscht-search", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin", + "nuscht-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -1173,11 +1424,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731941836, - "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=", + "lastModified": 1734994463, + "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879", + "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", "type": "github" }, "original": { @@ -1227,11 +1478,11 @@ ] }, "locked": { - "lastModified": 1733444216, - "narHash": "sha256-Xs+HcLsnMy6Z1FpHr0ULsGMc1mI6ESq1dTBAYwlpuVY=", + "lastModified": 1735772949, + "narHash": "sha256-lvee0rhKTpJEDl1SC4F3Kvz88snOU8OMTJBsPH1pVBo=", "owner": "musnix", "repo": "musnix", - "rev": "a38011b5b96624b7f6527c0bc6df530a263297ad", + "rev": "86ef22cbdd7551ef325bce88143be9f37da64c26", "type": "github" }, "original": { @@ -1275,11 +1526,11 @@ "navi-denis-tldr-pages": { "flake": false, "locked": { - "lastModified": 1733619874, - "narHash": "sha256-WptrGpwhSXcLO5y9sYb02x2dWmrjNAtVLQDT0pdb2N0=", + "lastModified": 1734829223, + "narHash": "sha256-lsJsHnu7v33lg6Jacy5mf6cdDFy4Y1VYnHlnK46gLG8=", "owner": "denisidoro", "repo": "navi-tldr-pages", - "rev": "bc33fa6014f089b6ff9f8f65016b37cf32651f6b", + "rev": "636c02e165683986f5e15bb14b66b8bc0df478a1", "type": "github" }, "original": { @@ -1321,11 +1572,11 @@ ] }, "locked": { - "lastModified": 1733838574, - "narHash": "sha256-7Dag5567gNpEOwcPTUCuT9jR5shxInnsJVUwzbh611k=", + "lastModified": 1734239219, + "narHash": "sha256-iKY/OGNANXpd9hXBGfx8vObpHW4IcOH0MrerLCCc7hA=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "dc5b882f131eceb37d381292c62ab5c0c0112b7b", + "rev": "a266d0f74dd4a82ec6a72b02fbf3fbc5f7105f15", "type": "github" }, "original": { @@ -1356,11 +1607,11 @@ ] }, "locked": { - "lastModified": 1733629314, - "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", + "lastModified": 1736047960, + "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", + "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "type": "github" }, "original": { @@ -1382,11 +1633,11 @@ ] }, "locked": { - "lastModified": 1733709556, - "narHash": "sha256-u0ll0DDrKlO7tiLGGtmphv3wFy5ReDuf0USo/OlfROU=", + "lastModified": 1736128264, + "narHash": "sha256-B2RuVaQBbVChPf9ZqRBEqUA09MCD5P/iBpOokoXd5gM=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "8d11f147df83fe137d3d94f6f3646e3a52bec855", + "rev": "eefeae9b72d15f69e7264a6a87fba6ecc9782496", "type": "github" }, "original": { @@ -1433,11 +1684,11 @@ ] }, "locked": { - "lastModified": 1733882180, - "narHash": "sha256-KiI6gRWYgV4x5le9ETHWVMH5LBX2vGwamELJG/joiC0=", + "lastModified": 1736214462, + "narHash": "sha256-JcwPAIcZ3DeNimp+tULr83MBSTTZIfQBwvuhw5wMVt0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b5aa69a2b8c0c31e4e8a23f3dd41b474eeabf4fc", + "rev": "9893dc8ad11e92b461e75a8ae51473c8620aa0a8", "type": "github" }, "original": { @@ -1462,11 +1713,11 @@ ] }, "locked": { - "lastModified": 1733069184, - "narHash": "sha256-SXUI6c/M97s31yT3Wk2OZBmsKvdcSq0n21ysJyyqbCo=", + "lastModified": 1735850436, + "narHash": "sha256-8C510mjJRun2CPmIv4DxKC9wc40/7xIGkX9dseBlk6w=", "owner": "kaylorben", "repo": "nixcord", - "rev": "40dafe281bdadedc894879f8671aef19af6bafd6", + "rev": "d5f2fbef2fad379190e0c7a0d2d2f12c4e4df034", "type": "github" }, "original": { @@ -1480,19 +1731,16 @@ "flake-compat": [ "flake-compat" ], - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1733854371, - "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=", + "lastModified": 1736095716, + "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888", + "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", "type": "github" }, "original": { @@ -1504,11 +1752,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -1519,6 +1767,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1534,13 +1798,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -1550,13 +1814,13 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_4": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -1567,6 +1831,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1733581040, "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", @@ -1582,7 +1862,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1734424634, "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", @@ -1598,13 +1878,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -1614,18 +1894,18 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -1641,11 +1921,11 @@ ] }, "locked": { - "lastModified": 1733925096, - "narHash": "sha256-RRSyDAuzhL8fTF3pDoiBezQ/7ZQM+c61eYktPksVznE=", + "lastModified": 1736279531, + "narHash": "sha256-n5jOrUQpedA2Ya09rDKspi9gm31SZ912yNjhPG3AcHg=", "owner": "nix-community", "repo": "nur", - "rev": "cebaa5601eca31b9d7eb4bf65aee90da9696821c", + "rev": "8b3679f146ce461dfedf73d6fb7aaf578616845c", "type": "github" }, "original": { @@ -1654,14 +1934,37 @@ "type": "github" } }, + "nuscht-search": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "catppuccin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "owner": "NuschtOS", + "repo": "search", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "potato-fox": { "flake": false, "locked": { - "lastModified": 1733799118, - "narHash": "sha256-Wx5+vr9eavKDQGStnzPC11YkJq9eyGOQB4on7rP1qhc=", + "lastModified": 1735080742, + "narHash": "sha256-nPenEUptf9ymVIfet5lHZfXSMwuWzozigpQRcDqNTq4=", "ref": "refs/heads/main", - "rev": "a9a596eadf396b2c6fbd8b0252c43d6ff39e8d8f", - "revCount": 371, + "rev": "0949d70379611242b43f67eb8e67d5279ff369f4", + "revCount": 377, "type": "git", "url": "https://codeberg.org/awwpotato/PotatoFox.git" }, @@ -1678,7 +1981,7 @@ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1731363552, @@ -1705,14 +2008,14 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -1752,21 +2055,21 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", "rpi-linux-6_10_12-src": "rpi-linux-6_10_12-src", - "rpi-linux-6_6_54-src": "rpi-linux-6_6_54-src", + "rpi-linux-6_6_67-src": "rpi-linux-6_6_67-src", "rpicam-apps-src": "rpicam-apps-src", "u-boot-src": "u-boot-src" }, "locked": { - "lastModified": 1731941843, - "narHash": "sha256-/QG4C9WVP79A7jRFC3Ci1q1l6ah7gr3/SF/MWUk/hhM=", + "lastModified": 1736181271, + "narHash": "sha256-tCxJzhFxJmRlIKjLREntBYmoQr3db9P6eOE9q6dh/HA=", "owner": "nix-community", "repo": "raspberry-pi-nix", - "rev": "aaec735faf81ff05356d65c7408136d2c1522d34", + "rev": "6b63ee98284cd68e86bcdb29feeb3009896f1a6b", "type": "github" }, "original": { @@ -1785,8 +2088,8 @@ "catppuccin-imhex": "catppuccin-imhex", "disko": "disko", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "home-manager": "home-manager", + "flake-utils": "flake-utils_2", + "home-manager": "home-manager_2", "hyprgrass": "hyprgrass", "hypridle": "hypridle", "hyprland": "hyprland", @@ -1810,15 +2113,15 @@ "nix-vscode-extensions": "nix-vscode-extensions", "nixcord": "nixcord", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_4", "nur": "nur", "potato-fox": "potato-fox", "raspberry-pi-nix": "raspberry-pi-nix", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "stylix": "stylix", - "systems": "systems_2", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" } }, @@ -1890,14 +2193,14 @@ "type": "github" } }, - "rpi-linux-6_6_54-src": { + "rpi-linux-6_6_67-src": { "flake": false, "locked": { - "lastModified": 1728155174, - "narHash": "sha256-/8RjW35XQMnshjAE4Ey8j3oWzE2GOntnBYY6PlvZGhs=", + "lastModified": 1734790986, + "narHash": "sha256-q9swM2TmmuzbUuQnbLZk5PseKWD7/SNPwtth6bpGIqE=", "owner": "raspberrypi", "repo": "linux", - "rev": "12f0f28db3afe451a81a34c5a444f6841c10067c", + "rev": "811ff707533bcd67cdcd368bbd46223082009b12", "type": "github" }, "original": { @@ -1932,11 +2235,11 @@ ] }, "locked": { - "lastModified": 1730601085, - "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -1952,11 +2255,11 @@ ] }, "locked": { - "lastModified": 1733785344, - "narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -1975,11 +2278,11 @@ ] }, "locked": { - "lastModified": 1733890649, - "narHash": "sha256-hHh4lrCNK7PSj7pnIu17NPGjfq+cVzgU0Qg8G0FcAaM=", + "lastModified": 1736223357, + "narHash": "sha256-QzL0ygtIeKmRZIjsSy+Ahg1DQBoUP62nZ0BhZaMLP/Y=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b4389ffe0af645713baf1a16a0fa69bea9c08a34", + "rev": "23e30ec79bb9f3a80fb3e2c0f24214c6dcfe5e61", "type": "github" }, "original": { @@ -1994,12 +2297,14 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": [ "flake-compat" ], "flake-utils": [ "flake-utils" ], + "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -2012,14 +2317,15 @@ ], "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1734012548, - "narHash": "sha256-72z7fZNeFtG+UWmbMn5by4K47HHBxk3JtV91D/qZEhg=", + "lastModified": 1736274934, + "narHash": "sha256-mAAjaD6rPZLH7NDezJlZWAl8Se5BP0sboVnX8pvCNQ8=", "owner": "danth", "repo": "stylix", - "rev": "ccee633284cde8a9f825004e00dd84a31b10e6c6", + "rev": "5c84f02fcfb4fc697f132e90b8b3f9598c809b96", "type": "github" }, "original": { @@ -2029,6 +2335,21 @@ } }, "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2043,7 +2364,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2108,6 +2429,22 @@ "type": "github" } }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2115,11 +2452,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e8d1358..d78ccd3 100644 --- a/flake.nix +++ b/flake.nix @@ -193,7 +193,6 @@ url = "github:nix-community/NixOS-WSL/main"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; flake-compat.follows = "flake-compat"; }; }; diff --git a/hardware/nvidia.nix b/hardware/nvidia.nix index c9294fe..053981b 100644 --- a/hardware/nvidia.nix +++ b/hardware/nvidia.nix @@ -1,6 +1,5 @@ { lib, - pkgs, config, ... }: @@ -9,17 +8,13 @@ config = lib.mkIf config.hardware.nvidia.enable { services.xserver.videoDrivers = [ "nvidia" ]; + hardware = { - nvidia = { - powerManagement.enable = true; - modesetting.enable = true; - open = false; - }; + nvidia.open = false; nvidia-container-toolkit.enable = true; graphics = { enable = true; enable32Bit = true; - extraPackages = [ pkgs.nvidia-vaapi-driver ]; }; }; }; diff --git a/hosts/kg/configuration.nix b/hosts/kg/configuration.nix index f03c604..c4579ca 100644 --- a/hosts/kg/configuration.nix +++ b/hosts/kg/configuration.nix @@ -47,10 +47,7 @@ apps.enable = true; - virt = { - enable = true; - virtualbox.enable = true; - }; + virt.enable = true; desktop = { enable = true; diff --git a/programs/cli/shells/nushell/default.nix b/programs/cli/shells/nushell/default.nix index 9c6a3e8..b6930e3 100644 --- a/programs/cli/shells/nushell/default.nix +++ b/programs/cli/shells/nushell/default.nix @@ -23,7 +23,6 @@ in lla = "ls -l -a"; }; plugins = with pkgs.nushellPlugins; [ - dbus formats gstat polars diff --git a/programs/default.nix b/programs/default.nix index 6ad2f9e..d50ee2e 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -52,7 +52,6 @@ in with pkgs; [ gimp - figma-linux obsidian @@ -68,7 +67,6 @@ in signal-desktop czkawka - lmms ] ); } diff --git a/programs/gaming/default.nix b/programs/gaming/default.nix index 4a3f2f4..bfc3182 100644 --- a/programs/gaming/default.nix +++ b/programs/gaming/default.nix @@ -45,7 +45,6 @@ in bottles prismlauncher steam-run - openarena ] ); } diff --git a/programs/gaming/emulators/ryujinx.nix b/programs/gaming/emulators/ryujinx.nix index bb156d2..a899713 100644 --- a/programs/gaming/emulators/ryujinx.nix +++ b/programs/gaming/emulators/ryujinx.nix @@ -9,6 +9,6 @@ options.gaming.emulators.ryujinx.enable = lib.mkEnableOption "Ryujinx"; config = lib.mkIf config.gaming.emulators.ryujinx.enable { - home-manager.users.${username}.home.packages = [ pkgs.ryujinx ]; + home-manager.users.${username}.home.packages = [ pkgs.ryujinx-greemdev ]; }; } diff --git a/system/style/catppuccin.nix b/system/style/catppuccin.nix index 336ad62..b9dcef1 100644 --- a/system/style/catppuccin.nix +++ b/system/style/catppuccin.nix @@ -42,18 +42,21 @@ in system.style.catppuccin = { enable = lib.mkEnableOption "Catppuccin"; + enableGtkIcons = lib.mkOption { default = true; type = lib.types.bool; description = "Enable Catppuccin Icons for GTK."; example = false; }; + accent = lib.mkOption { default = "lavender"; type = lib.types.enum accents; description = "What Accent Catppuccin should use."; example = "rosewater"; }; + cursorAccent = lib.mkOption { default = "dark"; type = lib.types.enum cursorAccents; @@ -67,6 +70,7 @@ in catppuccin = { enable = true; inherit (cfg) accent; + cache.enable = true; }; home-manager.users.${username} = { imports = [ inputs.catppuccin.homeManagerModules.catppuccin ]; @@ -81,14 +85,7 @@ in }; }; - home = - let - size = 24; - in - { - sessionVariables.XCURSOR_SIZE = size; - pointerCursor = { inherit size; }; - }; + home.pointerCursor.hyprcursor.enable = true; gtk = lib.genAttrs