diff --git a/flake.lock b/flake.lock index f398710..4d92568 100644 --- a/flake.lock +++ b/flake.lock @@ -42,7 +42,9 @@ "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", "hercules-ci-effects": "hercules-ci-effects", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1730775052, @@ -81,19 +83,69 @@ "type": "github" } }, - "base16-schemes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { "flake": false, "locked": { - "lastModified": 1696158499, - "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "owner": "tinted-theming", - "repo": "base16-schemes", - "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", + "repo": "base16-helix", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "type": "github" }, "original": { "owner": "tinted-theming", - "repo": "base16-schemes", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", "type": "github" } }, @@ -114,7 +166,28 @@ }, "devshell": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "owner": "numtide", + "repo": "devshell", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "inputs": { + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1722113426, @@ -205,6 +278,36 @@ "type": "github" } }, + "flake-compat_3": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -267,7 +370,28 @@ }, "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1709336216, @@ -283,9 +407,9 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { "lastModified": 1726153070, @@ -334,9 +458,50 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "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_4": { + "inputs": { + "systems": [ + "stylix", + "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" + } + }, "flatpaks": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_2" }, "locked": { @@ -354,6 +519,52 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -376,6 +587,45 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "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": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "hardware": { "locked": { "lastModified": 1732483221, @@ -410,7 +660,9 @@ "heliox-cli": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, @@ -474,7 +726,50 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f3111f62a23451114433888902a55cf0692b408d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_4": { + "inputs": { + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1726440980, @@ -529,8 +824,8 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_12", - "systems": "systems_5", + "nixpkgs": "nixpkgs_7", + "systems": "systems_7", "xdph": "xdph" }, "locked": { @@ -662,37 +957,67 @@ "type": "github" } }, - "nix-colors": { + "ixx": { "inputs": { - "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib_2" + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] }, "locked": { - "lastModified": 1707825078, - "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", - "owner": "misterio77", - "repo": "nix-colors", - "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", "type": "github" }, "original": { - "owner": "misterio77", - "repo": "nix-colors", + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732603785, + "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -716,21 +1041,6 @@ } }, "nixpkgs-lib_2": { - "locked": { - "lastModified": 1697935651, - "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_3": { "locked": { "dir": "lib", "lastModified": 1709237383, @@ -748,7 +1058,7 @@ "type": "github" } }, - "nixpkgs-lib_4": { + "nixpkgs-lib_3": { "locked": { "lastModified": 1725233747, "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", @@ -792,135 +1102,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1722073938, - "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1726062873, - "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1726481836, - "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1727907660, - "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1706732774, - "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1705856552, "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", @@ -936,7 +1118,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_3": { "locked": { "lastModified": 1732981179, "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", @@ -952,23 +1134,7 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { + "nixpkgs_4": { "locked": { "lastModified": 1708475490, "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", @@ -984,13 +1150,13 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_5": { "locked": { - "lastModified": 1731763621, - "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", + "lastModified": 1722073938, + "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", + "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", "type": "github" }, "original": { @@ -1000,12 +1166,114 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1726062873, + "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1725983898, + "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_4", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": [ + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1733005332, + "narHash": "sha256-sd+YV24AjFfqlx9G8fAf6A3wXORRIDBMk7QtGKF+jLY=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "c500a3ffe18d8e7c7146dce26d7828b3dacd2320", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "nixos-24.11", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_3", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731936508, + "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "owner": "NuschtOS", + "repo": "search", + "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "picokontroller": { "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_7", - "systems": "systems_4", - "treefmt-nix": "treefmt-nix_2" + "flake-parts": "flake-parts_5", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_5", + "treefmt-nix": "treefmt-nix_3" }, "locked": { "lastModified": 1714572752, @@ -1025,7 +1293,7 @@ "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1052,17 +1320,20 @@ "hardware": "hardware", "heliox-cli": "heliox-cli", "home-manager": "home-manager", - "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "nixvim": "nixvim", "picokontroller": "picokontroller", "sops-nix": "sops-nix", + "stylix": "stylix", "xremap": "xremap" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1732575825, @@ -1078,6 +1349,38 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_3", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_6", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" + }, + "locked": { + "lastModified": 1732993760, + "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=", + "owner": "danth", + "repo": "stylix", + "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1139,6 +1442,36 @@ } }, "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1153,9 +1486,59 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1706462057, @@ -1173,7 +1556,28 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1710278050, @@ -1189,9 +1593,9 @@ "type": "github" } }, - "treefmt-nix_3": { + "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1725271838, @@ -1243,12 +1647,14 @@ "xremap": { "inputs": { "crane": "crane", - "devshell": "devshell", - "flake-parts": "flake-parts_5", - "home-manager": "home-manager_2", + "devshell": "devshell_2", + "flake-parts": "flake-parts_6", + "home-manager": "home-manager_4", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_13", - "treefmt-nix": "treefmt-nix_3", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_4", "xremap": "xremap_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 1c7bbcc..961f196 100644 --- a/flake.nix +++ b/flake.nix @@ -1,44 +1,71 @@ { - description = "Your new nix config"; + description = "GHOSCHT's NixOS config"; inputs = { # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - # You can access packages and modules from different nixpkgs revs - # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager - home-manager.url = "github:nix-community/home-manager/release-24.11"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager/release-24.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - hardware.url = "github:nixos/nixos-hardware"; + hardware = { + url = "github:nixos/nixos-hardware"; + inputs.nixpkgs.follows = "nixpkgs"; + }; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-colors.url = "github:misterio77/nix-colors"; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; + arkenfox = { url = "github:dwarfmaster/arkenfox-nixos"; inputs.nixpkgs.follows = "nixpkgs"; }; - xremap.url = "github:xremap/nix-flake"; - flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3"; - heliox-cli.url = "git+https://git.ghoscht.com/heliox/cli?ref=custom-dimming"; - picokontroller.url = "git+https://git.ghoscht.com/ghoscht/picoKontroller"; - sops-nix.url = "github:Mic92/sops-nix"; - arion.url = "github:hercules-ci/arion"; + xremap = { + url = "github:xremap/nix-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + flatpaks = { + url = "github:GermanBread/declarative-flatpak/stable-v3"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + heliox-cli = { + url = "git+https://git.ghoscht.com/heliox/cli?ref=custom-dimming"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + picokontroller = { + url = "git+https://git.ghoscht.com/ghoscht/picoKontroller"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + arion = { + url = "github:hercules-ci/arion"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixvim = { url = "github:nix-community/nixvim/nixos-24.11"; @@ -46,115 +73,117 @@ }; }; - outputs = { - self, - nixpkgs, - home-manager, - ... - } @ inputs: let - inherit (self) outputs; - # Supported systems for your flake packages, shell, etc. - systems = [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - "aarch64-darwin" - "x86_64-darwin" - ]; - # This is a function that generates an attribute by calling a function you - # pass to it, with each system as an argument - forAllSystems = nixpkgs.lib.genAttrs systems; - vars = import ./vars.nix; - in { - # Your custom packages - # Accessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - # Formatter for your nix files, available through 'nix fmt' - # Other options beside 'alejandra' include 'nixpkgs-fmt' - formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + outputs = + { self + , nixpkgs + , home-manager + , ... + } @ inputs: + let + inherit (self) outputs; + # Supported systems for your flake packages, shell, etc. + systems = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; + vars = import ./vars.nix; + in + { + # Your custom packages + # Accessible through 'nix build', 'nix shell', etc + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # Formatter for your nix files, available through 'nix fmt' + # Other options beside 'alejandra' include 'nixpkgs-fmt' + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; - # Reusable nixos modules you might want to export - # These are usually stuff you would upstream into nixpkgs - nixosModules = import ./modules/nixos; - # Reusable home-manager modules you might want to export - # These are usually stuff you would upstream into home-manager - homeManagerModules = import ./modules/home-manager; + # Your custom packages and modifications, exported as overlays + overlays = import ./overlays { inherit inputs; }; + # Reusable nixos modules you might want to export + # These are usually stuff you would upstream into nixpkgs + nixosModules = import ./modules/nixos; + # Reusable home-manager modules you might want to export + # These are usually stuff you would upstream into home-manager + homeManagerModules = import ./modules/home-manager; - # NixOS configuration entrypoint - # Available through 'nixos-rebuild --flake .#your-hostname' - nixosConfigurations = { - adalbert = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs vars;}; - modules = [ - ./hosts/adalbert - ]; - }; - ludwig = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs vars;}; - modules = [ - ./hosts/ludwig - ]; - }; - leopold = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs vars;}; - modules = [ - ./hosts/leopold - ]; - }; - franz = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs vars;}; - modules = [ - ./hosts/franz - ]; - }; - # build with nix build .#nixosConfigurations.eustachius.config.system.build.sdImage - eustachius = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - modules = [ - "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix" - ./hosts/eustachius + # NixOS configuration entrypoint + # Available through 'nixos-rebuild --flake .#your-hostname' + nixosConfigurations = { + adalbert = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs vars; }; + modules = [ + ./hosts/adalbert + ]; + }; + ludwig = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs vars; }; + modules = [ + ./hosts/ludwig + ]; + }; + leopold = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs vars; }; + modules = [ + ./hosts/leopold + ]; + }; + franz = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs vars; }; + modules = [ + ./hosts/franz + ]; + }; + # build with nix build .#nixosConfigurations.eustachius.config.system.build.sdImage + eustachius = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = [ + "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix" + ./hosts/eustachius - # extra config for sdImage generator - { - sdImage.compressImage = false; - } - ]; + # extra config for sdImage generator + { + sdImage.compressImage = false; + } + ]; + }; }; - }; - # Standalone home-manager configuration entrypoint - # Available through 'home-manager --flake .#your-username@your-hostname' - homeConfigurations = { - "${vars.user}@adalbert" = home-manager.lib.homeManagerConfiguration { + # Standalone home-manager configuration entrypoint + # Available through 'home-manager --flake .#your-username@your-hostname' + homeConfigurations = { + "${vars.user}@adalbert" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = { inherit inputs outputs vars; }; + modules = [ + ./home/adalbert.nix + ]; + }; + }; + "${vars.user}@ludwig" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs vars;}; + extraSpecialArgs = { inherit inputs outputs vars; }; modules = [ - ./home/adalbert.nix + ./home/ludwig.nix ]; }; + "${vars.user}@franz" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = { inherit inputs outputs vars; }; + modules = [ + ./home/franz.nix + ]; + }; + # "${vars.user}@eustachius" = home-manager.lib.homeManagerConfiguration { + # pkgs = nixpkgs.legacyPackages.aarch64-linux; # Home-manager requires 'pkgs' instance + # extraSpecialArgs = {inherit inputs outputs vars;}; + # modules = [ + # ./home/eustachius.nix + # ]; + # }; }; - "${vars.user}@ludwig" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs vars;}; - modules = [ - ./home/ludwig.nix - ]; - }; - "${vars.user}@franz" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs vars;}; - modules = [ - ./home/franz.nix - ]; - }; - # "${vars.user}@eustachius" = home-manager.lib.homeManagerConfiguration { - # pkgs = nixpkgs.legacyPackages.aarch64-linux; # Home-manager requires 'pkgs' instance - # extraSpecialArgs = {inherit inputs outputs vars;}; - # modules = [ - # ./home/eustachius.nix - # ]; - # }; - }; } diff --git a/home/adalbert.nix b/home/adalbert.nix index 1cb57e5..28e9249 100644 --- a/home/adalbert.nix +++ b/home/adalbert.nix @@ -11,11 +11,8 @@ in { ./features/games ./features/coding ./features/desktop/common/3d-printing.nix - inputs.nix-colors.homeManagerModules.default ]; - colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; - home.packages = [ inputs.picokontroller.packages.x86_64-linux.default # pkgs.citrix_workspace diff --git a/home/features/cli/bat.nix b/home/features/cli/bat.nix index 145895e..4cb0b03 100644 --- a/home/features/cli/bat.nix +++ b/home/features/cli/bat.nix @@ -1,6 +1,5 @@ { programs.bat = { enable = true; - config.theme = "base16"; }; } diff --git a/home/features/cli/btop.nix b/home/features/cli/btop.nix index 92f6167..69803b5 100644 --- a/home/features/cli/btop.nix +++ b/home/features/cli/btop.nix @@ -2,7 +2,6 @@ programs.btop = { enable = true; settings = { - color_theme = "nix-colors"; theme_background = false; truecolor = true; vim_keys = true; @@ -10,89 +9,4 @@ proc_gradient = false; }; }; - xdg.configFile."btop/themes/nix-colors".text = '' - # Main background, empty for terminal default, need to be empty if you want transparent background - # theme[main_bg]="#${config.colorScheme.colors.base00}" - - # Main text color - theme[main_fg]="#${config.colorScheme.colors.base05}" - - # Title color for boxes - theme[title]="#${config.colorScheme.colors.base05}" - - # Highlight color for keyboard shortcuts - theme[hi_fg]="#${config.colorScheme.colors.base0D}" - - # Background color of selected item in processes box - theme[selected_bg]="#${config.colorScheme.colors.base03}" - - # Foreground color of selected item in processes box - theme[selected_fg]="#${config.colorScheme.colors.base0D}" - - # Color of inactive/disabled text - theme[inactive_fg]="#${config.colorScheme.colors.base02}" - - # Color of text appearing on top of graphs, i.e uptime and current network graph scaling - theme[graph_text]="#${config.colorScheme.colors.base06}" - - # Background color of the percentage meters - theme[meter_bg]="#${config.colorScheme.colors.base03}" - - # Misc colors for processes box including mini cpu graphs, details memory graph and details status text - theme[proc_misc]="#${config.colorScheme.colors.base06}" - - # CPU, Memory, Network, Proc box outline colors - theme[cpu_box]="#${config.colorScheme.colors.base0E}" #Mauve - theme[mem_box]="#${config.colorScheme.colors.base0B}" #Green - theme[net_box]="#${config.colorScheme.colors.base08}" #Maroon - theme[proc_box]="#${config.colorScheme.colors.base0D}" #Blue - - # Box divider line and small boxes line color - theme[div_line]="#${config.colorScheme.colors.base04}" - - # Temperature graph color (Green -> Yellow -> Red) - theme[temp_start]="#${config.colorScheme.colors.base0B}" - theme[temp_mid]="#${config.colorScheme.colors.base0A}" - theme[temp_end]="#${config.colorScheme.colors.base08}" - - # CPU graph colors (Teal -> Lavender) - theme[cpu_start]="#${config.colorScheme.colors.base0C}" - theme[cpu_mid]="#${config.colorScheme.colors.base0D}" - theme[cpu_end]="#${config.colorScheme.colors.base07}" - - # Mem/Disk free meter (Mauve -> Lavender -> Blue) - theme[free_start]="#${config.colorScheme.colors.base0E}" - theme[free_mid]="#${config.colorScheme.colors.base07}" - theme[free_end]="#${config.colorScheme.colors.base0D}" - - # Mem/Disk cached meter (Sapphire -> Lavender) - theme[cached_start]="#${config.colorScheme.colors.base0D}" - theme[cached_mid]="#${config.colorScheme.colors.base0D}" - theme[cached_end]="#${config.colorScheme.colors.base07}" - - # Mem/Disk available meter (Peach -> Red) - theme[available_start]="#${config.colorScheme.colors.base0F}" - theme[available_mid]="#${config.colorScheme.colors.base09}" - theme[available_end]="#${config.colorScheme.colors.base08}" - - # Mem/Disk used meter (Green -> Sky) - theme[used_start]="#${config.colorScheme.colors.base0B}" - theme[used_mid]="#${config.colorScheme.colors.base0C}" - theme[used_end]="#${config.colorScheme.colors.base0D}" - - # Download graph colors (Peach -> Red) - theme[download_start]="#${config.colorScheme.colors.base0F}" - theme[download_mid]="#${config.colorScheme.colors.base09}" - theme[download_end]="#${config.colorScheme.colors.base08}" - - # Upload graph colors (Green -> Sky) - theme[upload_start]="#${config.colorScheme.colors.base0B}" - theme[upload_mid]="#${config.colorScheme.colors.base0C}" - theme[upload_end]="#${config.colorScheme.colors.base0D}" - - # Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve) - theme[process_start]="#${config.colorScheme.colors.base0D}" - theme[process_mid]="#${config.colorScheme.colors.base0C}" - theme[process_end]="#${config.colorScheme.colors.base0E}" - ''; } diff --git a/home/features/cli/lazygit.nix b/home/features/cli/lazygit.nix index 197631e..9a74a99 100644 --- a/home/features/cli/lazygit.nix +++ b/home/features/cli/lazygit.nix @@ -1,21 +1,5 @@ {config, ...}: { programs.lazygit = { enable = true; - settings = with config.colorScheme.colors; { - gui = { - theme = { - activeBorderColor = ["#${base0D}" "bold"]; - inactiveBorderColor = ["#${base05}"]; - optionsTextColor = ["#${base0D}"]; - selectedLineBgColor = ["${base02}"]; - selectedRangeBgColor = ["${base02}"]; - cherryPickedCommitBgColor = ["#${base03}"]; - cherryPickedCommitFgColor = ["#${base0D}"]; - unstagedChangesColor = ["#${base08}"]; - defaultFgColor = ["#${base05}"]; - searchingActiveBorderColor = ["#${base0A}"]; - }; - }; - }; }; } diff --git a/home/features/coding/nvim/default.nix b/home/features/coding/nvim/default.nix index afeb677..836b833 100644 --- a/home/features/coding/nvim/default.nix +++ b/home/features/coding/nvim/default.nix @@ -6,7 +6,6 @@ ... }: let vars = import ../../../../vars.nix; - colors = config.colorScheme.colors; stableExtraPkgs = with pkgs; [ # LSP lua-language-server @@ -134,18 +133,6 @@ in { vim-nix - { - plugin = base16-nvim; - config = '' - require('base16-colorscheme').setup({ - base00 = '#${colors.base00}', base01 = '#${colors.base01}', base02 = '#${colors.base02}', base03 = '#${colors.base03}', - base04 = '#${colors.base04}', base05 = '#${colors.base05}', base06 = '#${colors.base06}', base07 = '#${colors.base07}', - base08 = '#${colors.base08}', base09 = '#${colors.base09}', base0A = '#${colors.base0A}', base0B = '#${colors.base0B}', - base0C = '#${colors.base0C}', base0D = '#${colors.base0D}', base0E = '#${colors.base0E}', base0F = '#${colors.base0F}', - })''; - type = "lua"; - } - { plugin = lualine-nvim; config = builtins.readFile ./plugin/lualine.lua; diff --git a/home/features/coding/vscode.nix b/home/features/coding/vscode.nix index d705877..d6acf9e 100644 --- a/home/features/coding/vscode.nix +++ b/home/features/coding/vscode.nix @@ -31,9 +31,6 @@ in { ]; userSettings = { #Theming - "workbench.colorTheme" = "Catppuccin Mocha"; - "catppuccin.accentColor" = "green"; - "workbench.iconTheme" = "material-icon-theme"; "window.menuBarVisibility" = "toggle"; "editor.minimap.autohide" = false; #Extensions - General diff --git a/home/features/desktop/awesome/zathura.nix b/home/features/desktop/awesome/zathura.nix index d097b69..41185f9 100644 --- a/home/features/desktop/awesome/zathura.nix +++ b/home/features/desktop/awesome/zathura.nix @@ -1,47 +1,9 @@ -{pkgs, ...}: { +{ programs.zathura = { enable = true; options = { selection-clipboard = "clipboard"; statusbar-home-tilde = true; - - default-fg = "#CDD6F4"; - default-bg = "#1E1E2E"; - - completion-bg = "#313244"; - completion-fg = "#CDD6F4"; - completion-highlight-bg = "#575268"; - completion-highlight-fg = "#CDD6F4"; - completion-group-bg = "#313244"; - completion-group-fg = "#89B4FA"; - - statusbar-fg = "#CDD6F4"; - statusbar-bg = "#313244"; - - notification-bg = "#313244"; - notification-fg = "#CDD6F4"; - notification-error-bg = "#313244"; - notification-error-fg = "#F38BA8"; - notification-warning-bg = "#313244"; - notification-warning-fg = "#FAE3B0"; - - inputbar-fg = "#CDD6F4"; - inputbar-bg = "#313244"; - - recolor-lightcolor = "#1E1E2E"; - recolor-darkcolor = "#CDD6F4"; - - index-fg = "#CDD6F4"; - index-bg = "#1E1E2E"; - index-active-fg = "#CDD6F4"; - index-active-bg = "#313244"; - - render-loading-bg = "#1E1E2E"; - render-loading-fg = "#CDD6F4"; - - highlight-color = "#575268"; - highlight-fg = "#F5C2E7"; - highlight-active-color = "#F5C2E7"; }; }; } diff --git a/home/features/desktop/common/default.nix b/home/features/desktop/common/default.nix index baa90a8..d626fdc 100644 --- a/home/features/desktop/common/default.nix +++ b/home/features/desktop/common/default.nix @@ -1,8 +1,6 @@ {pkgs, ...}: { imports = [ - ./theming.nix ./firefox.nix - ./alacritty.nix ./wezterm.nix ./font.nix ./playerctl.nix diff --git a/home/features/desktop/common/firefox.nix b/home/features/desktop/common/firefox.nix index 78188c8..e4e8609 100644 --- a/home/features/desktop/common/firefox.nix +++ b/home/features/desktop/common/firefox.nix @@ -1,10 +1,9 @@ -{ - inputs, - pkgs, - vars, - ... +{ inputs +, pkgs +, vars +, ... }: { - imports = [inputs.arkenfox.hmModules.default]; + imports = [ inputs.arkenfox.hmModules.default ]; home.file.".mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json".source = "${pkgs.plasma5Packages.plasma-browser-integration}/lib/mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json"; programs.firefox = { @@ -22,6 +21,10 @@ darkreader tabliss consent-o-matic + floccus + gesturefy + plasma-integration + libredirect # bypass-paywalls-clean ]; @@ -44,13 +47,13 @@ ]; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = ["@np"]; + definedAliases = [ "@np" ]; }; "Home Manager" = { urls = [ { - template = "https://mipmip.github.io/home-manager-option-search"; + template = "https://home-manager-options.extranix.com"; params = [ { name = "query"; @@ -61,7 +64,7 @@ ]; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = ["@hm"]; + definedAliases = [ "@hm" ]; }; "Searx" = { @@ -78,7 +81,7 @@ ]; iconUpdateURL = "https://paulgo.io/favicon.ico"; - definedAliases = ["@sx"]; + definedAliases = [ "@sx" ]; }; "Amazon" = { @@ -95,7 +98,7 @@ ]; iconUpdateURL = "https://amazon.de/favicon.ico"; - definedAliases = ["@a"]; + definedAliases = [ "@a" ]; }; "YouTube" = { @@ -112,7 +115,7 @@ ]; iconUpdateURL = "https://piped.video/favicon.ico"; - definedAliases = ["yt"]; + definedAliases = [ "yt" ]; }; }; search.force = true; @@ -187,9 +190,9 @@ }; xdg.mimeApps.defaultApplications = { - "text/html" = ["firefox.desktop"]; - "text/xml" = ["firefox.desktop"]; - "x-scheme-handler/http" = ["firefox.desktop"]; - "x-scheme-handler/https" = ["firefox.desktop"]; + "text/html" = [ "firefox.desktop" ]; + "text/xml" = [ "firefox.desktop" ]; + "x-scheme-handler/http" = [ "firefox.desktop" ]; + "x-scheme-handler/https" = [ "firefox.desktop" ]; }; } diff --git a/home/features/desktop/common/flatpak.nix b/home/features/desktop/common/flatpak.nix index b525f24..19269a7 100644 --- a/home/features/desktop/common/flatpak.nix +++ b/home/features/desktop/common/flatpak.nix @@ -3,8 +3,6 @@ services.flatpak = { remotes.flathub = "https://flathub.org/repo/flathub.flatpakrepo"; packages = [ - "flathub:app/us.zoom.Zoom//stable" - "flathub:app/com.discordapp.Discord//stable" "flathub:app/md.obsidian.Obsidian//stable" "flathub:app/com.github.iwalton3.jellyfin-media-player//stable" ]; diff --git a/home/features/desktop/common/theming.nix b/home/features/desktop/common/theming.nix deleted file mode 100644 index 1f6e5d7..0000000 --- a/home/features/desktop/common/theming.nix +++ /dev/null @@ -1,33 +0,0 @@ -{pkgs, ...}: { - home.pointerCursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; - size = 25; - x11.enable = true; - gtk.enable = true; - }; - - # gtk.cursorTheme.package = pkgs.bibata-cursors; - # gtk.cursorTheme.name = "Bibata-Modern-Ice"; - # home.file.".icons/bibata".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic"; - # xdg.dataFile."icons/bibata".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic"; - gtk = { - enable = true; - theme.package = pkgs.adw-gtk3; - theme.name = "adw-gtk3-dark"; - iconTheme.package = pkgs.papirus-icon-theme; - iconTheme.name = "Papirus"; - }; - - qt = { - enable = true; - platformTheme.name = "gtk"; - style.package = with pkgs; [adwaita-qt adwaita-qt6]; - style.name = "adwaita-dark"; - }; - - home.packages = with pkgs; [ - libsForQt5.qt5.qtquickcontrols2 - libsForQt5.qt5.qtgraphicaleffects - ]; -} diff --git a/home/features/desktop/common/wezterm.nix b/home/features/desktop/common/wezterm.nix index f26ee68..fba34a0 100644 --- a/home/features/desktop/common/wezterm.nix +++ b/home/features/desktop/common/wezterm.nix @@ -5,44 +5,11 @@ }: { programs.wezterm = { enable = true; - colorSchemes = { - "${config.colorscheme.slug}" = with config.colorScheme; { - foreground = "#${colors.base05}"; - background = "#${colors.base00}"; - - ansi = [ - "#${colors.base00}" - "#${colors.base08}" - "#${colors.base0B}" - "#${colors.base0A}" - "#${colors.base0D}" - "#${colors.base0E}" - "#${colors.base0C}" - "#${colors.base05}" - ]; - brights = [ - "#${colors.base03}" - "#${colors.base08}" - "#${colors.base0B}" - "#${colors.base0A}" - "#${colors.base0D}" - "#${colors.base0E}" - "#${colors.base0C}" - "#${colors.base07}" - ]; - cursor_fg = "#${colors.base00}"; - cursor_bg = "#${colors.base05}"; - selection_fg = "#${colors.base00}"; - selection_bg = "#${colors.base05}"; - }; - }; extraConfig = '' return { + front_end = "WebGpu", -- fixes https://github.com/wez/wezterm/issues/5990H warn_about_missing_glyphs=false, - font = wezterm.font("${config.fontProfiles.monospace.family}"), - font_size = 12.0, - window_background_opacity = 0.83, - color_scheme = "${config.colorscheme.slug}", + -- window_background_opacity = 0.83, hide_tab_bar_if_only_one_tab = true, window_close_confirmation = "NeverPrompt", use_ime = true, diff --git a/home/franz.nix b/home/franz.nix index 1097489..00cc6b5 100644 --- a/home/franz.nix +++ b/home/franz.nix @@ -8,11 +8,8 @@ in { ./global ./features/coding/nvim ./features/coding/tmux.nix - inputs.nix-colors.homeManagerModules.default ]; - colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; - home.file.".docker" = { source = ../rsc/docker/franz; recursive = true; diff --git a/home/ludwig.nix b/home/ludwig.nix index 655dbe6..deaf984 100644 --- a/home/ludwig.nix +++ b/home/ludwig.nix @@ -10,12 +10,10 @@ in { ./features/desktop/awesome ./features/desktop/gnome ./features/coding - inputs.nix-colors.homeManagerModules.default ]; home.packages = with pkgs; [nextcloud-client]; - colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; nixpkgs = { config = { permittedInsecurePackages = [ diff --git a/hosts/common/optional/stylix.nix b/hosts/common/optional/stylix.nix new file mode 100644 index 0000000..40f618a --- /dev/null +++ b/hosts/common/optional/stylix.nix @@ -0,0 +1,37 @@ +{ + inputs, + pkgs, + ... +}: { + imports = [inputs.stylix.nixosModules.stylix]; + + stylix = { + enable = true; + polarity = "dark"; + image = ../../../rsc/wallpaper/rolltreppe-gluehwein.jpg; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + + # targets = {nixvim.transparentBackground.signColumn = true;}; + + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Ice"; + size = 25; + }; + + fonts = { + monospace = { + package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}; + name = "JetBrainsMono Nerd Font Mono"; + }; + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + serif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Serif"; + }; + }; + }; +} diff --git a/hosts/ludwig/default.nix b/hosts/ludwig/default.nix index c9765a2..2b8aa3e 100644 --- a/hosts/ludwig/default.nix +++ b/hosts/ludwig/default.nix @@ -35,6 +35,7 @@ ../common/optional/udisks.nix ../common/optional/tailscale.nix ../common/optional/fhs-compat.nix + ../common/optional/stylix.nix ]; nixpkgs = { diff --git a/rsc/config/awesome/theme.lua b/rsc/config/awesome/theme.lua index e756bd3..23e17c6 100644 --- a/rsc/config/awesome/theme.lua +++ b/rsc/config/awesome/theme.lua @@ -17,7 +17,7 @@ local my_table = awful.util.table or gears.table -- 4.{0,1} compatibility local theme = {} theme.dir = os.getenv("HOME") .. "/.config/awesome/" theme.wallpaper_dir = os.getenv("HOME") .. "/.wallpapers/" -theme.wallpaper = theme.wallpaper_dir .. "/rolltreppe-glühwein.jpg" +theme.wallpaper = theme.wallpaper_dir .. "/rolltreppe-gluehwein.jpg" theme.font = "JetBrainsMono Nerd Font 9" theme.fg_normal = colors.text theme.fg_focus = colors.teal diff --git a/rsc/wallpaper/rolltreppe-glühwein.jpg b/rsc/wallpaper/rolltreppe-gluehwein.jpg similarity index 100% rename from rsc/wallpaper/rolltreppe-glühwein.jpg rename to rsc/wallpaper/rolltreppe-gluehwein.jpg