From e6837ea3683ed66911271be3aff2bad0a0b46b76 Mon Sep 17 00:00:00 2001 From: Natasha Moongrave Date: Tue, 31 Mar 2026 13:04:58 +0200 Subject: Enabled nixowos after fix with interaction with stylix --- flake.lock | 476 +++++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 18 +- home/mun/default.nix | 2 +- system/default.nix | 2 +- system/stylix.nix | 3 + 5 files changed, 475 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 86e9177..c9e2336 100755 --- a/flake.lock +++ b/flake.lock @@ -83,6 +83,31 @@ "type": "github" } }, + "denix": { + "inputs": { + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_2", + "nixpkgs-lib": "nixpkgs-lib", + "robotnix": "robotnix", + "systems": "systems" + }, + "locked": { + "lastModified": 1774893532, + "narHash": "sha256-MBMtvy1Zli/+UW9krsS07bulGO0wCyLv9shST9mY16U=", + "owner": "yunfachi", + "repo": "denix", + "rev": "1b68eac63c79d120596fba1ad7fe1d5735a6a0e2", + "type": "github" + }, + "original": { + "owner": "yunfachi", + "ref": "rewrite", + "repo": "denix", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -91,11 +116,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1774887814, - "narHash": "sha256-8bsvr2SgW9t70nFxUdMVQg4RSU+E/y9+Je4urivtOYE=", + "lastModified": 1774942139, + "narHash": "sha256-Wib0RDVsptJWQd2ldBgFpMF0kRjQKHejQq9an+ActYo=", "owner": "nix-community", "repo": "fenix", - "rev": "9b6c1cb49eff1346e1f5d2430994a0ba0fa02910", + "rev": "0beafd2252f80385610e2f12cbecfdb9d2dfb0a0", "type": "github" }, "original": { @@ -120,7 +145,73 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -141,6 +232,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "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" + } + }, "fromYaml": { "flake": false, "locked": { @@ -157,6 +266,91 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1769069492, + "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1774861927, + "narHash": "sha256-FB1fbeJQjaTMI2JFAa0LNMaYXiShiYbJA6puGQC4xdg=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "9c4469b68b62e122c3b3d2ab0ed3caeb04ff1ac4", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nixowos", + "denix", + "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" + } + }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "nixowos", + "git-hooks-nix", + "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": { @@ -197,22 +391,140 @@ "type": "github" } }, + "home-manager_2": { + "locked": { + "dir": "home-manager", + "lastModified": 1769406695, + "narHash": "sha256-djao88Yt82Oedn9vVKU6eJSK2xEy0AgWChiZcX/x+NY=", + "owner": "yunfachi", + "repo": "missingFlake", + "rev": "850beb1c6244c41d1fc922adc81e46e870841e8a", + "type": "github" + }, + "original": { + "dir": "home-manager", + "owner": "yunfachi", + "repo": "missingFlake", + "type": "github" + } + }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixowos", + "nuschtos-search", + "flake-utils" + ], + "nixpkgs": [ + "nixowos", + "nuschtos-search", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.1.1", + "repo": "ixx", + "type": "github" + } + }, + "nix-darwin": { + "locked": { + "dir": "nix-darwin", + "lastModified": 1769406695, + "narHash": "sha256-djao88Yt82Oedn9vVKU6eJSK2xEy0AgWChiZcX/x+NY=", + "owner": "yunfachi", + "repo": "missingFlake", + "rev": "850beb1c6244c41d1fc922adc81e46e870841e8a", + "type": "github" + }, + "original": { + "dir": "nix-darwin", + "owner": "yunfachi", + "repo": "missingFlake", + "type": "github" + } + }, + "nixowos": { + "inputs": { + "denix": "denix", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": [ + "nixpkgs" + ], + "nuschtos-search": "nuschtos-search", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1774944723, + "narHash": "sha256-AzrVSWamxAVVH4YNbq6xADhP+vvw8rBlb+nM3+ZScpo=", + "owner": "yunfachi", + "repo": "NixOwOS", + "rev": "eb548655ad9b96f49bf85a6758f1f1fc7f0674e7", + "type": "github" + }, + "original": { + "owner": "yunfachi", + "repo": "NixOwOS", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1774388614, - "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", - "owner": "nixos", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-25.11", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1769304017, + "narHash": "sha256-TE1EHvIAz81IGUKTmKQehbc9hjuxF7pe/QWdQuy/Ijc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "d4c8053ce1d9ba28bfb69a9f9f23ac24d313d4e8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1774709303, @@ -229,6 +541,54 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1769170682, + "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c5296fdd05cfa2c187990dd909864da9658df755", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1770073757, + "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47472570b1e607482890801aeaf29bfb749884f6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1774799055, + "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -254,12 +614,53 @@ "type": "github" } }, + "nuschtos-search": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "nixowos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773607461, + "narHash": "sha256-9gKVKVmdcel4ACBHVqZ6zSPJ3nVHfNoWocv2rzjbJOw=", + "owner": "NuschtOS", + "repo": "search", + "rev": "3e49b4205b3083f7e45075bd2f7a722f6a4ce195", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, + "robotnix": { + "locked": { + "dir": "robotnix", + "lastModified": 1769406695, + "narHash": "sha256-djao88Yt82Oedn9vVKU6eJSK2xEy0AgWChiZcX/x+NY=", + "owner": "yunfachi", + "repo": "missingFlake", + "rev": "850beb1c6244c41d1fc922adc81e46e870841e8a", + "type": "github" + }, + "original": { + "dir": "robotnix", + "owner": "yunfachi", + "repo": "missingFlake", + "type": "github" + } + }, "root": { "inputs": { "crane": "crane", "fenix": "fenix", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixowos": "nixowos", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "stylix": "stylix" } @@ -267,11 +668,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1774787924, - "narHash": "sha256-Cbpmf0+1pqi/zbpub2vkp5lTPx3QdVtDkkagDwQzHHg=", + "lastModified": 1774903498, + "narHash": "sha256-iJUfApxI0eq6GL6NaVmMn7xf6GVNb9w6BF0d4Hy7TKU=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "f1297b21119565c626320c1ffc248965fffb2527", + "rev": "a75b500a010062cd2589be6a4b76f84f6a816943", "type": "github" }, "original": { @@ -288,13 +689,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur", - "systems": "systems", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -331,6 +732,51 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index f3d9519..914ab99 100644 --- a/flake.nix +++ b/flake.nix @@ -13,10 +13,10 @@ }; # NixOwOs theming - disabled until fixed - # nixowos = { - # url = "github:TashaTheInnkeeper/nixowos"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + nixowos = { + url = "github:yunfachi/NixOwOS"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Theming - centralized color management stylix = { @@ -38,7 +38,7 @@ self, nixpkgs, nixpkgs-unstable, - # nixowos, + nixowos, home-manager, stylix, fenix, @@ -67,9 +67,9 @@ useUserPackages = true; extraSpecialArgs = {inherit inputs;}; users.mun = import ./home/mun; - # sharedModules = [ - # nixowos.homeModules.default - # ]; + sharedModules = [ + nixowos.homeModules.default + ]; }; }; @@ -89,7 +89,7 @@ ./hosts/${hostname}/configuration.nix ./system home-manager.nixosModules.home-manager - # nixowos.nixosModules.default + nixowos.nixosModules.default stylix.nixosModules.stylix homeManagerModule ]; diff --git a/home/mun/default.nix b/home/mun/default.nix index 8ac1a3a..579c998 100644 --- a/home/mun/default.nix +++ b/home/mun/default.nix @@ -6,7 +6,7 @@ ../rices/nord-blue ]; - # nixowos.enable = true; # disabled until fixed + nixowos.enable = true; # disabled until fixed home = { username = "mun"; diff --git a/system/default.nix b/system/default.nix index ceb8a33..66874bf 100644 --- a/system/default.nix +++ b/system/default.nix @@ -14,6 +14,6 @@ ./stylix.nix ]; - # nixowos.enable = true; # disabled until fixed + nixowos.enable = true; # disabled until fixed system.stateVersion = "25.11"; } diff --git a/system/stylix.nix b/system/stylix.nix index 02afafc..4a9e89a 100644 --- a/system/stylix.nix +++ b/system/stylix.nix @@ -71,5 +71,8 @@ # Polarity (dark or light theme) polarity = "dark"; + + # Disable nixos-icons to avoid conflict with NixOS icon handling + targets.nixos-icons.enable = false; }; } -- cgit v1.2.3