diff --git a/flake.lock b/flake.lock index f6c8df2b..2bdfd49b 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1721135360, - "narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=", + "lastModified": 1728852607, + "narHash": "sha256-PhJdr8b4nZVHts5KMEsf7vCDXVpFIFCa7VlCt+oYpL4=", "owner": "anyrun-org", "repo": "anyrun", - "rev": "c6101a31a80b51e32e96f6a77616b609770172e0", + "rev": "6e0385f6945d701545edc5bccfc5f544e1e12663", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1728326504, - "narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=", + "lastModified": 1728902391, + "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0", + "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", "type": "github" }, "original": { @@ -74,37 +74,20 @@ "type": "github" } }, - "cachix": { - "locked": { - "lastModified": 1635350005, - "narHash": "sha256-tAMJnUwfaDEB2aa31jGcu7R7bzGELM9noc91L2PbVjg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-20.09", - "repo": "nixpkgs", - "type": "github" - } - }, "chaotic": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager_2", "jovian": "jovian", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1728555019, - "narHash": "sha256-S75yO06WNQrddMdy9LhuqjQbcFORbxkYdq01hwNGo2c=", - "rev": "61e275745dc53a5b4a840fc12193f31dcaaa49a6", - "revCount": 1446, + "lastModified": 1729092978, + "narHash": "sha256-2SMJFFgKSvrQfkfzdcYjwFGvgeoCtDdbl/CGZNIU7hs=", + "rev": "9af42c96e8d666f1df2b087aba1a6349f1c22f4e", + "revCount": 1456, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1446%2Brev-61e275745dc53a5b4a840fc12193f31dcaaa49a6/019275fc-48ed-7570-8e76-c8b22c049f6e/source.tar.gz?rev=61e275745dc53a5b4a840fc12193f31dcaaa49a6&revCount=1446" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1456%2Brev-9af42c96e8d666f1df2b087aba1a6349f1c22f4e/019295fc-24f9-7d1b-a753-8e461947e187/source.tar.gz?rev=9af42c96e8d666f1df2b087aba1a6349f1c22f4e&revCount=1456" }, "original": { "type": "tarball", @@ -112,27 +95,6 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "nixpkgs": [ "helix-flake", @@ -153,19 +115,13 @@ "type": "github" } }, - "crane_3": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, + "crane_2": { "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1728776144, + "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "f876e3d905b922502f031aeec1a84490122254b7", "type": "github" }, "original": { @@ -196,89 +152,23 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1728455642, - "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=", - "owner": "nix-community", - "repo": "fenix", - "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1728542061, - "narHash": "sha256-2YAnVU67qimQGO71rCBWcv7RrRK5gYgysXe3NVomuwQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b135535125e24270dddddc8cfab455533492e4ad", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "firefox-nightly": { - "inputs": { - "cachix": "cachix", - "flake-compat": "flake-compat", - "lib-aggregate": "lib-aggregate", - "mozilla": "mozilla", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728563537, - "narHash": "sha256-uRb95ZdWwX/DW/beOjB0BOdp3IzoG3YvkUMWDUT9uVs=", - "owner": "nix-community", - "repo": "flake-firefox-nightly", - "rev": "d1709519546ac07adcdfbb1ce4f8c751bc8494c8", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-firefox-nightly", - "type": "github" - } - }, "flake-compat": { "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } }, "flake-compat_2": { + "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -309,22 +199,6 @@ "type": "github" } }, - "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": [ @@ -333,11 +207,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -374,11 +248,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -423,24 +297,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": [ "systems" @@ -460,9 +316,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1709126324, @@ -478,59 +334,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_9" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "freetype2": { - "flake": false, - "locked": { - "lastModified": 1687587065, - "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", - "type": "github" - }, - "original": { - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -577,11 +380,11 @@ }, "hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -590,58 +393,19 @@ "type": "github" } }, - "harfbuzz": { - "flake": false, - "locked": { - "lastModified": 1711722720, - "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", - "owner": "harfbuzz", - "repo": "harfbuzz", - "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", - "type": "github" - }, - "original": { - "owner": "harfbuzz", - "ref": "8.4.0", - "repo": "harfbuzz", - "type": "github" - } - }, - "helix": { - "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1726100921, - "narHash": "sha256-HCvWDEQ5kxOk3+nXzQQlxC/9oSpAZOW5rFoQQXe1TWM=", - "owner": "SoraTenshi", - "repo": "helix", - "rev": "77e8d3fef5dde1e544d75ed0ffa9c1a89245f1a4", - "type": "github" - }, - "original": { - "owner": "SoraTenshi", - "ref": "new-daily-driver", - "repo": "helix", - "type": "github" - } - }, "helix-flake": { "inputs": { - "crane": "crane_2", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5", - "rust-overlay": "rust-overlay_2" + "crane": "crane", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728372216, - "narHash": "sha256-amGNilpQ/vohlgerF/5D4QNsXCRbh2H06nmWyz/xyS8=", + "lastModified": 1729068734, + "narHash": "sha256-JOqmdtcdQohQL1qvTDrVJvd+nkydRm+Lyf3qVF5iQ5E=", "owner": "helix-editor", "repo": "helix", - "rev": "761f70d61179f38152e76c1f224589a53b62d00f", + "rev": "d1b8129491124ce6068e95ccc58a7fefb1c9db45", "type": "github" }, "original": { @@ -682,11 +446,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1729171802, + "narHash": "sha256-Eip3uI+XeyAfBoQXpkm/F7eG3M7AgvzSyhyJdzxVt74=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "9c1a1c7df49a9b28539ccb509b36d0b81e41391c", "type": "github" }, "original": { @@ -724,11 +488,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -753,11 +517,11 @@ ] }, "locked": { - "lastModified": 1727821604, - "narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -807,17 +571,17 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_6", + "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1728554473, - "narHash": "sha256-wzVeYNRedx8aAi8NsUvBbPJAilozHp+mC49NUKYk73c=", + "lastModified": 1729174818, + "narHash": "sha256-Mi2D5p4cJ9FQBTBPLHmYZF+xSGiwf6mwVQ+RspnS+z0=", "ref": "refs/heads/main", - "rev": "b65773bea9b912a41cfcbc789fb2e60a07e3d0c1", - "revCount": 5325, + "rev": "495b92fb535f51a38e5130e6b89bd1fb01ce8cfb", + "revCount": 5350, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -923,11 +687,11 @@ ] }, "locked": { - "lastModified": 1728135019, - "narHash": "sha256-OCUyEfD9g5232OILgW+BpjFVPM8AHl2WM59yRabJvSE=", + "lastModified": 1729175038, + "narHash": "sha256-4eTSbHMPUgap+63YW2IJreM//HL/meaGR0r5IOonH9g=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "eb63207ef051c62fa2ab010b3f89da263a397329", + "rev": "b8080862869af28bafdafb512682d414d9de063a", "type": "github" }, "original": { @@ -982,11 +746,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -1054,11 +818,11 @@ ] }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1728974938, + "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "23170582b0658e6afd913149a58863af3a57b376", "type": "github" }, "original": { @@ -1069,19 +833,19 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_3", - "flake-compat": "flake-compat_4", + "crane": "crane_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1729064530, + "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", "type": "github" }, "original": { @@ -1090,45 +854,9 @@ "type": "github" } }, - "lib-aggregate": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1728216729, - "narHash": "sha256-HsisE2yMld0LckvQ3v/00bXFg11E5Q2XI8taPUewDPA=", - "owner": "nix-community", - "repo": "lib-aggregate", - "rev": "6c4cf448d33ce86bcc06c6d50bcecc33666105ee", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lib-aggregate", - "type": "github" - } - }, - "libpng": { - "flake": false, - "locked": { - "lastModified": 1549245649, - "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", - "owner": "glennrp", - "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", - "type": "github" - }, - "original": { - "owner": "glennrp", - "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", - "type": "github" - } - }, "microfetch": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1723918449, @@ -1144,22 +872,6 @@ "type": "github" } }, - "mozilla": { - "flake": false, - "locked": { - "lastModified": 1704373101, - "narHash": "sha256-+gi59LRWRQmwROrmE1E2b3mtocwueCQqZ60CwLG+gbg=", - "owner": "mozilla", - "repo": "nixpkgs-mozilla", - "rev": "9b11a87c0cc54e308fa83aac5b4ee1816d5418a2", - "type": "github" - }, - "original": { - "owner": "mozilla", - "repo": "nixpkgs-mozilla", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": [ @@ -1171,11 +883,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1728524343, - "narHash": "sha256-6qDR3ffmFshj13BiyfL/RJXGuoWDLU0HP5CV+pEpFe4=", + "lastModified": 1729108264, + "narHash": "sha256-Jj0/IfDG9VpiByg823MjaDy6LIbUPjEfqsbqhJvI1RA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "86a897dc1f57eeac03ebedfbc8f7e1269081d164", + "rev": "dd69b3d1751f0ba03711585cd0c03eae8ac93ea2", "type": "github" }, "original": { @@ -1218,11 +930,11 @@ ] }, "locked": { - "lastModified": 1728526974, - "narHash": "sha256-ZlH8LJsV+f1ZkucTyPkcweggaOwr2PmHUbOxlpjIVV0=", + "lastModified": 1729132252, + "narHash": "sha256-XSO33nj+i8W3kP6t6KbQdNtXc9Jag2HVLXZOoyPEK1w=", "owner": "nixpak", "repo": "nixpak", - "rev": "68d178e5299fa04df483f4eb39c108157a17fad2", + "rev": "53304ed6ec4edb0e156c269951b922fe7fed8336", "type": "github" }, "original": { @@ -1247,28 +959,13 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1728176478, - "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-small": { "locked": { - "lastModified": 1728534991, - "narHash": "sha256-wLUZyvtOOowAz0kTrU2MoC4nXWniFaVezGyzuEt5HPc=", + "lastModified": 1729164558, + "narHash": "sha256-dgla/HMyeUIbs0Qtd9DLB4BKFNz+Z8rUO0pbaW5ie2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b955bdbb9efe4a5c047746323951fe1bdf8d01b", + "rev": "8bddc04f2eecdadeb2a7ab3674bdafc27b933f76", "type": "github" }, "original": { @@ -1310,29 +1007,13 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1344,11 +1025,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1376,15 +1057,15 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", - "owner": "nixos", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1392,27 +1073,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728897630, + "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc", "type": "github" }, "original": { @@ -1422,7 +1087,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1722719969, "narHash": "sha256-E47qbT/mRtBCSZra+9S9208sp/QnNeOAq7EhHX+eMNE=", @@ -1437,13 +1102,13 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1453,13 +1118,29 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { - "lastModified": 1728573732, - "narHash": "sha256-jzU9aHWYdfhSsPLH9eEXK0+mbxmINwBVbov/S7y+6GQ=", + "lastModified": 1729180066, + "narHash": "sha256-sUGEUHLx95k/EDnyHCQ/9zJN2eoKShvp3NME1rG5LVQ=", "owner": "nix-community", "repo": "NUR", - "rev": "0ac2d4c3a921159bfa187ed8a55f9361ceee0962", + "rev": "42479f1604fa30d150be27d33bd71ea0bcc1bb8d", "type": "github" }, "original": { @@ -1470,7 +1151,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -1479,11 +1160,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -1506,11 +1187,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -1524,13 +1205,10 @@ "agenix": "agenix", "anyrun": "anyrun", "chaotic": "chaotic", - "fenix": "fenix_2", - "firefox-nightly": "firefox-nightly", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "hardware": "hardware", - "helix": "helix", "helix-flake": "helix-flake", "hm": "hm", "hypridle": "hypridle", @@ -1542,56 +1220,21 @@ "microfetch": "microfetch", "nix-gaming": "nix-gaming", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-small": "nixpkgs-small", "nur": "nur", - "systems": "systems_7", - "tuirun": "tuirun", - "wezterm": "wezterm" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1728386838, - "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1728505432, - "narHash": "sha256-QFPMazeiGLo7AGy4RREmTgko0Quch/toMVKhGUjDEeo=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "0fb804acb375b02a3beeaceeb75b71969ef37b15", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" + "systems": "systems_5", + "tuirun": "tuirun" } }, "rust-overlay": { "inputs": { "flake-utils": [ - "helix", + "helix-flake", "flake-utils" ], "nixpkgs": [ - "helix", + "helix-flake", "nixpkgs" ] }, @@ -1610,31 +1253,6 @@ } }, "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "helix-flake", - "flake-utils" - ], - "nixpkgs": [ - "helix-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -1642,32 +1260,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1728959392, + "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { - "inputs": { - "nixpkgs": [ - "wezterm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726280639, - "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "e9f8641c92f26fd1e076e705edb12147c384171d", + "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "type": "github" }, "original": { @@ -1723,31 +1320,31 @@ }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1766,56 +1363,11 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tuirun": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_10", - "systems": "systems_8" + "nixpkgs": "nixpkgs_9", + "systems": "systems_6" }, "locked": { "lastModified": 1727200565, @@ -1840,11 +1392,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1728517090, - "narHash": "sha256-6rIJ9cz63NIoL69Ix/ZwUSfKJIhoItkDJUJauSxMPX0=", + "lastModified": 1729184579, + "narHash": "sha256-vRpXdpqeiBkEUUvoB5lkhuyHHTSWL9FOcq31ytKfMcQ=", "ref": "refs/heads/main", - "rev": "cfe955f42b0fed574fd1f5bc4165f7491a775c25", - "revCount": 751, + "rev": "dacc6c8338c1bd27e2b63c98e6488c2f0ca2ec85", + "revCount": 792, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" @@ -1856,35 +1408,6 @@ "url": "https://github.com/Open-Wine-Components/umu-launcher/" } }, - "wezterm": { - "inputs": { - "flake-utils": "flake-utils_5", - "freetype2": "freetype2", - "harfbuzz": "harfbuzz", - "libpng": "libpng", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_4", - "zlib": "zlib" - }, - "locked": { - "dir": "nix", - "lastModified": 1728322634, - "narHash": "sha256-cUnwLCSc59Sx3E+meVlVUMfyROr0aToWPID7UA6PZvg=", - "owner": "wez", - "repo": "wezterm", - "rev": "ed430415ee69279ea692358525196ad7d4c965b8", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "wez", - "ref": "main", - "repo": "wezterm", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1925,23 +1448,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zlib": { - "flake": false, - "locked": { - "lastModified": 1484501380, - "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", - "owner": "madler", - "repo": "zlib", - "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", - "type": "github" - }, - "original": { - "owner": "madler", - "ref": "v1.2.11", - "repo": "zlib", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 924e1819..ef8eaa29 100644 --- a/flake.nix +++ b/flake.nix @@ -6,8 +6,9 @@ systems = ["x86_64-linux"]; imports = [ - ./home + ./users ./hosts + ./modules ]; perSystem = {pkgs, ...}: { @@ -89,7 +90,6 @@ chaotic.url = "https://flakehub.com/f/chaotic-cx/nyx/*.tar.gz"; # Miscellaneous - helix.url = "github:SoraTenshi/helix/new-daily-driver"; helix-flake.url = "github:helix-editor/helix"; nix-gaming = { @@ -100,11 +100,6 @@ }; }; - firefox-nightly = { - url = "github:nix-community/flake-firefox-nightly"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nur.url = "github:nix-community/NUR"; anyrun.url = "github:anyrun-org/anyrun"; @@ -112,15 +107,10 @@ agenix.url = "github:ryantm/agenix"; # Rust toolchain - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - wezterm = { - url = "github:wez/wezterm/main?dir=nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # fenix = { + # url = "github:nix-community/fenix"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # Custom apps tuirun.url = "git+https://git.sr.ht/~canasta/tuirun"; diff --git a/home/README.md b/home/README.md deleted file mode 100644 index 20cda585..00000000 --- a/home/README.md +++ /dev/null @@ -1,18 +0,0 @@ -``` -home -├── etc -├── modules -│   ├── browsers -│   ├── comm -│   ├── devtools -│   ├── gaming -│   ├── terminal -│   ├── userd -│   ├── utils -│   └── wm -│   ├── hyprland -│   └── utils -└── users - ├── cnst - └── toothpick -``` diff --git a/home/etc/dconf/default.nix b/home/etc/dconf/default.nix deleted file mode 100644 index 984c9159..00000000 --- a/home/etc/dconf/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - dconf = { - settings = { - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - }; - }; - }; -} diff --git a/home/etc/default.nix b/home/etc/default.nix deleted file mode 100644 index dad23a7c..00000000 --- a/home/etc/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ - # shared imports - ./dconf - ./polkit - ./gtk - ./xdg - ]; -} diff --git a/home/modules/default.nix b/home/modules/default.nix deleted file mode 100644 index 63627e92..00000000 --- a/home/modules/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{umodPath, ...}: { - imports = [ - "${umodPath}/browsers/chromium" - "${umodPath}/browsers/firefox" - "${umodPath}/comm/discord" - "${umodPath}/devtools/neovim" - "${umodPath}/devtools/vscode" - "${umodPath}/devtools/helix" - "${umodPath}/gaming/lutris" - "${umodPath}/gaming/mangohud" - "${umodPath}/terminal/alacritty" - "${umodPath}/terminal/foot" - "${umodPath}/terminal/kitty" - "${umodPath}/terminal/wezterm" - "${umodPath}/terminal/zellij" - "${umodPath}/userd/copyq" - "${umodPath}/userd/blueman-applet" - "${umodPath}/userd/mako" - "${umodPath}/userd/udiskie" - "${umodPath}/userd/gpg" - "${umodPath}/userd/syncthing" - "${umodPath}/utils/anyrun" - "${umodPath}/utils/misc" - "${umodPath}/utils/rofi" - "${umodPath}/utils/waybar" - "${umodPath}/utils/yazi" - "${umodPath}/utils/zathura" - "${umodPath}/utils/tuirun" - "${umodPath}/utils/eza" - "${umodPath}/utils/ssh" - "${umodPath}/wm/hyprland" - "${umodPath}/wm/utils/hypridle" - "${umodPath}/wm/utils/hyprlock" - "${umodPath}/wm/utils/hyprpaper" - ]; -} diff --git a/home/users/cnst/cpmodules.nix b/home/users/cnst/cpmodules.nix deleted file mode 100644 index 5c1aacf0..00000000 --- a/home/users/cnst/cpmodules.nix +++ /dev/null @@ -1,107 +0,0 @@ -{lib, ...}: let - inherit (lib) mkForce; -in { - userModules = { - browsers = { - # firefox = { - # enable = mkForce true; - # }; - chromium = { - enable = mkForce false; - }; - }; - # comm = { - # discord = { - # enable = mkForce true; - # }; - # }; - # devtools = { - # neovim = { - # enable = mkForce true; - # }; - # vscode = { - # enable = mkForce false; - # }; - # helix = { - # enable = mkForce true; - # }; - # }; - # gaming = { - # lutris = { - # enable = mkForce false; - # }; - # mangohud = { - # enable = mkForce false; - # }; - # }; - terminal = { - # alacritty = { - # enable = mkForce true; - # }; - # foot = { - # enable = mkForce true; - # }; - # kitty = { - # enable = mkForce true; - # }; - wezterm = { - enable = mkForce false; - }; - # zellij = { - # enable = mkForce false; - # }; - }; - # userd = { - # copyq = { - # enable = mkForce true; - # }; - # mako = { - # enable = mkForce true; - # }; - # udiskie = { - # enable = mkForce true; - # }; - # }; - # utils = { - # anyrun = { - # enable = mkForce false; - # }; - # rofi = { - # enable = mkForce false; - # }; - # waybar = { - # enable = mkForce true; - # }; - # yazi = { - # enable = mkForce true; - # }; - # zathura = { - # enable = mkForce true; - # }; - # misc = { - # enable = mkForce true; - # }; - # }; - # wm = { - # hyprland = { - # cnst = { - # enable = mkForce true; - # }; - # toothpick = { - # enable = mkForce false; - # }; - # }; - # utils = { - # hypridle = { - # enable = mkForce true; - # }; - # hyprlock = { - # enable = mkForce true; - # }; - # hyprpaper = { - # enable = mkForce true; - # }; - # }; - # }; - }; -} diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix index 9704a26b..9ec0c845 100644 --- a/hosts/cnix/modules.nix +++ b/hosts/cnix/modules.nix @@ -1,5 +1,5 @@ { - systemModules = { + system = { boot = { loader = { default = { @@ -17,12 +17,12 @@ }; }; gaming = { - steam = { - enable = true; - }; - gamescope = { - enable = true; - }; + # steam = { + # enable = true; + # }; + # gamescope = { + # enable = true; + # }; lutris = { enable = true; }; @@ -70,15 +70,6 @@ }; }; }; - nix = { - nh = { - enable = true; - clean = { - enable = true; - extraArgs = "--keep 3 --keep-since 21d"; - }; - }; - }; studio = { blender = { enable = true; @@ -201,6 +192,13 @@ enable = true; }; }; + nh = { + enable = true; + clean = { + enable = true; + extraArgs = "--keep 3 --keep-since 21d"; + }; + }; npm = { enable = true; }; diff --git a/hosts/cnixpad/modules.nix b/hosts/cnixpad/modules.nix index 49015850..abf2ea61 100644 --- a/hosts/cnixpad/modules.nix +++ b/hosts/cnixpad/modules.nix @@ -1,5 +1,5 @@ { - systemModules = { + system = { boot = { loader = { default.enable = true; diff --git a/hosts/default.nix b/hosts/default.nix index 0e12e1d0..58034956 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -11,11 +11,11 @@ systemConfig = "${self}/system"; hostConfig = "${self}/hosts"; - cnstConfig = "${self}/home/users/cnst"; - toothpickConfig = "${self}/home/users/toothpick"; + cnstConfig = "${self}/users/cnst"; + toothpickConfig = "${self}/users/toothpick"; - umodPath = "${self}/home/modules"; - smodPath = "${self}/system/modules"; + umodPath = "${self}/modules/home"; + smodPath = "${self}/modules/system"; # shorten paths inherit (inputs.nixpkgs.lib) nixosSystem; @@ -41,6 +41,7 @@ extraSpecialArgs = specialArgs; }; } + self.nixosModules.system inputs.chaotic.nixosModules.default inputs.agenix.nixosModules.default ]; diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix index ecc43312..e290beca 100644 --- a/hosts/toothpc/modules.nix +++ b/hosts/toothpc/modules.nix @@ -1,5 +1,5 @@ { - systemModules = { + system = { boot = { loader = { default.enable = false; diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 00000000..c27c9d5c --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,119 @@ +{ + flake.nixosModules = { + home = { + imports = [ + ./home/browsers/chromium + ./home/browsers/firefox + + ./home/comm/discord + + ./home/devtools/helix + ./home/devtools/neovim + ./home/devtools/vscode + + ./home/gaming/steam + + ./home/terminal/alacritty + ./home/terminal/foot + ./home/terminal/kitty + ./home/terminal/wezterm + ./home/terminal/zellij + + ./home/userd/blueman-applet + ./home/userd/copyq + ./home/userd/dconf + ./home/userd/gpg + ./home/userd/gtk + ./home/userd/mako + ./home/userd/polkit + ./home/userd/syncthing + ./home/userd/udiskie + ./home/userd/xdg + + ./home/utils/anyrun + ./home/utils/eza + ./home/utils/misc + ./home/utils/mpv + ./home/utils/rofi + ./home/utils/ssh + ./home/utils/tuirun + ./home/utils/waybar + ./home/utils/yazi + ./home/utils/zathura + + ./home/wm/hyprland + ./home/wm/utils/hypridle + ./home/wm/utils/hyprlock + ./home/wm/utils/hyprpaper + ]; + }; + system = { + imports = [ + ./system/boot/loader + ./system/boot/kernel + + ./system/gaming/gamemode + ./system/gaming/gamescope + ./system/gaming/lutris + ./system/gaming/steam + + ./system/gui/gnome + ./system/gui/hyprland + + ./system/hardware/bluetooth + ./system/hardware/graphics/amd + ./system/hardware/graphics/nvidia + ./system/hardware/logitech + ./system/hardware/network + + ./system/studio/blender + ./system/studio/gimp + ./system/studio/inkscape + ./system/studio/beekeeper + ./system/studio/mysql-workbench + + ./system/sysd/network/blueman + ./system/sysd/network/mullvad + ./system/sysd/network/samba + ./system/sysd/network/openssh + + ./system/sysd/security/agenix + ./system/sysd/security/gnome-keyring + + ./system/sysd/session/dbus + ./system/sysd/session/dconf + ./system/sysd/session/xserver + + ./system/sysd/system/fwupd + ./system/sysd/system/greetd + ./system/sysd/system/gvfs + ./system/sysd/system/locate + ./system/sysd/system/nix-ld + ./system/sysd/system/pcscd + ./system/sysd/system/pipewire + ./system/sysd/system/powerd + ./system/sysd/system/udisks + ./system/sysd/system/zram + ./system/sysd/system/kanata + + ./system/utils/android + ./system/utils/anyrun + ./system/utils/brightnessctl + ./system/utils/chaotic + ./system/utils/corectrl + ./system/utils/microfetch + ./system/utils/misc + ./system/utils/nh + ./system/utils/npm + ./system/utils/obsidian + ./system/utils/yubikey + ./system/utils/zsh + ]; + }; + options = { + imports = [ + ./options/monitors + ]; + }; + }; +} diff --git a/home/modules/browsers/chromium/default.nix b/modules/home/browsers/chromium/default.nix similarity index 80% rename from home/modules/browsers/chromium/default.nix rename to modules/home/browsers/chromium/default.nix index 70870d08..ec27b901 100644 --- a/home/modules/browsers/chromium/default.nix +++ b/modules/home/browsers/chromium/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.browsers.chromium; + cfg = config.home.browsers.chromium; in { options = { - userModules.browsers.chromium.enable = mkEnableOption "Enables chromium"; + home.browsers.chromium.enable = mkEnableOption "Enables chromium"; }; config = mkIf cfg.enable { programs.chromium = { diff --git a/home/modules/browsers/firefox/default.nix b/modules/home/browsers/firefox/default.nix similarity index 91% rename from home/modules/browsers/firefox/default.nix rename to modules/home/browsers/firefox/default.nix index 150d63bd..2e29a95a 100644 --- a/home/modules/browsers/firefox/default.nix +++ b/modules/home/browsers/firefox/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.browsers.firefox; + cfg = config.home.browsers.firefox; in { imports = [ inputs.nur.hmModules.nur ]; options = { - userModules.browsers.firefox.enable = mkEnableOption "Enables firefox"; + home.browsers.firefox.enable = mkEnableOption "Enables firefox"; }; config = mkIf cfg.enable { programs.firefox = { diff --git a/home/modules/comm/discord/default.nix b/modules/home/comm/discord/default.nix similarity index 93% rename from home/modules/comm/discord/default.nix rename to modules/home/comm/discord/default.nix index 4af7aedc..59843e2c 100644 --- a/home/modules/comm/discord/default.nix +++ b/modules/home/comm/discord/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.comm.discord; + cfg = config.home.comm.discord; in { options = { - userModules.comm.discord.enable = mkEnableOption "Enables discord"; + home.comm.discord.enable = mkEnableOption "Enables discord"; }; config = mkIf cfg.enable { home.packages = with pkgs; [vesktop]; diff --git a/home/modules/devtools/helix/default.nix b/modules/home/devtools/helix/default.nix similarity index 97% rename from home/modules/devtools/helix/default.nix rename to modules/home/devtools/helix/default.nix index 89e2d11e..5d208bca 100644 --- a/home/modules/devtools/helix/default.nix +++ b/modules/home/devtools/helix/default.nix @@ -6,7 +6,7 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.devtools.helix; + cfg = config.home.devtools.helix; in { imports = [ ./lang.nix @@ -14,7 +14,7 @@ in { ]; options = { - userModules.devtools.helix.enable = mkEnableOption "Enable helix"; + home.devtools.helix.enable = mkEnableOption "Enable helix"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/helix/lang.nix b/modules/home/devtools/helix/lang.nix similarity index 100% rename from home/modules/devtools/helix/lang.nix rename to modules/home/devtools/helix/lang.nix diff --git a/home/modules/devtools/helix/theme.nix b/modules/home/devtools/helix/theme.nix similarity index 100% rename from home/modules/devtools/helix/theme.nix rename to modules/home/devtools/helix/theme.nix diff --git a/home/modules/devtools/neovim/default.nix b/modules/home/devtools/neovim/default.nix similarity index 97% rename from home/modules/devtools/neovim/default.nix rename to modules/home/devtools/neovim/default.nix index 500bd208..44fdf73b 100644 --- a/home/modules/devtools/neovim/default.nix +++ b/modules/home/devtools/neovim/default.nix @@ -5,7 +5,7 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.devtools.neovim; + cfg = config.home.devtools.neovim; in { imports = [ ./plugins @@ -15,7 +15,7 @@ in { ]; options = { - userModules.devtools.neovim.enable = mkEnableOption "Enable neovim"; + home.devtools.neovim.enable = mkEnableOption "Enable neovim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/neovim/keybindings.nix b/modules/home/devtools/neovim/keybindings.nix similarity index 100% rename from home/modules/devtools/neovim/keybindings.nix rename to modules/home/devtools/neovim/keybindings.nix diff --git a/home/modules/devtools/neovim/lsp.nix b/modules/home/devtools/neovim/lsp.nix similarity index 100% rename from home/modules/devtools/neovim/lsp.nix rename to modules/home/devtools/neovim/lsp.nix diff --git a/home/modules/devtools/neovim/plugins/alpha.nix b/modules/home/devtools/neovim/plugins/alpha.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/alpha.nix rename to modules/home/devtools/neovim/plugins/alpha.nix diff --git a/home/modules/devtools/neovim/plugins/autopairs.nix b/modules/home/devtools/neovim/plugins/autopairs.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/autopairs.nix rename to modules/home/devtools/neovim/plugins/autopairs.nix diff --git a/home/modules/devtools/neovim/plugins/bqf.nix b/modules/home/devtools/neovim/plugins/bqf.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/bqf.nix rename to modules/home/devtools/neovim/plugins/bqf.nix diff --git a/home/modules/devtools/neovim/plugins/bufferline.nix b/modules/home/devtools/neovim/plugins/bufferline.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/bufferline.nix rename to modules/home/devtools/neovim/plugins/bufferline.nix diff --git a/home/modules/devtools/neovim/plugins/colorizer.nix b/modules/home/devtools/neovim/plugins/colorizer.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/colorizer.nix rename to modules/home/devtools/neovim/plugins/colorizer.nix diff --git a/home/modules/devtools/neovim/plugins/comment.nix b/modules/home/devtools/neovim/plugins/comment.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/comment.nix rename to modules/home/devtools/neovim/plugins/comment.nix diff --git a/home/modules/devtools/neovim/plugins/conform.nix b/modules/home/devtools/neovim/plugins/conform.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/conform.nix rename to modules/home/devtools/neovim/plugins/conform.nix diff --git a/home/modules/devtools/neovim/plugins/copilot.nix b/modules/home/devtools/neovim/plugins/copilot.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/copilot.nix rename to modules/home/devtools/neovim/plugins/copilot.nix diff --git a/home/modules/devtools/neovim/plugins/default.nix b/modules/home/devtools/neovim/plugins/default.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/default.nix rename to modules/home/devtools/neovim/plugins/default.nix diff --git a/home/modules/devtools/neovim/plugins/fidget.nix b/modules/home/devtools/neovim/plugins/fidget.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/fidget.nix rename to modules/home/devtools/neovim/plugins/fidget.nix diff --git a/home/modules/devtools/neovim/plugins/fugitive.nix b/modules/home/devtools/neovim/plugins/fugitive.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/fugitive.nix rename to modules/home/devtools/neovim/plugins/fugitive.nix diff --git a/home/modules/devtools/neovim/plugins/gitsigns.nix b/modules/home/devtools/neovim/plugins/gitsigns.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/gitsigns.nix rename to modules/home/devtools/neovim/plugins/gitsigns.nix diff --git a/home/modules/devtools/neovim/plugins/gx.nix b/modules/home/devtools/neovim/plugins/gx.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/gx.nix rename to modules/home/devtools/neovim/plugins/gx.nix diff --git a/home/modules/devtools/neovim/plugins/lualine.nix b/modules/home/devtools/neovim/plugins/lualine.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/lualine.nix rename to modules/home/devtools/neovim/plugins/lualine.nix diff --git a/home/modules/devtools/neovim/plugins/none-ls.nix b/modules/home/devtools/neovim/plugins/none-ls.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/none-ls.nix rename to modules/home/devtools/neovim/plugins/none-ls.nix diff --git a/home/modules/devtools/neovim/plugins/oil.nix b/modules/home/devtools/neovim/plugins/oil.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/oil.nix rename to modules/home/devtools/neovim/plugins/oil.nix diff --git a/home/modules/devtools/neovim/plugins/plenary.nix b/modules/home/devtools/neovim/plugins/plenary.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/plenary.nix rename to modules/home/devtools/neovim/plugins/plenary.nix diff --git a/home/modules/devtools/neovim/plugins/range-highlight.nix b/modules/home/devtools/neovim/plugins/range-highlight.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/range-highlight.nix rename to modules/home/devtools/neovim/plugins/range-highlight.nix diff --git a/home/modules/devtools/neovim/plugins/treesitter.nix b/modules/home/devtools/neovim/plugins/treesitter.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/treesitter.nix rename to modules/home/devtools/neovim/plugins/treesitter.nix diff --git a/home/modules/devtools/neovim/plugins/web-devicons.nix b/modules/home/devtools/neovim/plugins/web-devicons.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/web-devicons.nix rename to modules/home/devtools/neovim/plugins/web-devicons.nix diff --git a/home/modules/devtools/neovim/plugins/which-key.nix b/modules/home/devtools/neovim/plugins/which-key.nix similarity index 100% rename from home/modules/devtools/neovim/plugins/which-key.nix rename to modules/home/devtools/neovim/plugins/which-key.nix diff --git a/home/modules/devtools/neovim/syntaxes.nix b/modules/home/devtools/neovim/syntaxes.nix similarity index 100% rename from home/modules/devtools/neovim/syntaxes.nix rename to modules/home/devtools/neovim/syntaxes.nix diff --git a/home/modules/devtools/nixvim/autocmd.nix b/modules/home/devtools/nixvim/autocmd.nix similarity index 100% rename from home/modules/devtools/nixvim/autocmd.nix rename to modules/home/devtools/nixvim/autocmd.nix diff --git a/home/modules/devtools/nixvim/completion.nix b/modules/home/devtools/nixvim/completion.nix similarity index 100% rename from home/modules/devtools/nixvim/completion.nix rename to modules/home/devtools/nixvim/completion.nix diff --git a/home/modules/devtools/nixvim/default.nix b/modules/home/devtools/nixvim/default.nix similarity index 90% rename from home/modules/devtools/nixvim/default.nix rename to modules/home/devtools/nixvim/default.nix index 379f16cf..fb7e63d3 100644 --- a/home/modules/devtools/nixvim/default.nix +++ b/modules/home/devtools/nixvim/default.nix @@ -6,7 +6,7 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.devtools.nixvim; + cfg = config.home.devtools.nixvim; in { imports = [ inputs.nixvim.homeManagerModules.nixvim @@ -18,7 +18,7 @@ in { ]; options = { - userModules.devtools.nixvim.enable = mkEnableOption "Enable nixvim"; + home.devtools.nixvim.enable = mkEnableOption "Enable nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/keymap.nix b/modules/home/devtools/nixvim/keymap.nix similarity index 100% rename from home/modules/devtools/nixvim/keymap.nix rename to modules/home/devtools/nixvim/keymap.nix diff --git a/home/modules/devtools/nixvim/options.nix b/modules/home/devtools/nixvim/options.nix similarity index 100% rename from home/modules/devtools/nixvim/options.nix rename to modules/home/devtools/nixvim/options.nix diff --git a/home/modules/devtools/nixvim/plugins/barbar.nix b/modules/home/devtools/nixvim/plugins/barbar.nix similarity index 65% rename from home/modules/devtools/nixvim/plugins/barbar.nix rename to modules/home/devtools/nixvim/plugins/barbar.nix index 818db01d..fefdc107 100644 --- a/home/modules/devtools/nixvim/plugins/barbar.nix +++ b/modules/home/devtools/nixvim/plugins/barbar.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.barbar; + cfg = config.home.devtools.nixvim.plugins.barbar; in { options = { - userModules.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim"; + home.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/cmp.nix b/modules/home/devtools/nixvim/plugins/cmp.nix similarity index 97% rename from home/modules/devtools/nixvim/plugins/cmp.nix rename to modules/home/devtools/nixvim/plugins/cmp.nix index 204eb10f..942b39bc 100644 --- a/home/modules/devtools/nixvim/plugins/cmp.nix +++ b/modules/home/devtools/nixvim/plugins/cmp.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.cmp; + cfg = config.home.devtools.nixvim.plugins.cmp; in { options = { - userModules.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim"; + home.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/comment.nix b/modules/home/devtools/nixvim/plugins/comment.nix similarity index 63% rename from home/modules/devtools/nixvim/plugins/comment.nix rename to modules/home/devtools/nixvim/plugins/comment.nix index 04a9b6d3..01d618d9 100644 --- a/home/modules/devtools/nixvim/plugins/comment.nix +++ b/modules/home/devtools/nixvim/plugins/comment.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.comment; + cfg = config.home.devtools.nixvim.plugins.comment; in { options = { - userModules.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim"; + home.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/conform.nix b/modules/home/devtools/nixvim/plugins/conform.nix similarity index 85% rename from home/modules/devtools/nixvim/plugins/conform.nix rename to modules/home/devtools/nixvim/plugins/conform.nix index 7fa00d81..29e5c83c 100644 --- a/home/modules/devtools/nixvim/plugins/conform.nix +++ b/modules/home/devtools/nixvim/plugins/conform.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.conform; + cfg = config.home.devtools.nixvim.plugins.conform; in { options = { - userModules.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim"; + home.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/copilot.nix b/modules/home/devtools/nixvim/plugins/copilot.nix similarity index 87% rename from home/modules/devtools/nixvim/plugins/copilot.nix rename to modules/home/devtools/nixvim/plugins/copilot.nix index f0a8ae53..caa5ca3a 100644 --- a/home/modules/devtools/nixvim/plugins/copilot.nix +++ b/modules/home/devtools/nixvim/plugins/copilot.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.copilot; + cfg = config.home.devtools.nixvim.plugins.copilot; in { options = { - userModules.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim"; + home.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/default.nix b/modules/home/devtools/nixvim/plugins/default.nix similarity index 100% rename from home/modules/devtools/nixvim/plugins/default.nix rename to modules/home/devtools/nixvim/plugins/default.nix diff --git a/home/modules/devtools/nixvim/plugins/efm.nix b/modules/home/devtools/nixvim/plugins/efm.nix similarity index 93% rename from home/modules/devtools/nixvim/plugins/efm.nix rename to modules/home/devtools/nixvim/plugins/efm.nix index 7663e4d4..a274b27e 100644 --- a/home/modules/devtools/nixvim/plugins/efm.nix +++ b/modules/home/devtools/nixvim/plugins/efm.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.efm; + cfg = config.home.devtools.nixvim.plugins.efm; in { options = { - userModules.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim"; + home.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/floaterm.nix b/modules/home/devtools/nixvim/plugins/floaterm.nix similarity index 63% rename from home/modules/devtools/nixvim/plugins/floaterm.nix rename to modules/home/devtools/nixvim/plugins/floaterm.nix index e09fd22e..98d51e11 100644 --- a/home/modules/devtools/nixvim/plugins/floaterm.nix +++ b/modules/home/devtools/nixvim/plugins/floaterm.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.floaterm; + cfg = config.home.devtools.nixvim.plugins.floaterm; in { options = { - userModules.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim"; + home.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/harpoon.nix b/modules/home/devtools/nixvim/plugins/harpoon.nix similarity index 72% rename from home/modules/devtools/nixvim/plugins/harpoon.nix rename to modules/home/devtools/nixvim/plugins/harpoon.nix index d48c659a..cc528ab3 100644 --- a/home/modules/devtools/nixvim/plugins/harpoon.nix +++ b/modules/home/devtools/nixvim/plugins/harpoon.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.harpoon; + cfg = config.home.devtools.nixvim.plugins.harpoon; in { options = { - userModules.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim"; + home.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/lightline.nix b/modules/home/devtools/nixvim/plugins/lightline.nix similarity index 83% rename from home/modules/devtools/nixvim/plugins/lightline.nix rename to modules/home/devtools/nixvim/plugins/lightline.nix index 08052418..2420f120 100644 --- a/home/modules/devtools/nixvim/plugins/lightline.nix +++ b/modules/home/devtools/nixvim/plugins/lightline.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.lightline; + cfg = config.home.devtools.nixvim.plugins.lightline; in { options = { - userModules.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim"; + home.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/lsp-format.nix b/modules/home/devtools/nixvim/plugins/lsp-format.nix similarity index 80% rename from home/modules/devtools/nixvim/plugins/lsp-format.nix rename to modules/home/devtools/nixvim/plugins/lsp-format.nix index f27c1b3e..068d5656 100644 --- a/home/modules/devtools/nixvim/plugins/lsp-format.nix +++ b/modules/home/devtools/nixvim/plugins/lsp-format.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.lsp-format; + cfg = config.home.devtools.nixvim.plugins.lsp-format; in { options = { - userModules.devtools.nixvim.plugins.lsp-format = { + home.devtools.nixvim.plugins.lsp-format = { enable = mkEnableOption "Enables LSP formatting support for nixvim"; }; }; diff --git a/home/modules/devtools/nixvim/plugins/lsp.nix b/modules/home/devtools/nixvim/plugins/lsp.nix similarity index 94% rename from home/modules/devtools/nixvim/plugins/lsp.nix rename to modules/home/devtools/nixvim/plugins/lsp.nix index b944762b..1b7b9021 100644 --- a/home/modules/devtools/nixvim/plugins/lsp.nix +++ b/modules/home/devtools/nixvim/plugins/lsp.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.lsp; + cfg = config.home.devtools.nixvim.plugins.lsp; in { options = { - userModules.devtools.nixvim.plugins.lsp = { + home.devtools.nixvim.plugins.lsp = { enable = mkEnableOption "Enables LSP support for nixvim"; }; }; diff --git a/home/modules/devtools/nixvim/plugins/lualine.nix b/modules/home/devtools/nixvim/plugins/lualine.nix similarity index 91% rename from home/modules/devtools/nixvim/plugins/lualine.nix rename to modules/home/devtools/nixvim/plugins/lualine.nix index 7a13defd..e03d9bf8 100644 --- a/home/modules/devtools/nixvim/plugins/lualine.nix +++ b/modules/home/devtools/nixvim/plugins/lualine.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.lualine; + cfg = config.home.devtools.nixvim.plugins.lualine; in { options = { - userModules.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim"; + home.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/markdown-preview.nix b/modules/home/devtools/nixvim/plugins/markdown-preview.nix similarity index 71% rename from home/modules/devtools/nixvim/plugins/markdown-preview.nix rename to modules/home/devtools/nixvim/plugins/markdown-preview.nix index f8b5e936..8b412c98 100644 --- a/home/modules/devtools/nixvim/plugins/markdown-preview.nix +++ b/modules/home/devtools/nixvim/plugins/markdown-preview.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.markdown-preview; + cfg = config.home.devtools.nixvim.plugins.markdown-preview; in { options = { - userModules.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim"; + home.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/neo-tree.nix b/modules/home/devtools/nixvim/plugins/neo-tree.nix similarity index 75% rename from home/modules/devtools/nixvim/plugins/neo-tree.nix rename to modules/home/devtools/nixvim/plugins/neo-tree.nix index d28e0e92..63b3004c 100644 --- a/home/modules/devtools/nixvim/plugins/neo-tree.nix +++ b/modules/home/devtools/nixvim/plugins/neo-tree.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.neo-tree; + cfg = config.home.devtools.nixvim.plugins.neo-tree; in { options = { - userModules.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim"; + home.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/nonels.nix b/modules/home/devtools/nixvim/plugins/nonels.nix similarity index 88% rename from home/modules/devtools/nixvim/plugins/nonels.nix rename to modules/home/devtools/nixvim/plugins/nonels.nix index 466dbb16..33b72dca 100644 --- a/home/modules/devtools/nixvim/plugins/nonels.nix +++ b/modules/home/devtools/nixvim/plugins/nonels.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.none-ls; + cfg = config.home.devtools.nixvim.plugins.none-ls; in { options = { - userModules.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim"; + home.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/rustaceanvim.nix b/modules/home/devtools/nixvim/plugins/rustaceanvim.nix similarity index 79% rename from home/modules/devtools/nixvim/plugins/rustaceanvim.nix rename to modules/home/devtools/nixvim/plugins/rustaceanvim.nix index 488aa21f..f90ac832 100644 --- a/home/modules/devtools/nixvim/plugins/rustaceanvim.nix +++ b/modules/home/devtools/nixvim/plugins/rustaceanvim.nix @@ -4,9 +4,9 @@ ... }: with lib; let - cfg = config.userModules.devtools.nixvim.plugins.rustaceanvim; + cfg = config.home.devtools.nixvim.plugins.rustaceanvim; in { - options.userModules.devtools.nixvim.plugins.rustaceanvim = { + options.home.devtools.nixvim.plugins.rustaceanvim = { enable = mkEnableOption "Whether to enable rustaceanvim."; }; diff --git a/home/modules/devtools/nixvim/plugins/startify.nix b/modules/home/devtools/nixvim/plugins/startify.nix similarity index 87% rename from home/modules/devtools/nixvim/plugins/startify.nix rename to modules/home/devtools/nixvim/plugins/startify.nix index 184b6902..c3dc1723 100644 --- a/home/modules/devtools/nixvim/plugins/startify.nix +++ b/modules/home/devtools/nixvim/plugins/startify.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.startify; + cfg = config.home.devtools.nixvim.plugins.startify; in { options = { - userModules.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim"; + home.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/tagbar.nix b/modules/home/devtools/nixvim/plugins/tagbar.nix similarity index 71% rename from home/modules/devtools/nixvim/plugins/tagbar.nix rename to modules/home/devtools/nixvim/plugins/tagbar.nix index bdcca0bc..7b07af26 100644 --- a/home/modules/devtools/nixvim/plugins/tagbar.nix +++ b/modules/home/devtools/nixvim/plugins/tagbar.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.tagbar; + cfg = config.home.devtools.nixvim.plugins.tagbar; in { options = { - userModules.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim"; + home.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/telescope.nix b/modules/home/devtools/nixvim/plugins/telescope.nix similarity index 81% rename from home/modules/devtools/nixvim/plugins/telescope.nix rename to modules/home/devtools/nixvim/plugins/telescope.nix index ef33161d..d5d7ebb2 100644 --- a/home/modules/devtools/nixvim/plugins/telescope.nix +++ b/modules/home/devtools/nixvim/plugins/telescope.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.telescope; + cfg = config.home.devtools.nixvim.plugins.telescope; in { options = { - userModules.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim"; + home.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/treesitter.nix b/modules/home/devtools/nixvim/plugins/treesitter.nix similarity index 86% rename from home/modules/devtools/nixvim/plugins/treesitter.nix rename to modules/home/devtools/nixvim/plugins/treesitter.nix index 499ad1c7..6b91de9b 100644 --- a/home/modules/devtools/nixvim/plugins/treesitter.nix +++ b/modules/home/devtools/nixvim/plugins/treesitter.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.treesitter; + cfg = config.home.devtools.nixvim.plugins.treesitter; in { options = { - userModules.devtools.nixvim.plugins = { + home.devtools.nixvim.plugins = { treesitter.enable = mkEnableOption "Enables Treesitter plugin for nixvim"; }; }; diff --git a/home/modules/devtools/nixvim/plugins/vimtex.nix b/modules/home/devtools/nixvim/plugins/vimtex.nix similarity index 91% rename from home/modules/devtools/nixvim/plugins/vimtex.nix rename to modules/home/devtools/nixvim/plugins/vimtex.nix index 6d5ee55f..01e64198 100644 --- a/home/modules/devtools/nixvim/plugins/vimtex.nix +++ b/modules/home/devtools/nixvim/plugins/vimtex.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.vimtex; + cfg = config.home.devtools.nixvim.plugins.vimtex; in { options = { - userModules.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim"; + home.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/plugins/yanky.nix b/modules/home/devtools/nixvim/plugins/yanky.nix similarity index 54% rename from home/modules/devtools/nixvim/plugins/yanky.nix rename to modules/home/devtools/nixvim/plugins/yanky.nix index 1d2764ca..d8ef6dfd 100644 --- a/home/modules/devtools/nixvim/plugins/yanky.nix +++ b/modules/home/devtools/nixvim/plugins/yanky.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.userModules.devtools.nixvim.plugins.yanky; + cfg = config.home.devtools.nixvim.plugins.yanky; in { options = { - userModules.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim"; + home.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim"; }; config = mkIf cfg.enable { diff --git a/home/modules/devtools/nixvim/todo.nix b/modules/home/devtools/nixvim/todo.nix similarity index 100% rename from home/modules/devtools/nixvim/todo.nix rename to modules/home/devtools/nixvim/todo.nix diff --git a/home/modules/devtools/vscode/default.nix b/modules/home/devtools/vscode/default.nix similarity index 60% rename from home/modules/devtools/vscode/default.nix rename to modules/home/devtools/vscode/default.nix index 9078558b..25aefb45 100644 --- a/home/modules/devtools/vscode/default.nix +++ b/modules/home/devtools/vscode/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.devtools.vscode; + cfg = config.home.devtools.vscode; in { options = { - userModules.devtools.vscode.enable = mkEnableOption "Enables vscode"; + home.devtools.vscode.enable = mkEnableOption "Enables vscode"; }; config = mkIf cfg.enable { programs.vscode = { diff --git a/home/modules/gaming/lutris/default.nix b/modules/home/gaming/lutris/default.nix similarity index 74% rename from home/modules/gaming/lutris/default.nix rename to modules/home/gaming/lutris/default.nix index 8103d773..09ade237 100644 --- a/home/modules/gaming/lutris/default.nix +++ b/modules/home/gaming/lutris/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.gaming.lutris; + cfg = config.home.gaming.lutris; in { options = { - userModules.gaming.lutris.enable = mkEnableOption "Enables lutris"; + home.gaming.lutris.enable = mkEnableOption "Enables lutris"; }; config = mkIf cfg.enable { home.packages = [ diff --git a/home/modules/gaming/mangohud/default.nix b/modules/home/gaming/mangohud/default.nix similarity index 65% rename from home/modules/gaming/mangohud/default.nix rename to modules/home/gaming/mangohud/default.nix index 99b77de5..82e5558a 100644 --- a/home/modules/gaming/mangohud/default.nix +++ b/modules/home/gaming/mangohud/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.gaming.mangohud; + cfg = config.home.gaming.mangohud; in { options = { - userModules.gaming.mangohud.enable = mkEnableOption "Enables mangohud"; + home.gaming.mangohud.enable = mkEnableOption "Enables mangohud"; }; config = mkIf cfg.enable { programs.mangohud = { diff --git a/modules/home/gaming/steam/default.nix b/modules/home/gaming/steam/default.nix new file mode 100644 index 00000000..f3f728b5 --- /dev/null +++ b/modules/home/gaming/steam/default.nix @@ -0,0 +1,64 @@ +# Yanked from Misterio77 +{ + pkgs, + lib, + config, + ... +}: let + inherit (lib) mkIf mkEnableOption concatStringsSep head filter getExe; + cfg = config.home.gaming.steam; + steam-with-pkgs = pkgs.steam.override { + extraPkgs = pkgs: + with pkgs; [ + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXScrnSaver + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib + libkrb5 + keyutils + gamescope + ]; + }; + + monitor = head (filter (m: m.primary) config.monitors); + steam-session = let + gamescope = concatStringsSep " " [ + (getExe pkgs.gamescope) + "--output-width ${toString monitor.width}" + "--output-height ${toString monitor.height}" + "--framerate-limit ${toString monitor.refreshRate}" + "--prefer-output ${monitor.name}" + # "--adaptive-sync" + "--expose-wayland" + "--hdr-enabled" + "--steam" + ]; + steam = concatStringsSep " " [ + "steam" + "steam://open/bigpicture" + ]; + in + pkgs.writeTextDir "share/wayland-sessions/steam-sesson.desktop" # ini + + '' + [Desktop Entry] + Name=Steam Session + Exec=${gamescope} -- ${steam} + Type=Application + ''; +in { + options = { + home.gaming.steam.enable = mkEnableOption "Enables steam"; + }; + config = { + home.packages = mkIf cfg.enable [ + steam-with-pkgs + steam-session + pkgs.gamescope + ]; + }; +} diff --git a/home/modules/terminal/alacritty/default.nix b/modules/home/terminal/alacritty/default.nix similarity index 93% rename from home/modules/terminal/alacritty/default.nix rename to modules/home/terminal/alacritty/default.nix index eb4be755..21c89701 100644 --- a/home/modules/terminal/alacritty/default.nix +++ b/modules/home/terminal/alacritty/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.terminal.alacritty; + cfg = config.home.terminal.alacritty; in { options = { - userModules.terminal.alacritty.enable = mkEnableOption "Enables firefox"; + home.terminal.alacritty.enable = mkEnableOption "Enables firefox"; }; config = mkIf cfg.enable { programs.alacritty = { diff --git a/home/modules/terminal/foot/default.nix b/modules/home/terminal/foot/default.nix similarity index 98% rename from home/modules/terminal/foot/default.nix rename to modules/home/terminal/foot/default.nix index 0882be7d..3f88d1ed 100644 --- a/home/modules/terminal/foot/default.nix +++ b/modules/home/terminal/foot/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.terminal.foot; + cfg = config.home.terminal.foot; in { options = { - userModules.terminal.foot.enable = mkEnableOption "Enables foot terminal"; + home.terminal.foot.enable = mkEnableOption "Enables foot terminal"; }; config = mkIf cfg.enable { programs.foot = { diff --git a/home/modules/terminal/kitty/default.nix b/modules/home/terminal/kitty/default.nix similarity index 96% rename from home/modules/terminal/kitty/default.nix rename to modules/home/terminal/kitty/default.nix index d6503e32..16b1f0c7 100644 --- a/home/modules/terminal/kitty/default.nix +++ b/modules/home/terminal/kitty/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.terminal.kitty; + cfg = config.home.terminal.kitty; in { options = { - userModules.terminal.kitty.enable = mkEnableOption "Enables kitty terminal"; + home.terminal.kitty.enable = mkEnableOption "Enables kitty terminal"; }; config = mkIf cfg.enable { programs.kitty = { diff --git a/home/modules/terminal/wezterm/default.nix b/modules/home/terminal/wezterm/default.nix similarity index 94% rename from home/modules/terminal/wezterm/default.nix rename to modules/home/terminal/wezterm/default.nix index 00dd06ed..828a68e4 100644 --- a/home/modules/terminal/wezterm/default.nix +++ b/modules/home/terminal/wezterm/default.nix @@ -9,10 +9,10 @@ weztermPkg = pkgs.wezterm; # weztermFlake = inputs.wezterm.packages.${pkgs.system}.default; inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.terminal.wezterm; + cfg = config.home.terminal.wezterm; in { options = { - userModules.terminal.wezterm.enable = mkEnableOption "Enables wezterm terminal"; + home.terminal.wezterm.enable = mkEnableOption "Enables wezterm terminal"; }; config = mkIf cfg.enable { programs.wezterm = { diff --git a/home/modules/terminal/zellij/default.nix b/modules/home/terminal/zellij/default.nix similarity index 95% rename from home/modules/terminal/zellij/default.nix rename to modules/home/terminal/zellij/default.nix index b5a070e1..8a0a9891 100644 --- a/home/modules/terminal/zellij/default.nix +++ b/modules/home/terminal/zellij/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.terminal.zellij; + cfg = config.home.terminal.zellij; in { options = { - userModules.terminal.zellij.enable = mkEnableOption "Enables zellij"; + home.terminal.zellij.enable = mkEnableOption "Enables zellij"; }; config = mkIf cfg.enable { programs.zellij = { diff --git a/home/modules/userd/blueman-applet/default.nix b/modules/home/userd/blueman-applet/default.nix similarity index 58% rename from home/modules/userd/blueman-applet/default.nix rename to modules/home/userd/blueman-applet/default.nix index b458d78a..9c27f606 100644 --- a/home/modules/userd/blueman-applet/default.nix +++ b/modules/home/userd/blueman-applet/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.userd.blueman-applet; + cfg = config.home.userd.blueman-applet; in { options = { - userModules.userd.blueman-applet.enable = mkEnableOption "Enables blueman-applet"; + home.userd.blueman-applet.enable = mkEnableOption "Enables blueman-applet"; }; config = mkIf cfg.enable { services.blueman-applet = { diff --git a/home/modules/userd/copyq/default.nix b/modules/home/userd/copyq/default.nix similarity index 62% rename from home/modules/userd/copyq/default.nix rename to modules/home/userd/copyq/default.nix index a4de728e..c866bc2f 100644 --- a/home/modules/userd/copyq/default.nix +++ b/modules/home/userd/copyq/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.userd.copyq; + cfg = config.home.userd.copyq; in { options = { - userModules.userd.copyq.enable = mkEnableOption "Enables copyq"; + home.userd.copyq.enable = mkEnableOption "Enables copyq"; }; config = mkIf cfg.enable { services.copyq = { diff --git a/modules/home/userd/dconf/default.nix b/modules/home/userd/dconf/default.nix new file mode 100644 index 00000000..648845f4 --- /dev/null +++ b/modules/home/userd/dconf/default.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + ... +}: let + inherit (lib) types mkOption; + cfg = config.home.userd.dconf; +in { + options = { + home.userd.dconf.settings.color-scheme = mkOption { + type = types.str; + default = "prefer-dark"; + }; + }; + config = { + dconf = { + settings = { + "org/gnome/desktop/interface" = { + color-scheme = cfg.settings.color-scheme; + }; + }; + }; + }; +} diff --git a/home/modules/userd/gpg/default.nix b/modules/home/userd/gpg/default.nix similarity index 67% rename from home/modules/userd/gpg/default.nix rename to modules/home/userd/gpg/default.nix index 8fe21227..003c09fa 100644 --- a/home/modules/userd/gpg/default.nix +++ b/modules/home/userd/gpg/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.userd.gpg; + cfg = config.home.userd.gpg; in { options = { - userModules.userd.gpg.enable = mkEnableOption "Enables gpg"; + home.userd.gpg.enable = mkEnableOption "Enables gpg"; }; config = mkIf cfg.enable { services.gpg-agent = { diff --git a/home/etc/gtk/default.nix b/modules/home/userd/gtk/default.nix similarity index 100% rename from home/etc/gtk/default.nix rename to modules/home/userd/gtk/default.nix diff --git a/modules/home/userd/gtk/wip.nix b/modules/home/userd/gtk/wip.nix new file mode 100644 index 00000000..13a21e5a --- /dev/null +++ b/modules/home/userd/gtk/wip.nix @@ -0,0 +1,140 @@ +{ + config, + pkgs, + lib, + ... +}: let + inherit (lib) types mkOption mkIf; + cfg = config.home.userd.gtk; +in { + options = { + home.userd.gtk.enable = mkOption { + type = types.bool; + default = true; + description = "Enable GTK configuration."; + }; + + home.userd.gtk.theme = mkOption { + type = types.str; + default = "Orchis-Grey-Dark-Compact"; + description = "GTK theme name."; + }; + + home.userd.gtk.themePackage = mkOption { + type = types.package; + default = pkgs.orchis-theme; + description = "GTK theme package."; + }; + + home.userd.gtk.iconTheme = mkOption { + type = types.str; + default = "Adwaita"; + description = "GTK icon theme name."; + }; + + home.userd.gtk.iconThemePackage = mkOption { + type = types.package; + default = pkgs.adwaita-icon-theme; + description = "GTK icon theme package."; + }; + + home.userd.gtk.font = mkOption { + type = types.attrsOf types.anything; + default = { + name = "Input Sans Narrow Light"; + size = 10; + }; + description = "GTK font configuration."; + }; + + home.userd.gtk.cursorTheme = mkOption { + type = types.attrsOf types.anything; + default = { + name = "Adwaita"; + size = 28; + package = pkgs.adwaita-icon-theme; + }; + description = "Cursor theme configuration."; + }; + }; + + config = mkIf cfg.enable { + home = { + packages = [pkgs.glib]; + + pointerCursor = { + package = cfg.cursorTheme.package; + name = cfg.cursorTheme.name; + size = cfg.cursorTheme.size; + gtk.enable = true; + x11.enable = true; + }; + }; + + gtk = { + enable = true; + + theme = { + package = cfg.themePackage; + name = cfg.theme; + }; + + iconTheme = { + package = cfg.iconThemePackage; + name = cfg.iconTheme; + }; + + font = { + name = cfg.font.name; + size = cfg.font.size; + }; + + cursorTheme = { + package = cfg.cursorTheme.package; + name = cfg.cursorTheme.name; + size = cfg.cursorTheme.size; + }; + + gtk2 = { + extraConfig = '' + gtk-xft-antialias=1 + gtk-xft-hinting=1 + gtk-xft-hintstyle="hintslight" + gtk-xft-rgba="rgb" + ''; + }; + + gtk3.extraConfig = { + gtk-application-prefer-dark-theme = true; + + gtk-decoration-layout = "appmenu:none"; + gtk-toolbar-style = "GTK_TOOLBAR_BOTH"; + gtk-toolbar-icon-size = "GTK_ICON_SIZE_LARGE_TOOLBAR"; + gtk-button-images = 1; + gtk-menu-images = 1; + + gtk-error-bell = 0; + gtk-enable-event-sounds = 0; + gtk-enable-input-feedback-sounds = 0; + + gtk-xft-antialias = 1; + gtk-xft-hinting = 1; + gtk-xft-hintstyle = "hintslight"; + }; + + gtk4.extraConfig = { + gtk-application-prefer-dark-theme = true; + + gtk-decoration-layout = "appmenu:none"; + + gtk-error-bell = 0; + gtk-enable-event-sounds = 0; + gtk-enable-input-feedback-sounds = 0; + + gtk-xft-antialias = 1; + gtk-xft-hinting = 1; + gtk-xft-hintstyle = "hintslight"; + }; + }; + }; +} diff --git a/home/modules/userd/mako/default.nix b/modules/home/userd/mako/default.nix similarity index 88% rename from home/modules/userd/mako/default.nix rename to modules/home/userd/mako/default.nix index b7b80077..4894841f 100644 --- a/home/modules/userd/mako/default.nix +++ b/modules/home/userd/mako/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.userd.mako; + cfg = config.home.userd.mako; in { options = { - userModules.userd.mako.enable = mkEnableOption "Enables mako"; + home.userd.mako.enable = mkEnableOption "Enables mako"; }; config = mkIf cfg.enable { services.mako = { diff --git a/home/etc/polkit/default.nix b/modules/home/userd/polkit/default.nix similarity index 100% rename from home/etc/polkit/default.nix rename to modules/home/userd/polkit/default.nix diff --git a/home/modules/userd/syncthing/default.nix b/modules/home/userd/syncthing/default.nix similarity index 63% rename from home/modules/userd/syncthing/default.nix rename to modules/home/userd/syncthing/default.nix index ac1ffe66..d4f79735 100644 --- a/home/modules/userd/syncthing/default.nix +++ b/modules/home/userd/syncthing/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.userd.syncthing; + cfg = config.home.userd.syncthing; in { options = { - userModules.userd.syncthing.enable = mkEnableOption "Enables syncthing"; + home.userd.syncthing.enable = mkEnableOption "Enables syncthing"; }; config = mkIf cfg.enable { services.syncthing = { diff --git a/home/modules/userd/udiskie/default.nix b/modules/home/userd/udiskie/default.nix similarity index 66% rename from home/modules/userd/udiskie/default.nix rename to modules/home/userd/udiskie/default.nix index 789baadf..39380232 100644 --- a/home/modules/userd/udiskie/default.nix +++ b/modules/home/userd/udiskie/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.userd.udiskie; + cfg = config.home.userd.udiskie; in { options = { - userModules.userd.udiskie.enable = mkEnableOption "Enables udiskie"; + home.userd.udiskie.enable = mkEnableOption "Enables udiskie"; }; config = mkIf cfg.enable { services.udiskie = { diff --git a/home/etc/xdg/default.nix b/modules/home/userd/xdg/default.nix similarity index 100% rename from home/etc/xdg/default.nix rename to modules/home/userd/xdg/default.nix diff --git a/home/modules/utils/anyrun/default.nix b/modules/home/utils/anyrun/default.nix similarity index 74% rename from home/modules/utils/anyrun/default.nix rename to modules/home/utils/anyrun/default.nix index 765efe59..e0a87c5d 100644 --- a/home/modules/utils/anyrun/default.nix +++ b/modules/home/utils/anyrun/default.nix @@ -5,13 +5,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.utils.anyrun; + cfg = config.home.utils.anyrun; in { imports = [ inputs.anyrun.homeManagerModules.default ]; options = { - userModules.utils.anyrun.enable = mkEnableOption "Enables anyrun"; + home.utils.anyrun.enable = mkEnableOption "Enables anyrun"; }; config = mkIf cfg.enable { programs.anyrun = { diff --git a/home/modules/utils/eza/default.nix b/modules/home/utils/eza/default.nix similarity index 72% rename from home/modules/utils/eza/default.nix rename to modules/home/utils/eza/default.nix index c6ee37fc..5674b11c 100644 --- a/home/modules/utils/eza/default.nix +++ b/modules/home/utils/eza/default.nix @@ -4,20 +4,20 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.utils.eza; + cfg = config.home.utils.eza; in { options = { - userModules.utils.eza.enable = mkEnableOption "Enables eza"; + home.utils.eza.enable = mkEnableOption "Enables eza"; }; config = mkIf cfg.enable { programs.eza = { enable = true; - icons = true; git = true; enableZshIntegration = false; extraOptions = [ "--group-directories-first" "--header" + "--icons" ]; }; }; diff --git a/home/modules/utils/misc/default.nix b/modules/home/utils/misc/default.nix similarity index 91% rename from home/modules/utils/misc/default.nix rename to modules/home/utils/misc/default.nix index 0d687e32..aae3801b 100644 --- a/home/modules/utils/misc/default.nix +++ b/modules/home/utils/misc/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.utils.misc; + cfg = config.home.utils.misc; in { options = { - userModules.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps"; + home.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps"; }; config = mkIf cfg.enable { programs = { diff --git a/modules/home/utils/mpv/default.nix b/modules/home/utils/mpv/default.nix new file mode 100644 index 00000000..dedc36c3 --- /dev/null +++ b/modules/home/utils/mpv/default.nix @@ -0,0 +1,20 @@ +{ + config, + lib, + pkgs, + ... +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.home.utils.mpv; +in { + options = { + home.utils.mpv.enable = mkEnableOption "Enables mpv"; + }; + config = mkIf cfg.enable { + programs.mpv = { + enable = true; + defaultProfiles = ["gpu-hq"]; + scripts = [pkgs.mpvScripts.mpris]; + }; + }; +} diff --git a/home/modules/utils/rofi/default.nix b/modules/home/utils/rofi/default.nix similarity index 74% rename from home/modules/utils/rofi/default.nix rename to modules/home/utils/rofi/default.nix index 2c0407ab..e4afb706 100644 --- a/home/modules/utils/rofi/default.nix +++ b/modules/home/utils/rofi/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.utils.rofi; + cfg = config.home.utils.rofi; in { options = { - userModules.utils.rofi.enable = mkEnableOption "Enables firefox"; + home.utils.rofi.enable = mkEnableOption "Enables firefox"; }; config = mkIf cfg.enable { programs.rofi = { diff --git a/home/modules/utils/ssh/default.nix b/modules/home/utils/ssh/default.nix similarity index 68% rename from home/modules/utils/ssh/default.nix rename to modules/home/utils/ssh/default.nix index 38d42ea4..34a9ed13 100644 --- a/home/modules/utils/ssh/default.nix +++ b/modules/home/utils/ssh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.utils.ssh; + cfg = config.home.utils.ssh; in { options = { - userModules.utils.ssh.enable = mkEnableOption "Enables ssh"; + home.utils.ssh.enable = mkEnableOption "Enables ssh"; }; config = mkIf cfg.enable { programs.ssh = { diff --git a/home/modules/utils/tuirun/default.nix b/modules/home/utils/tuirun/default.nix similarity index 85% rename from home/modules/utils/tuirun/default.nix rename to modules/home/utils/tuirun/default.nix index 2490f0ab..90a8e394 100644 --- a/home/modules/utils/tuirun/default.nix +++ b/modules/home/utils/tuirun/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.utils.tuirun; + cfg = config.home.utils.tuirun; in { imports = [ inputs.tuirun.homeManagerModules.default ]; options = { - userModules.utils.tuirun.enable = mkEnableOption "Enables tuirun"; + home.utils.tuirun.enable = mkEnableOption "Enables tuirun"; }; config = mkIf cfg.enable { programs.tuirun = { diff --git a/home/modules/utils/waybar/default.nix b/modules/home/utils/waybar/default.nix similarity index 74% rename from home/modules/utils/waybar/default.nix rename to modules/home/utils/waybar/default.nix index 1a80a68f..85f1869a 100644 --- a/home/modules/utils/waybar/default.nix +++ b/modules/home/utils/waybar/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.utils.waybar; + cfg = config.home.utils.waybar; in { options = { - userModules.utils.waybar.enable = mkEnableOption "Enables waybar"; + home.utils.waybar.enable = mkEnableOption "Enables waybar"; }; config = mkIf cfg.enable { systemd.user.services.waybar = { diff --git a/home/modules/utils/yazi/default.nix b/modules/home/utils/yazi/default.nix similarity index 88% rename from home/modules/utils/yazi/default.nix rename to modules/home/utils/yazi/default.nix index 97b97331..5f8a3579 100644 --- a/home/modules/utils/yazi/default.nix +++ b/modules/home/utils/yazi/default.nix @@ -5,14 +5,14 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.utils.yazi; + cfg = config.home.utils.yazi; in { imports = [ ./theme ]; options = { - userModules.utils.yazi.enable = mkEnableOption "Enables yazi"; + home.utils.yazi.enable = mkEnableOption "Enables yazi"; }; config = mkIf cfg.enable { programs.yazi = { diff --git a/home/modules/utils/yazi/theme/default.nix b/modules/home/utils/yazi/theme/default.nix similarity index 100% rename from home/modules/utils/yazi/theme/default.nix rename to modules/home/utils/yazi/theme/default.nix diff --git a/home/modules/utils/yazi/theme/filetype.nix b/modules/home/utils/yazi/theme/filetype.nix similarity index 100% rename from home/modules/utils/yazi/theme/filetype.nix rename to modules/home/utils/yazi/theme/filetype.nix diff --git a/home/modules/utils/yazi/theme/help.nix b/modules/home/utils/yazi/theme/help.nix similarity index 100% rename from home/modules/utils/yazi/theme/help.nix rename to modules/home/utils/yazi/theme/help.nix diff --git a/home/modules/utils/yazi/theme/icons.nix b/modules/home/utils/yazi/theme/icons.nix similarity index 100% rename from home/modules/utils/yazi/theme/icons.nix rename to modules/home/utils/yazi/theme/icons.nix diff --git a/home/modules/utils/yazi/theme/input.nix b/modules/home/utils/yazi/theme/input.nix similarity index 100% rename from home/modules/utils/yazi/theme/input.nix rename to modules/home/utils/yazi/theme/input.nix diff --git a/home/modules/utils/yazi/theme/manager.nix b/modules/home/utils/yazi/theme/manager.nix similarity index 100% rename from home/modules/utils/yazi/theme/manager.nix rename to modules/home/utils/yazi/theme/manager.nix diff --git a/home/modules/utils/yazi/theme/select.nix b/modules/home/utils/yazi/theme/select.nix similarity index 100% rename from home/modules/utils/yazi/theme/select.nix rename to modules/home/utils/yazi/theme/select.nix diff --git a/home/modules/utils/yazi/theme/status.nix b/modules/home/utils/yazi/theme/status.nix similarity index 100% rename from home/modules/utils/yazi/theme/status.nix rename to modules/home/utils/yazi/theme/status.nix diff --git a/home/modules/utils/yazi/theme/tasks.nix b/modules/home/utils/yazi/theme/tasks.nix similarity index 100% rename from home/modules/utils/yazi/theme/tasks.nix rename to modules/home/utils/yazi/theme/tasks.nix diff --git a/home/modules/utils/yazi/theme/which.nix b/modules/home/utils/yazi/theme/which.nix similarity index 100% rename from home/modules/utils/yazi/theme/which.nix rename to modules/home/utils/yazi/theme/which.nix diff --git a/home/modules/utils/zathura/default.nix b/modules/home/utils/zathura/default.nix similarity index 94% rename from home/modules/utils/zathura/default.nix rename to modules/home/utils/zathura/default.nix index a730cff8..d2c4b546 100644 --- a/home/modules/utils/zathura/default.nix +++ b/modules/home/utils/zathura/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.utils.zathura; + cfg = config.home.utils.zathura; in { options = { - userModules.utils.zathura.enable = mkEnableOption "Enables zathura"; + home.utils.zathura.enable = mkEnableOption "Enables zathura"; }; config = mkIf cfg.enable { programs.zathura = { diff --git a/home/modules/wm/hyprland/cnst/appearance.nix b/modules/home/wm/hyprland/cnst/appearance.nix similarity index 90% rename from home/modules/wm/hyprland/cnst/appearance.nix rename to modules/home/wm/hyprland/cnst/appearance.nix index 41fd10ea..bf821566 100644 --- a/home/modules/wm/hyprland/cnst/appearance.nix +++ b/modules/home/wm/hyprland/cnst/appearance.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.hyprland.cnst.appearance; + cfg = config.home.wm.hyprland.cnst.appearance; in { options = { - userModules.wm.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; + home.wm.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/cnst/default.nix b/modules/home/wm/hyprland/cnst/default.nix similarity index 86% rename from home/modules/wm/hyprland/cnst/default.nix rename to modules/home/wm/hyprland/cnst/default.nix index a37ca666..22831ecf 100644 --- a/home/modules/wm/hyprland/cnst/default.nix +++ b/modules/home/wm/hyprland/cnst/default.nix @@ -7,7 +7,7 @@ ... }: let inherit (lib) mkIf mkEnableOption mkDefault; - cfg = config.userModules.wm.hyprland.cnst; + cfg = config.home.wm.hyprland.cnst; in { imports = [ "${umodPath}/wm/hyprland/cnst/appearance.nix" @@ -18,11 +18,11 @@ in { ]; options = { - userModules.wm.hyprland.cnst.enable = mkEnableOption "Enable Hyprland"; + home.wm.hyprland.cnst.enable = mkEnableOption "Enable Hyprland"; }; config = mkIf cfg.enable { - userModules.wm.hyprland.cnst = { + home.wm.hyprland.cnst = { appearance.enable = mkDefault cfg.enable; inputs.enable = mkDefault cfg.enable; keybinds.enable = mkDefault cfg.enable; diff --git a/home/modules/wm/hyprland/cnst/inputs.nix b/modules/home/wm/hyprland/cnst/inputs.nix similarity index 93% rename from home/modules/wm/hyprland/cnst/inputs.nix rename to modules/home/wm/hyprland/cnst/inputs.nix index f8c23f13..132a0ce9 100644 --- a/home/modules/wm/hyprland/cnst/inputs.nix +++ b/modules/home/wm/hyprland/cnst/inputs.nix @@ -9,10 +9,10 @@ if osConfig.networking.hostName == "cnixpad" then "ctrl:swapcaps" else ""; - cfg = config.userModules.wm.hyprland.cnst.inputs; + cfg = config.home.wm.hyprland.cnst.inputs; in { options = { - userModules.wm.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; + home.wm.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/cnst/keybinds.nix b/modules/home/wm/hyprland/cnst/keybinds.nix similarity index 96% rename from home/modules/wm/hyprland/cnst/keybinds.nix rename to modules/home/wm/hyprland/cnst/keybinds.nix index cd02eb3a..961d75b5 100644 --- a/home/modules/wm/hyprland/cnst/keybinds.nix +++ b/modules/home/wm/hyprland/cnst/keybinds.nix @@ -14,10 +14,10 @@ if osConfig.networking.hostName == "cnixpad" then "foot" else "alacritty"; - cfg = config.userModules.wm.hyprland.cnst.keybinds; + cfg = config.home.wm.hyprland.cnst.keybinds; in { options = { - userModules.wm.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; + home.wm.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/cnst/rules.nix b/modules/home/wm/hyprland/cnst/rules.nix similarity index 93% rename from home/modules/wm/hyprland/cnst/rules.nix rename to modules/home/wm/hyprland/cnst/rules.nix index 8ece15fa..cbd2cfae 100644 --- a/home/modules/wm/hyprland/cnst/rules.nix +++ b/modules/home/wm/hyprland/cnst/rules.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.hyprland.cnst.rules; + cfg = config.home.wm.hyprland.cnst.rules; in { options = { - userModules.wm.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; + home.wm.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/cnst/startup.nix b/modules/home/wm/hyprland/cnst/startup.nix similarity index 84% rename from home/modules/wm/hyprland/cnst/startup.nix rename to modules/home/wm/hyprland/cnst/startup.nix index 8cc46f64..454e0bf4 100644 --- a/home/modules/wm/hyprland/cnst/startup.nix +++ b/modules/home/wm/hyprland/cnst/startup.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.hyprland.cnst.startup; + cfg = config.home.wm.hyprland.cnst.startup; in { options = { - userModules.wm.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; + home.wm.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/default.nix b/modules/home/wm/hyprland/default.nix similarity index 100% rename from home/modules/wm/hyprland/default.nix rename to modules/home/wm/hyprland/default.nix diff --git a/home/modules/wm/hyprland/toothpick/appearance.nix b/modules/home/wm/hyprland/toothpick/appearance.nix similarity index 89% rename from home/modules/wm/hyprland/toothpick/appearance.nix rename to modules/home/wm/hyprland/toothpick/appearance.nix index c867d900..e8937d63 100644 --- a/home/modules/wm/hyprland/toothpick/appearance.nix +++ b/modules/home/wm/hyprland/toothpick/appearance.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.hyprland.toothpick.appearance; + cfg = config.home.wm.hyprland.toothpick.appearance; in { options = { - userModules.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; + home.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/toothpick/default.nix b/modules/home/wm/hyprland/toothpick/default.nix similarity index 85% rename from home/modules/wm/hyprland/toothpick/default.nix rename to modules/home/wm/hyprland/toothpick/default.nix index b252fc44..711d1ea0 100644 --- a/home/modules/wm/hyprland/toothpick/default.nix +++ b/modules/home/wm/hyprland/toothpick/default.nix @@ -7,7 +7,7 @@ ... }: let inherit (lib) mkIf mkEnableOption mkDefault; - cfg = config.userModules.wm.hyprland.toothpick; + cfg = config.home.wm.hyprland.toothpick; in { imports = [ "${umodPath}/wm/hyprland/toothpick/appearance.nix" @@ -18,11 +18,11 @@ in { ]; options = { - userModules.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland"; + home.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland"; }; config = mkIf cfg.enable { - userModules.wm.hyprland.toothpick = { + home.wm.hyprland.toothpick = { appearance.enable = mkDefault cfg.enable; inputs.enable = mkDefault cfg.enable; keybinds.enable = mkDefault cfg.enable; diff --git a/home/modules/wm/hyprland/toothpick/inputs.nix b/modules/home/wm/hyprland/toothpick/inputs.nix similarity index 90% rename from home/modules/wm/hyprland/toothpick/inputs.nix rename to modules/home/wm/hyprland/toothpick/inputs.nix index e46b6223..aa31f619 100644 --- a/home/modules/wm/hyprland/toothpick/inputs.nix +++ b/modules/home/wm/hyprland/toothpick/inputs.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.hyprland.toothpick.inputs; + cfg = config.home.wm.hyprland.toothpick.inputs; in { options = { - userModules.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; + home.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/toothpick/keybinds.nix b/modules/home/wm/hyprland/toothpick/keybinds.nix similarity index 95% rename from home/modules/wm/hyprland/toothpick/keybinds.nix rename to modules/home/wm/hyprland/toothpick/keybinds.nix index 579fee30..bd2b00a1 100644 --- a/home/modules/wm/hyprland/toothpick/keybinds.nix +++ b/modules/home/wm/hyprland/toothpick/keybinds.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.hyprland.toothpick.keybinds; + cfg = config.home.wm.hyprland.toothpick.keybinds; in { options = { - userModules.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; + home.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/toothpick/rules.nix b/modules/home/wm/hyprland/toothpick/rules.nix similarity index 92% rename from home/modules/wm/hyprland/toothpick/rules.nix rename to modules/home/wm/hyprland/toothpick/rules.nix index 71abea60..7371caaf 100644 --- a/home/modules/wm/hyprland/toothpick/rules.nix +++ b/modules/home/wm/hyprland/toothpick/rules.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.hyprland.toothpick.rules; + cfg = config.home.wm.hyprland.toothpick.rules; in { options = { - userModules.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; + home.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/hyprland/toothpick/startup.nix b/modules/home/wm/hyprland/toothpick/startup.nix similarity index 83% rename from home/modules/wm/hyprland/toothpick/startup.nix rename to modules/home/wm/hyprland/toothpick/startup.nix index 4ca0366b..305f976a 100644 --- a/home/modules/wm/hyprland/toothpick/startup.nix +++ b/modules/home/wm/hyprland/toothpick/startup.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.hyprland.toothpick.startup; + cfg = config.home.wm.hyprland.toothpick.startup; in { options = { - userModules.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; + home.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/home/modules/wm/utils/hypridle/default.nix b/modules/home/wm/utils/hypridle/default.nix similarity index 86% rename from home/modules/wm/utils/hypridle/default.nix rename to modules/home/wm/utils/hypridle/default.nix index aaf34f32..a7da742b 100644 --- a/home/modules/wm/utils/hypridle/default.nix +++ b/modules/home/wm/utils/hypridle/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.utils.hypridle; + cfg = config.home.wm.utils.hypridle; hypridleFlake = inputs.hypridle.packages.${pkgs.system}.hypridle; # hypridlePkg = pkgs.hypridle; in { options = { - userModules.wm.utils.hypridle.enable = mkEnableOption "Enables hypridle"; + home.wm.utils.hypridle.enable = mkEnableOption "Enables hypridle"; }; config = mkIf cfg.enable { services.hypridle = { diff --git a/home/modules/wm/utils/hyprlock/default.nix b/modules/home/wm/utils/hyprlock/default.nix similarity index 94% rename from home/modules/wm/utils/hyprlock/default.nix rename to modules/home/wm/utils/hyprlock/default.nix index b968b5ef..9f54461c 100644 --- a/home/modules/wm/utils/hyprlock/default.nix +++ b/modules/home/wm/utils/hyprlock/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.utils.hyprlock; + cfg = config.home.wm.utils.hyprlock; hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock; # hyprlockPkg = pkgs.hyprlock; in { options = { - userModules.wm.utils.hyprlock.enable = mkEnableOption "Enables hyprlock"; + home.wm.utils.hyprlock.enable = mkEnableOption "Enables hyprlock"; }; config = mkIf cfg.enable { programs.hyprlock = { diff --git a/home/modules/wm/utils/hyprpaper/default.nix b/modules/home/wm/utils/hyprpaper/default.nix similarity index 89% rename from home/modules/wm/utils/hyprpaper/default.nix rename to modules/home/wm/utils/hyprpaper/default.nix index bd22a4da..6cfdc1e1 100644 --- a/home/modules/wm/utils/hyprpaper/default.nix +++ b/modules/home/wm/utils/hyprpaper/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.userModules.wm.utils.hyprpaper; + cfg = config.home.wm.utils.hyprpaper; hyprpaperFlake = inputs.hyprpaper.packages.${pkgs.system}.default; # hyprpaperPkg = pkgs.hyprpaper; in { options = { - userModules.wm.utils.hyprpaper.enable = mkEnableOption "Enables hyprpaper"; + home.wm.utils.hyprpaper.enable = mkEnableOption "Enables hyprpaper"; }; config = mkIf cfg.enable { services.hyprpaper = { diff --git a/modules/options/monitors/default.nix b/modules/options/monitors/default.nix new file mode 100644 index 00000000..cbccd2b7 --- /dev/null +++ b/modules/options/monitors/default.nix @@ -0,0 +1,60 @@ +# Yanked from Misterio77 +{ + lib, + config, + ... +}: let + inherit (lib) mkOption types; +in { + options.monitors = mkOption { + type = types.listOf ( + types.submodule { + options = { + name = mkOption { + type = types.str; + example = "DP-1"; + }; + primary = mkOption { + type = types.bool; + default = false; + }; + width = mkOption { + type = types.int; + example = 1920; + }; + height = mkOption { + type = types.int; + example = 1080; + }; + refreshRate = mkOption { + type = types.int; + default = 60; + }; + position = mkOption { + type = types.str; + default = "auto"; + }; + enabled = mkOption { + type = types.bool; + default = true; + }; + workspace = mkOption { + type = types.nullOr types.str; + default = null; + }; + }; + } + ); + default = []; + }; + config = { + assertions = [ + { + assertion = + ((lib.length config.monitors) != 0) + -> ((lib.length (lib.filter (m: m.primary) config.monitors)) == 1); + message = "Exactly one monitor must be set to primary."; + } + ]; + }; +} diff --git a/system/modules/boot/kernel/default.nix b/modules/system/boot/kernel/default.nix similarity index 91% rename from system/modules/boot/kernel/default.nix rename to modules/system/boot/kernel/default.nix index 284dee3e..16492f12 100644 --- a/system/modules/boot/kernel/default.nix +++ b/modules/system/boot/kernel/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkOption; - cfg = config.systemModules.boot.kernel; + cfg = config.system.boot.kernel; in { options = { - systemModules.boot.kernel = { + system.boot.kernel = { variant = mkOption { type = lib.types.enum ["stable" "latest" "cachyos"]; default = "latest"; @@ -30,7 +30,7 @@ in { extraBlacklistedModules = mkOption { type = lib.types.listOf lib.types.str; default = []; - description = "Additional kernel systemModules to blacklist."; + description = "Additional kernel system.to blacklist."; }; }; }; diff --git a/system/modules/boot/loader/default.nix b/modules/system/boot/loader/default.nix similarity index 84% rename from system/modules/boot/loader/default.nix rename to modules/system/boot/loader/default.nix index a5c7babb..f695359b 100644 --- a/system/modules/boot/loader/default.nix +++ b/modules/system/boot/loader/default.nix @@ -6,10 +6,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkMerge mkForce; - cfg = config.systemModules.boot.loader; + cfg = config.system.boot.loader; in { options = { - systemModules.boot.loader = { + system.boot.loader = { default = { enable = mkEnableOption "Enable default boot loader configuration."; }; @@ -28,7 +28,7 @@ in { assertions = [ { assertion = !(cfg.default.enable && cfg.lanzaboote.enable); - message = "Only one of systemModules.boot.loader.default.enable and systemModules.boot.loader.lanzaboote.enable can be set to true."; + message = "Only one of system.boot.loader.default.enable and system.boot.loader.lanzaboote.enable can be set to true."; } ]; } diff --git a/system/modules/gaming/gamemode/default.nix b/modules/system/gaming/gamemode/default.nix similarity index 93% rename from system/modules/gaming/gamemode/default.nix rename to modules/system/gaming/gamemode/default.nix index b5596b79..a82afe47 100644 --- a/system/modules/gaming/gamemode/default.nix +++ b/modules/system/gaming/gamemode/default.nix @@ -6,14 +6,14 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.systemModules.gaming.gamemode; + cfg = config.system.gaming.gamemode; pipewireLowLatencyModule = inputs.nix-gaming.nixosModules.pipewireLowLatency; in { imports = [ pipewireLowLatencyModule ]; options = { - systemModules.gaming.gamemode = { + system.gaming.gamemode = { enable = mkEnableOption "Enables gamemode"; optimizeGpu.enable = mkOption { type = lib.types.bool; diff --git a/system/modules/gaming/gamescope/default.nix b/modules/system/gaming/gamescope/default.nix similarity index 68% rename from system/modules/gaming/gamescope/default.nix rename to modules/system/gaming/gamescope/default.nix index 35a73403..c6cc81e3 100644 --- a/system/modules/gaming/gamescope/default.nix +++ b/modules/system/gaming/gamescope/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.gaming.gamescope; + cfg = config.system.gaming.gamescope; in { options = { - systemModules.gaming.gamescope.enable = mkEnableOption "Enables gamescope"; + system.gaming.gamescope.enable = mkEnableOption "Enables gamescope"; }; config = mkIf cfg.enable { programs.gamescope = { diff --git a/system/modules/gaming/lutris/default.nix b/modules/system/gaming/lutris/default.nix similarity index 63% rename from system/modules/gaming/lutris/default.nix rename to modules/system/gaming/lutris/default.nix index c460679b..3694df55 100644 --- a/system/modules/gaming/lutris/default.nix +++ b/modules/system/gaming/lutris/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.gaming.lutris; + cfg = config.system.gaming.lutris; in { options = { - systemModules.gaming.lutris.enable = mkEnableOption "Enables lutris"; + system.gaming.lutris.enable = mkEnableOption "Enables lutris"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/system/modules/gaming/steam/default.nix b/modules/system/gaming/steam/default.nix similarity index 67% rename from system/modules/gaming/steam/default.nix rename to modules/system/gaming/steam/default.nix index 2fc8bd75..98d3f445 100644 --- a/system/modules/gaming/steam/default.nix +++ b/modules/system/gaming/steam/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.gaming.steam; + cfg = config.system.gaming.steam; in { options = { - systemModules.gaming.steam.enable = mkEnableOption "Enables steam"; + system.gaming.steam.enable = mkEnableOption "Enables steam"; }; config = mkIf cfg.enable { programs = { diff --git a/system/modules/gui/gnome/default.nix b/modules/system/gui/gnome/default.nix similarity index 72% rename from system/modules/gui/gnome/default.nix rename to modules/system/gui/gnome/default.nix index 2a548b93..e1bebd56 100644 --- a/system/modules/gui/gnome/default.nix +++ b/modules/system/gui/gnome/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.gui.gnome; + cfg = config.system.gui.gnome; in { options = { - systemModules.gui.gnome.enable = mkEnableOption "Enables gnome"; + system.gui.gnome.enable = mkEnableOption "Enables gnome"; }; config = mkIf cfg.enable { services = { diff --git a/system/modules/gui/hyprland/default.nix b/modules/system/gui/hyprland/default.nix similarity index 78% rename from system/modules/gui/hyprland/default.nix rename to modules/system/gui/hyprland/default.nix index d719b86f..c514b38a 100644 --- a/system/modules/gui/hyprland/default.nix +++ b/modules/system/gui/hyprland/default.nix @@ -6,10 +6,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.gui.hyprland; + cfg = config.system.gui.hyprland; in { options = { - systemModules.gui.hyprland.enable = mkEnableOption "Enables hyprland"; + system.gui.hyprland.enable = mkEnableOption "Enables hyprland"; }; config = mkIf cfg.enable { programs.hyprland = { diff --git a/system/modules/hardware/bluetooth/default.nix b/modules/system/hardware/bluetooth/default.nix similarity index 64% rename from system/modules/hardware/bluetooth/default.nix rename to modules/system/hardware/bluetooth/default.nix index d69ea541..fe7751e2 100644 --- a/system/modules/hardware/bluetooth/default.nix +++ b/modules/system/hardware/bluetooth/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.hardware.bluetooth; + cfg = config.system.hardware.bluetooth; in { options = { - systemModules.hardware.bluetooth.enable = mkEnableOption "Enables bluetooth"; + system.hardware.bluetooth.enable = mkEnableOption "Enables bluetooth"; }; config = mkIf cfg.enable { hardware = { diff --git a/modules/system/hardware/graphics/amd/default.nix b/modules/system/hardware/graphics/amd/default.nix new file mode 100644 index 00000000..fd3a4137 --- /dev/null +++ b/modules/system/hardware/graphics/amd/default.nix @@ -0,0 +1,32 @@ +{ + # pkgs, + config, + lib, + ... +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.system.hardware.graphics.amd; +in { + options = { + system.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics"; + }; + config = mkIf cfg.enable { + hardware = { + graphics = { + enable = true; + enable32Bit = true; + # extraPackages = with pkgs; [ + # libva + # vaapiVdpau + # libvdpau-va-gl + # amdvlk + # vulkan-tools + # ]; + # extraPackages32 = with pkgs.pkgsi686Linux; [ + # vaapiVdpau + # libvdpau-va-gl + # ]; + }; + }; + }; +} diff --git a/system/modules/hardware/graphics/nvidia/default.nix b/modules/system/hardware/graphics/nvidia/default.nix similarity index 94% rename from system/modules/hardware/graphics/nvidia/default.nix rename to modules/system/hardware/graphics/nvidia/default.nix index f54447ca..95c1ab9d 100644 --- a/system/modules/hardware/graphics/nvidia/default.nix +++ b/modules/system/hardware/graphics/nvidia/default.nix @@ -15,10 +15,10 @@ exec "$@" ''; inherit (lib) types mkIf mkEnableOption mkOption; - cfg = config.systemModules.hardware.graphics.nvidia; + cfg = config.system.hardware.graphics.nvidia; in { options = { - systemModules.hardware.graphics.nvidia = { + system.hardware.graphics.nvidia = { enable = mkEnableOption "Enables NVidia graphics"; package = mkOption { type = types.enum ["stable" "beta" "production" "latest"]; diff --git a/system/modules/hardware/logitech/default.nix b/modules/system/hardware/logitech/default.nix similarity index 65% rename from system/modules/hardware/logitech/default.nix rename to modules/system/hardware/logitech/default.nix index cc1ac935..1b30832c 100644 --- a/system/modules/hardware/logitech/default.nix +++ b/modules/system/hardware/logitech/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.hardware.logitech; + cfg = config.system.hardware.logitech; in { options = { - systemModules.hardware.logitech.enable = mkEnableOption "Enables logitech"; + system.hardware.logitech.enable = mkEnableOption "Enables logitech"; }; config = mkIf cfg.enable { hardware = { diff --git a/system/modules/hardware/network/default.nix b/modules/system/hardware/network/default.nix similarity index 95% rename from system/modules/hardware/network/default.nix rename to modules/system/hardware/network/default.nix index fa7e8d8d..1c93a0b4 100644 --- a/system/modules/hardware/network/default.nix +++ b/modules/system/hardware/network/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption types; - cfg = config.systemModules.hardware.network; + cfg = config.system.hardware.network; in { options = { - systemModules = { + system = { hardware = { network = { enable = mkEnableOption "Enable the custom networking module"; diff --git a/system/modules/studio/beekeeper/default.nix b/modules/system/studio/beekeeper/default.nix similarity index 61% rename from system/modules/studio/beekeeper/default.nix rename to modules/system/studio/beekeeper/default.nix index 8d4e1961..41dc051d 100644 --- a/system/modules/studio/beekeeper/default.nix +++ b/modules/system/studio/beekeeper/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.studio.beekeeper; + cfg = config.system.studio.beekeeper; in { options = { - systemModules.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio"; + system.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/system/modules/studio/blender/default.nix b/modules/system/studio/blender/default.nix similarity index 86% rename from system/modules/studio/blender/default.nix rename to modules/system/studio/blender/default.nix index 7d54472f..c18aa5fa 100644 --- a/system/modules/studio/blender/default.nix +++ b/modules/system/studio/blender/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.systemModules.studio.blender; + cfg = config.system.studio.blender; in { options = { - systemModules.studio.blender = { + system.studio.blender = { enable = mkEnableOption "Enables Blender"; hip.enable = mkOption { type = lib.types.bool; diff --git a/system/modules/studio/gimp/default.nix b/modules/system/studio/gimp/default.nix similarity index 65% rename from system/modules/studio/gimp/default.nix rename to modules/system/studio/gimp/default.nix index 83e5c110..d08626cd 100644 --- a/system/modules/studio/gimp/default.nix +++ b/modules/system/studio/gimp/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.studio.gimp; + cfg = config.system.studio.gimp; in { options = { - systemModules.studio.gimp.enable = mkEnableOption "Enables gimp"; + system.studio.gimp.enable = mkEnableOption "Enables gimp"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/system/modules/studio/inkscape/default.nix b/modules/system/studio/inkscape/default.nix similarity index 64% rename from system/modules/studio/inkscape/default.nix rename to modules/system/studio/inkscape/default.nix index 1c4e9e4b..5dd3c599 100644 --- a/system/modules/studio/inkscape/default.nix +++ b/modules/system/studio/inkscape/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.studio.inkscape; + cfg = config.system.studio.inkscape; in { options = { - systemModules.studio.inkscape.enable = mkEnableOption "Enables inkscape"; + system.studio.inkscape.enable = mkEnableOption "Enables inkscape"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/system/modules/studio/mysql-workbench/default.nix b/modules/system/studio/mysql-workbench/default.nix similarity index 59% rename from system/modules/studio/mysql-workbench/default.nix rename to modules/system/studio/mysql-workbench/default.nix index 23e83114..cff48d59 100644 --- a/system/modules/studio/mysql-workbench/default.nix +++ b/modules/system/studio/mysql-workbench/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.studio.mysql-workbench; + cfg = config.system.studio.mysql-workbench; in { options = { - systemModules.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench"; + system.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/system/modules/sysd/network/blueman/default.nix b/modules/system/sysd/network/blueman/default.nix similarity index 57% rename from system/modules/sysd/network/blueman/default.nix rename to modules/system/sysd/network/blueman/default.nix index 9fac56b4..d9e2df32 100644 --- a/system/modules/sysd/network/blueman/default.nix +++ b/modules/system/sysd/network/blueman/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.network.blueman; + cfg = config.system.sysd.network.blueman; in { options = { - systemModules.sysd.network.blueman.enable = mkEnableOption "Enables blueman"; + system.sysd.network.blueman.enable = mkEnableOption "Enables blueman"; }; config = mkIf cfg.enable { services = { diff --git a/system/modules/sysd/network/mullvad/default.nix b/modules/system/sysd/network/mullvad/default.nix similarity index 63% rename from system/modules/sysd/network/mullvad/default.nix rename to modules/system/sysd/network/mullvad/default.nix index 09de8ea7..80fd1bce 100644 --- a/system/modules/sysd/network/mullvad/default.nix +++ b/modules/system/sysd/network/mullvad/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.network.mullvad; + cfg = config.system.sysd.network.mullvad; in { options = { - systemModules.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad"; + system.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad"; }; config = mkIf cfg.enable { services.mullvad-vpn = { diff --git a/system/modules/sysd/network/openssh/default.nix b/modules/system/sysd/network/openssh/default.nix similarity index 57% rename from system/modules/sysd/network/openssh/default.nix rename to modules/system/sysd/network/openssh/default.nix index bf9cd544..0c92232f 100644 --- a/system/modules/sysd/network/openssh/default.nix +++ b/modules/system/sysd/network/openssh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.network.openssh; + cfg = config.system.sysd.network.openssh; in { options = { - systemModules.sysd.network.openssh.enable = mkEnableOption "Enables openssh"; + system.sysd.network.openssh.enable = mkEnableOption "Enables openssh"; }; config = mkIf cfg.enable { services.openssh = { diff --git a/system/modules/sysd/network/samba/default.nix b/modules/system/sysd/network/samba/default.nix similarity index 79% rename from system/modules/sysd/network/samba/default.nix rename to modules/system/sysd/network/samba/default.nix index f56a4c68..dec70aca 100644 --- a/system/modules/sysd/network/samba/default.nix +++ b/modules/system/sysd/network/samba/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.network.samba; + cfg = config.system.sysd.network.samba; in { options = { - systemModules.sysd.network.samba.enable = mkEnableOption "Enables samba"; + system.sysd.network.samba.enable = mkEnableOption "Enables samba"; }; config = mkIf cfg.enable { services = { diff --git a/system/modules/sysd/security/agenix/default.nix b/modules/system/sysd/security/agenix/default.nix similarity index 93% rename from system/modules/sysd/security/agenix/default.nix rename to modules/system/sysd/security/agenix/default.nix index c6dbcba7..f2973002 100644 --- a/system/modules/sysd/security/agenix/default.nix +++ b/modules/system/sysd/security/agenix/default.nix @@ -7,10 +7,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.systemModules.sysd.security.agenix; + cfg = config.system.sysd.security.agenix; in { options = { - systemModules.sysd.security.agenix = { + system.sysd.security.agenix = { enable = mkEnableOption "Enables agenix system environment"; cnix.enable = mkOption { type = lib.types.bool; diff --git a/system/modules/sysd/security/gnome-keyring/default.nix b/modules/system/sysd/security/gnome-keyring/default.nix similarity index 53% rename from system/modules/sysd/security/gnome-keyring/default.nix rename to modules/system/sysd/security/gnome-keyring/default.nix index 456df4b1..a4da5f89 100644 --- a/system/modules/sysd/security/gnome-keyring/default.nix +++ b/modules/system/sysd/security/gnome-keyring/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.security.gnome-keyring; + cfg = config.system.sysd.security.gnome-keyring; in { options = { - systemModules.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring"; + system.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring"; }; config = mkIf cfg.enable { services.gnome.gnome-keyring.enable = true; diff --git a/system/modules/sysd/session/dbus/default.nix b/modules/system/sysd/session/dbus/default.nix similarity index 65% rename from system/modules/sysd/session/dbus/default.nix rename to modules/system/sysd/session/dbus/default.nix index 2ce2fcd3..93331718 100644 --- a/system/modules/sysd/session/dbus/default.nix +++ b/modules/system/sysd/session/dbus/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.session.dbus; + cfg = config.system.sysd.session.dbus; in { options = { - systemModules.sysd.session.dbus.enable = mkEnableOption "Enables dbus"; + system.sysd.session.dbus.enable = mkEnableOption "Enables dbus"; }; config = mkIf cfg.enable { services.dbus = { diff --git a/system/modules/sysd/session/dconf/default.nix b/modules/system/sysd/session/dconf/default.nix similarity index 56% rename from system/modules/sysd/session/dconf/default.nix rename to modules/system/sysd/session/dconf/default.nix index 8af3e86f..23066104 100644 --- a/system/modules/sysd/session/dconf/default.nix +++ b/modules/system/sysd/session/dconf/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.session.dconf; + cfg = config.system.sysd.session.dconf; in { options = { - systemModules.sysd.session.dconf.enable = mkEnableOption "Enables dconf"; + system.sysd.session.dconf.enable = mkEnableOption "Enables dconf"; }; config = mkIf cfg.enable { programs.dconf.enable = true; diff --git a/system/modules/sysd/session/xserver/default.nix b/modules/system/sysd/session/xserver/default.nix similarity index 86% rename from system/modules/sysd/session/xserver/default.nix rename to modules/system/sysd/session/xserver/default.nix index 29080789..811746ac 100644 --- a/system/modules/sysd/session/xserver/default.nix +++ b/modules/system/sysd/session/xserver/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkOption types; - cfg = config.systemModules.sysd.session.xserver; + cfg = config.system.sysd.session.xserver; in { options = { - systemModules.sysd.session.xserver = { + system.sysd.session.xserver = { videoDrivers = mkOption { type = types.listOf (types.enum ["amdgpu" "nvidia"]); default = ["amdgpu"]; diff --git a/system/modules/sysd/system/fwupd/default.nix b/modules/system/sysd/system/fwupd/default.nix similarity index 56% rename from system/modules/sysd/system/fwupd/default.nix rename to modules/system/sysd/system/fwupd/default.nix index ca4d2a2c..c60997d9 100644 --- a/system/modules/sysd/system/fwupd/default.nix +++ b/modules/system/sysd/system/fwupd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.fwupd; + cfg = config.system.sysd.system.fwupd; in { options = { - systemModules.sysd.system.fwupd.enable = mkEnableOption "Enables fwupd"; + system.sysd.system.fwupd.enable = mkEnableOption "Enables fwupd"; }; config = mkIf cfg.enable { services.fwupd.enable = true; diff --git a/system/modules/sysd/system/greetd/default.nix b/modules/system/sysd/system/greetd/default.nix similarity index 94% rename from system/modules/sysd/system/greetd/default.nix rename to modules/system/sysd/system/greetd/default.nix index aeba8763..d0f880ad 100644 --- a/system/modules/sysd/system/greetd/default.nix +++ b/modules/system/sysd/system/greetd/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkMerge mkOption types; - cfg = config.systemModules.sysd.system.greetd; + cfg = config.system.sysd.system.greetd; in { options = { - systemModules.sysd.system.greetd = { + system.sysd.system.greetd = { enable = mkEnableOption { type = types.bool; default = false; diff --git a/system/modules/sysd/system/gvfs/default.nix b/modules/system/sysd/system/gvfs/default.nix similarity index 57% rename from system/modules/sysd/system/gvfs/default.nix rename to modules/system/sysd/system/gvfs/default.nix index c2341d7b..bc4f8f0a 100644 --- a/system/modules/sysd/system/gvfs/default.nix +++ b/modules/system/sysd/system/gvfs/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.gvfs; + cfg = config.system.sysd.system.gvfs; in { options = { - systemModules.sysd.system.gvfs.enable = mkEnableOption "Enables gvfs"; + system.sysd.system.gvfs.enable = mkEnableOption "Enables gvfs"; }; config = mkIf cfg.enable { services.gvfs.enable = true; diff --git a/system/modules/sysd/system/kanata/default.nix b/modules/system/sysd/system/kanata/default.nix similarity index 73% rename from system/modules/sysd/system/kanata/default.nix rename to modules/system/sysd/system/kanata/default.nix index 16370db4..a1972f17 100644 --- a/system/modules/sysd/system/kanata/default.nix +++ b/modules/system/sysd/system/kanata/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.kanata; + cfg = config.system.sysd.system.kanata; in { options = { - systemModules.sysd.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping"; + system.sysd.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping"; }; config = mkIf cfg.enable { services.kanata = { diff --git a/system/modules/sysd/system/kanata/hhkbse.kbd b/modules/system/sysd/system/kanata/hhkbse.kbd similarity index 100% rename from system/modules/sysd/system/kanata/hhkbse.kbd rename to modules/system/sysd/system/kanata/hhkbse.kbd diff --git a/system/modules/sysd/system/locate/default.nix b/modules/system/sysd/system/locate/default.nix similarity index 65% rename from system/modules/sysd/system/locate/default.nix rename to modules/system/sysd/system/locate/default.nix index 72505c3c..7dde69ab 100644 --- a/system/modules/sysd/system/locate/default.nix +++ b/modules/system/sysd/system/locate/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.locate; + cfg = config.system.sysd.system.locate; in { options = { - systemModules.sysd.system.locate.enable = mkEnableOption "Enables plocate"; + system.sysd.system.locate.enable = mkEnableOption "Enables plocate"; }; config = mkIf cfg.enable { services.locate = { diff --git a/system/modules/sysd/system/nix-ld/default.nix b/modules/system/sysd/system/nix-ld/default.nix similarity index 93% rename from system/modules/sysd/system/nix-ld/default.nix rename to modules/system/sysd/system/nix-ld/default.nix index 772288bc..4ab3a7e0 100644 --- a/system/modules/sysd/system/nix-ld/default.nix +++ b/modules/system/sysd/system/nix-ld/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.nix-ld; + cfg = config.system.sysd.system.nix-ld; in { options = { - systemModules.sysd.system.nix-ld.enable = mkEnableOption "Enables nix-ld"; + system.sysd.system.nix-ld.enable = mkEnableOption "Enables nix-ld"; }; config = mkIf cfg.enable { programs.nix-ld = { diff --git a/system/modules/sysd/system/pcscd/default.nix b/modules/system/sysd/system/pcscd/default.nix similarity index 56% rename from system/modules/sysd/system/pcscd/default.nix rename to modules/system/sysd/system/pcscd/default.nix index b287d782..2c969f72 100644 --- a/system/modules/sysd/system/pcscd/default.nix +++ b/modules/system/sysd/system/pcscd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.pcscd; + cfg = config.system.sysd.system.pcscd; in { options = { - systemModules.sysd.system.pcscd.enable = mkEnableOption "Enables pcscd"; + system.sysd.system.pcscd.enable = mkEnableOption "Enables pcscd"; }; config = mkIf cfg.enable { services.pcscd.enable = true; diff --git a/system/modules/sysd/system/pipewire/default.nix b/modules/system/sysd/system/pipewire/default.nix similarity index 72% rename from system/modules/sysd/system/pipewire/default.nix rename to modules/system/sysd/system/pipewire/default.nix index 44bd1657..35b22c64 100644 --- a/system/modules/sysd/system/pipewire/default.nix +++ b/modules/system/sysd/system/pipewire/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.pipewire; + cfg = config.system.sysd.system.pipewire; in { options = { - systemModules.sysd.system.pipewire.enable = mkEnableOption "Enables pipewire"; + system.sysd.system.pipewire.enable = mkEnableOption "Enables pipewire"; }; config = mkIf cfg.enable { hardware.pulseaudio.enable = false; diff --git a/system/modules/sysd/system/powerd/default.nix b/modules/system/sysd/system/powerd/default.nix similarity index 61% rename from system/modules/sysd/system/powerd/default.nix rename to modules/system/sysd/system/powerd/default.nix index 11b533c3..26f89190 100644 --- a/system/modules/sysd/system/powerd/default.nix +++ b/modules/system/sysd/system/powerd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.powerd; + cfg = config.system.sysd.system.powerd; in { options = { - systemModules.sysd.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon"; + system.sysd.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon"; }; config = mkIf cfg.enable { services = { diff --git a/system/modules/sysd/system/udisks/default.nix b/modules/system/sysd/system/udisks/default.nix similarity index 56% rename from system/modules/sysd/system/udisks/default.nix rename to modules/system/sysd/system/udisks/default.nix index af084a8a..48e8c33a 100644 --- a/system/modules/sysd/system/udisks/default.nix +++ b/modules/system/sysd/system/udisks/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.udisks; + cfg = config.system.sysd.system.udisks; in { options = { - systemModules.sysd.system.udisks.enable = mkEnableOption "Enables udisks"; + system.sysd.system.udisks.enable = mkEnableOption "Enables udisks"; }; config = mkIf cfg.enable { services.udisks2.enable = true; diff --git a/system/modules/sysd/system/zram/default.nix b/modules/system/sysd/system/zram/default.nix similarity index 56% rename from system/modules/sysd/system/zram/default.nix rename to modules/system/sysd/system/zram/default.nix index 5b70a59d..dc1665e5 100644 --- a/system/modules/sysd/system/zram/default.nix +++ b/modules/system/sysd/system/zram/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.sysd.system.zram; + cfg = config.system.sysd.system.zram; in { options = { - systemModules.sysd.system.zram.enable = mkEnableOption "Enables zram"; + system.sysd.system.zram.enable = mkEnableOption "Enables zram"; }; config = mkIf cfg.enable { zramSwap.enable = true; diff --git a/system/modules/utils/android/default.nix b/modules/system/utils/android/default.nix similarity index 56% rename from system/modules/utils/android/default.nix rename to modules/system/utils/android/default.nix index aa4c12d2..d7901458 100644 --- a/system/modules/utils/android/default.nix +++ b/modules/system/utils/android/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.utils.android; + cfg = config.system.utils.android; in { options = { - systemModules.utils.android.enable = mkEnableOption "Enables android tools"; + system.utils.android.enable = mkEnableOption "Enables android tools"; }; config = mkIf cfg.enable { programs.adb.enable = true; diff --git a/system/modules/utils/anyrun/default.nix b/modules/system/utils/anyrun/default.nix similarity index 62% rename from system/modules/utils/anyrun/default.nix rename to modules/system/utils/anyrun/default.nix index c92697b6..09261c77 100644 --- a/system/modules/utils/anyrun/default.nix +++ b/modules/system/utils/anyrun/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.utils.anyrun; + cfg = config.system.utils.anyrun; in { options = { - systemModules.utils.anyrun.enable = mkEnableOption "Enables anyrun"; + system.utils.anyrun.enable = mkEnableOption "Enables anyrun"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/system/modules/utils/brightnessctl/default.nix b/modules/system/utils/brightnessctl/default.nix similarity index 59% rename from system/modules/utils/brightnessctl/default.nix rename to modules/system/utils/brightnessctl/default.nix index c8f83f78..8f201a4d 100644 --- a/system/modules/utils/brightnessctl/default.nix +++ b/modules/system/utils/brightnessctl/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.utils.brightnessctl; + cfg = config.system.utils.brightnessctl; in { options = { - systemModules.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl"; + system.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/system/utils/chaotic/default.nix b/modules/system/utils/chaotic/default.nix new file mode 100644 index 00000000..57b47637 --- /dev/null +++ b/modules/system/utils/chaotic/default.nix @@ -0,0 +1,61 @@ +{ + pkgs, + config, + lib, + ... +}: let + inherit (lib) mkIf mkEnableOption mkOption mkMerge; + cfg = config.system.utils.chaotic; +in { + options = { + system.utils.chaotic = { + enable = mkEnableOption "Enables Chaotic AUR packages"; + amd.enable = mkOption { + type = lib.types.bool; + default = false; + description = "Whether to install AMD-specific settings."; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + { + chaotic.scx.enable = true; + } + (mkIf cfg.amd.enable { + # AMD-specific configuration + chaotic = { + scx.scheduler = "scx_lavd"; + mesa-git = { + enable = true; + extraPackages = with pkgs; [ + libva + vaapiVdpau + libdrm_git + latencyflex-vulkan + mesa_git + mesa_git.opencl + vulkanPackages_latest.gfxreconstruct + vulkanPackages_latest.spirv-cross + vulkanPackages_latest.spirv-headers + vulkanPackages_latest.spirv-tools + vulkanPackages_latest.vulkan-extension-layer + vulkanPackages_latest.vulkan-headers + vulkanPackages_latest.vulkan-loader + vulkanPackages_latest.vulkan-tools + vulkanPackages_latest.vulkan-tools-lunarg + vulkanPackages_latest.vulkan-utility-libraries + vulkanPackages_latest.vulkan-validation-layers + vulkanPackages_latest.vulkan-volk + ]; + extraPackages32 = with pkgs; [ + mesa32_git + libdrm32_git + libva + vaapiVdpau + ]; + }; + }; + }) + ]); +} diff --git a/system/modules/utils/corectrl/default.nix b/modules/system/utils/corectrl/default.nix similarity index 69% rename from system/modules/utils/corectrl/default.nix rename to modules/system/utils/corectrl/default.nix index 77e19aa9..9bb5add8 100644 --- a/system/modules/utils/corectrl/default.nix +++ b/modules/system/utils/corectrl/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.utils.corectrl; + cfg = config.system.utils.corectrl; in { options = { - systemModules.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl"; + system.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl"; }; config = mkIf cfg.enable { programs.corectrl = { diff --git a/system/modules/utils/microfetch/default.nix b/modules/system/utils/microfetch/default.nix similarity index 63% rename from system/modules/utils/microfetch/default.nix rename to modules/system/utils/microfetch/default.nix index 8541fcb6..5a45ac93 100644 --- a/system/modules/utils/microfetch/default.nix +++ b/modules/system/utils/microfetch/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.utils.microfetch; + cfg = config.system.utils.microfetch; in { options = { - systemModules.utils.microfetch.enable = mkEnableOption "Enables microfetch"; + system.utils.microfetch.enable = mkEnableOption "Enables microfetch"; }; config = mkIf cfg.enable { environment.systemPackages = [inputs.microfetch.packages.x86_64-linux.default]; diff --git a/system/modules/utils/misc/default.nix b/modules/system/utils/misc/default.nix similarity index 88% rename from system/modules/utils/misc/default.nix rename to modules/system/utils/misc/default.nix index d1c3e224..127fc869 100644 --- a/system/modules/utils/misc/default.nix +++ b/modules/system/utils/misc/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.systemModules.utils.misc; + cfg = config.system.utils.misc; in { options = { - systemModules.utils.misc = { + system.utils.misc = { enable = mkEnableOption "Enables miscellaneous packages"; desktop.enable = mkOption { type = lib.types.bool; diff --git a/system/modules/nix/nh/default.nix b/modules/system/utils/nh/default.nix similarity index 90% rename from system/modules/nix/nh/default.nix rename to modules/system/utils/nh/default.nix index ffa51434..aaf88ecd 100644 --- a/system/modules/nix/nh/default.nix +++ b/modules/system/utils/nh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.systemModules.nix.nh; + cfg = config.system.utils.nh; in { options = { - systemModules.nix.nh = { + system.utils.nh = { enable = mkEnableOption "Enables nix helper"; clean = { enable = mkEnableOption "Enables nix helper cleaning"; diff --git a/system/modules/utils/npm/default.nix b/modules/system/utils/npm/default.nix similarity index 62% rename from system/modules/utils/npm/default.nix rename to modules/system/utils/npm/default.nix index 99f7c0af..1c39e4d3 100644 --- a/system/modules/utils/npm/default.nix +++ b/modules/system/utils/npm/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.utils.npm; + cfg = config.system.utils.npm; in { options = { - systemModules.utils.npm.enable = mkEnableOption "Enables npm"; + system.utils.npm.enable = mkEnableOption "Enables npm"; }; config = mkIf cfg.enable { programs.npm = { diff --git a/system/modules/utils/obsidian/default.nix b/modules/system/utils/obsidian/default.nix similarity index 61% rename from system/modules/utils/obsidian/default.nix rename to modules/system/utils/obsidian/default.nix index bb9b3e90..10f51ac3 100644 --- a/system/modules/utils/obsidian/default.nix +++ b/modules/system/utils/obsidian/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.utils.obsidian; + cfg = config.system.utils.obsidian; in { options = { - systemModules.utils.obsidian.enable = mkEnableOption "Enables obsidian"; + system.utils.obsidian.enable = mkEnableOption "Enables obsidian"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/system/modules/utils/yubikey/default.nix b/modules/system/utils/yubikey/default.nix similarity index 71% rename from system/modules/utils/yubikey/default.nix rename to modules/system/utils/yubikey/default.nix index cb9b1b94..a47b275d 100644 --- a/system/modules/utils/yubikey/default.nix +++ b/modules/system/utils/yubikey/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.utils.yubikey; + cfg = config.system.utils.yubikey; in { options = { - systemModules.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities"; + system.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/system/modules/utils/zsh/default.nix b/modules/system/utils/zsh/default.nix similarity index 58% rename from system/modules/utils/zsh/default.nix rename to modules/system/utils/zsh/default.nix index 35f87f47..490edc01 100644 --- a/system/modules/utils/zsh/default.nix +++ b/modules/system/utils/zsh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.utils.zsh; + cfg = config.system.utils.zsh; in { options = { - systemModules.utils.zsh.enable = mkEnableOption "Enables android tools"; + system.utils.zsh.enable = mkEnableOption "Enables android tools"; }; config = mkIf cfg.enable { programs.zsh.enable = cfg.enable; diff --git a/system/default.nix b/system/default.nix index 495ddabc..1a712ea4 100644 --- a/system/default.nix +++ b/system/default.nix @@ -2,7 +2,6 @@ let shared = [ ./etc ./nix - ./modules ]; in { inherit shared; diff --git a/system/dev/default.nix b/system/dev/default.nix index 1a78080e..5cb5d9d9 100644 --- a/system/dev/default.nix +++ b/system/dev/default.nix @@ -1,13 +1,8 @@ -{ - inputs, - pkgs, - ... -}: { - nixpkgs.overlays = [inputs.fenix.overlays.default]; +{pkgs, ...}: { environment.systemPackages = with pkgs; [ # Language servers, other utilities and tools gcc - rust-analyzer-nightly + rust-analyzer lua-language-server nixd php diff --git a/system/modules/default.nix b/system/modules/default.nix deleted file mode 100644 index 6283d611..00000000 --- a/system/modules/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{smodPath, ...}: { - imports = [ - "${smodPath}/boot/loader" - "${smodPath}/boot/kernel" - "${smodPath}/gaming/gamemode" - "${smodPath}/gaming/gamescope" - "${smodPath}/gaming/lutris" - "${smodPath}/gaming/steam" - "${smodPath}/gui/gnome" - "${smodPath}/gui/hyprland" - "${smodPath}/hardware/bluetooth" - "${smodPath}/hardware/graphics/amd" - "${smodPath}/hardware/graphics/nvidia" - "${smodPath}/hardware/logitech" - "${smodPath}/hardware/network" - "${smodPath}/nix/nh" - "${smodPath}/studio/blender" - "${smodPath}/studio/gimp" - "${smodPath}/studio/inkscape" - "${smodPath}/studio/beekeeper" - "${smodPath}/studio/mysql-workbench" - "${smodPath}/sysd/network/blueman" - "${smodPath}/sysd/network/mullvad" - "${smodPath}/sysd/network/samba" - "${smodPath}/sysd/network/openssh" - "${smodPath}/sysd/security/agenix" - "${smodPath}/sysd/security/gnome-keyring" - "${smodPath}/sysd/session/dbus" - "${smodPath}/sysd/session/dconf" - "${smodPath}/sysd/session/xserver" - "${smodPath}/sysd/system/fwupd" - "${smodPath}/sysd/system/greetd" - "${smodPath}/sysd/system/gvfs" - "${smodPath}/sysd/system/locate" - "${smodPath}/sysd/system/nix-ld" - "${smodPath}/sysd/system/pcscd" - "${smodPath}/sysd/system/pipewire" - "${smodPath}/sysd/system/powerd" - "${smodPath}/sysd/system/udisks" - "${smodPath}/sysd/system/zram" - "${smodPath}/sysd/system/kanata" - "${smodPath}/utils/android" - "${smodPath}/utils/anyrun" - "${smodPath}/utils/brightnessctl" - "${smodPath}/utils/chaotic" - "${smodPath}/utils/corectrl" - "${smodPath}/utils/microfetch" - "${smodPath}/utils/misc" - "${smodPath}/utils/npm" - "${smodPath}/utils/obsidian" - "${smodPath}/utils/yubikey" - "${smodPath}/utils/zsh" - ]; -} diff --git a/system/modules/hardware/graphics/amd/default.nix b/system/modules/hardware/graphics/amd/default.nix deleted file mode 100644 index 317c3ef1..00000000 --- a/system/modules/hardware/graphics/amd/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: let - inherit (lib) mkIf mkEnableOption; - cfg = config.systemModules.hardware.graphics.amd; -in { - options = { - systemModules.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics"; - }; - config = mkIf cfg.enable { - hardware = { - graphics = { - enable = true; - enable32Bit = true; - extraPackages = with pkgs; [ - libva - vaapiVdpau - libvdpau-va-gl - amdvlk - vulkan-tools - ]; - extraPackages32 = with pkgs.pkgsi686Linux; [ - vaapiVdpau - libvdpau-va-gl - ]; - }; - }; - }; -} diff --git a/system/modules/utils/chaotic/default.nix b/system/modules/utils/chaotic/default.nix deleted file mode 100644 index 29eea3fd..00000000 --- a/system/modules/utils/chaotic/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: let - inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.systemModules.utils.chaotic; -in { - options = { - systemModules.utils.chaotic = { - enable = mkEnableOption "Enables Chaotic AUR packages"; - amd.enable = mkOption { - type = lib.types.bool; - default = false; - description = "Whether to install AMD-specific settings."; - }; - }; - }; - - config = mkIf cfg.enable (mkMerge [ - { - chaotic.scx.enable = true; - } - (mkIf cfg.amd.enable { - # AMD-specific configuration - chaotic.mesa-git = { - enable = true; - extraPackages = with pkgs; [ - mesa_git.opencl - intel-media-driver - intel-ocl - vaapiIntel - ]; - extraPackages32 = with pkgs; [ - mesa32_git.opencl - intel-media-driver - vaapiIntel - ]; - }; - }) - ]); -} diff --git a/system/nix/shell/default.nix b/system/nix/shell/default.nix index 842a0f35..0915d2cc 100644 --- a/system/nix/shell/default.nix +++ b/system/nix/shell/default.nix @@ -6,13 +6,13 @@ default = pkgs.mkShell { # Add Rust toolchain from Fenix and rust-analyzer-nightly packages = [ - (inputs.fenix.packages.${pkgs.stdenv.hostPlatform.system}.complete.withComponents [ - "cargo" - "clippy" - "rust-src" - "rustc" - "rustfmt" - ]) + # (inputs.fenix.packages.${pkgs.stdenv.hostPlatform.system}.complete.withComponents [ + # "cargo" + # "clippy" + # "rust-src" + # "rustc" + # "rustfmt" + # ]) ]; nativeBuildInputs = with pkgs; [ diff --git a/users/cnst/cpmodules.nix b/users/cnst/cpmodules.nix new file mode 100644 index 00000000..1e5f09b0 --- /dev/null +++ b/users/cnst/cpmodules.nix @@ -0,0 +1,138 @@ +{lib, ...}: let + inherit (lib) mkForce; +in { + monitors = [ + { + name = mkForce "eDP-1"; + width = mkForce 1920; + height = mkForce 1200; + refreshRate = mkForce 60; + workspace = mkForce "1"; + primary = mkForce true; + } + ]; + home = { + # browsers = { + # firefox = { + # enable = true; + # }; + # chromium = { + # enable = false; + # }; + # }; + # comm = { + # discord = { + # enable = true; + # }; + # }; + # devtools = { + # neovim = { + # enable = true; + # }; + # vscode = { + # enable = false; + # }; + # helix = { + # enable = true; + # }; + # }; + gaming = { + steam = { + enable = mkForce false; + }; + # mangohud = { + # enable = false; + # }; + }; + # terminal = { + # alacritty = { + # enable = true; + # }; + # foot = { + # enable = true; + # }; + # kitty = { + # enable = true; + # }; + # wezterm = { + # enable = false; + # }; + # zellij = { + # enable = false; + # }; + # }; + # userd = { + # blueman-applet = { + # enable = true; + # }; + # copyq = { + # enable = true; + # }; + # gpg = { + # enable = false; + # }; + # mako = { + # enable = true; + # }; + # udiskie = { + # enable = true; + # }; + # syncthing = { + # enable = true; + # }; + # }; + # utils = { + # anyrun = { + # enable = false; + # }; + # rofi = { + # enable = false; + # }; + # waybar = { + # enable = true; + # }; + # yazi = { + # enable = true; + # }; + # zathura = { + # enable = true; + # }; + # tuirun = { + # enable = true; + # }; + # misc = { + # enable = true; + # }; + # mpv = { + # enable = true; + # }; + # eza = { + # enable = true; + # }; + # ssh = { + # enable = true; + # }; + # }; + # wm = { + # hyprland = { + # cnst = { + # enable = true; + # }; + # toothpick = { + # enable = false; + # }; + # }; + # utils = { + # hypridle = { + # enable = true; + # }; + # hyprlock = { + # enable = true; + # }; + # hyprpaper = { + # enable = true; + # }; + # }; + # }; + }; +} diff --git a/home/users/cnst/default.nix b/users/cnst/default.nix similarity index 100% rename from home/users/cnst/default.nix rename to users/cnst/default.nix diff --git a/home/users/cnst/git.nix b/users/cnst/git.nix similarity index 100% rename from home/users/cnst/git.nix rename to users/cnst/git.nix diff --git a/home/users/toothpick/modules.nix b/users/cnst/modules.nix similarity index 73% rename from home/users/toothpick/modules.nix rename to users/cnst/modules.nix index 6396af2a..67805eda 100644 --- a/home/users/toothpick/modules.nix +++ b/users/cnst/modules.nix @@ -1,11 +1,21 @@ { - userModules = { + monitors = [ + { + name = "DP-3"; + width = 2560; + height = 1440; + refreshRate = 240; + workspace = "1"; + primary = true; + } + ]; + home = { browsers = { firefox = { enable = true; }; chromium = { - enable = true; + enable = false; }; }; comm = { @@ -18,16 +28,19 @@ enable = true; }; vscode = { + enable = false; + }; + helix = { enable = true; }; }; gaming = { - lutris = { - enable = false; - }; - mangohud = { - enable = false; + steam = { + enable = true; }; + # mangohud = { + # enable = false; + # }; }; terminal = { alacritty = { @@ -39,20 +52,33 @@ kitty = { enable = true; }; + wezterm = { + enable = false; + }; zellij = { enable = false; }; }; userd = { + blueman-applet = { + enable = true; + }; copyq = { enable = true; }; + gpg = { + enable = false; + }; + mako = { enable = true; }; udiskie = { enable = true; }; + syncthing = { + enable = true; + }; }; utils = { anyrun = { @@ -67,12 +93,18 @@ yazi = { enable = true; }; + zathura = { + enable = true; + }; tuirun = { enable = true; }; misc = { enable = true; }; + mpv = { + enable = true; + }; eza = { enable = true; }; @@ -83,10 +115,10 @@ wm = { hyprland = { cnst = { - enable = false; + enable = true; }; toothpick = { - enable = true; + enable = false; }; }; utils = { diff --git a/home/users/cnst/shell.nix b/users/cnst/shell.nix similarity index 100% rename from home/users/cnst/shell.nix rename to users/cnst/shell.nix diff --git a/home/default.nix b/users/default.nix similarity index 73% rename from home/default.nix rename to users/default.nix index f527cd07..a0a8dc3d 100644 --- a/home/default.nix +++ b/users/default.nix @@ -3,32 +3,30 @@ inputs, ... }: let - # Get these into the module system extraSpecialArgs = {inherit inputs self;}; - # Define the shared imports sharedImports = [ - ./modules - ./etc + # ./etc "${self}/.scripts" + self.nixosModules.home + self.nixosModules.options ]; - # Define homeImports for each user, including sharedImports homeImports = { "cnst@cnix" = sharedImports ++ [ - ./users/cnst + ./cnst ]; "cnst@cnixpad" = sharedImports ++ [ - ./users/cnst + ./cnst ]; "toothpick@toothpc" = sharedImports ++ [ - ./users/toothpick + ./toothpick ]; }; @@ -36,13 +34,11 @@ pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - # Function to create home configuration makeHomeConfiguration = modules: homeManagerConfiguration { inherit pkgs extraSpecialArgs modules; }; in { - # we need to pass this to NixOS' HM module _module.args = {inherit homeImports;}; flake = { diff --git a/home/users/toothpick/default.nix b/users/toothpick/default.nix similarity index 100% rename from home/users/toothpick/default.nix rename to users/toothpick/default.nix diff --git a/home/users/toothpick/git.nix b/users/toothpick/git.nix similarity index 100% rename from home/users/toothpick/git.nix rename to users/toothpick/git.nix diff --git a/home/users/cnst/modules.nix b/users/toothpick/modules.nix similarity index 87% rename from home/users/cnst/modules.nix rename to users/toothpick/modules.nix index cb565f65..ab69abc2 100644 --- a/home/users/cnst/modules.nix +++ b/users/toothpick/modules.nix @@ -1,5 +1,15 @@ { - userModules = { + monitors = [ + { + name = "DVI-D-1"; + width = 1920; + height = 1080; + refreshRate = 144; + workspace = "1"; + primary = true; + } + ]; + home = { browsers = { firefox = { enable = true; @@ -18,19 +28,19 @@ enable = true; }; vscode = { - enable = false; + enable = true; }; helix = { enable = true; }; }; gaming = { - lutris = { - enable = false; - }; - mangohud = { - enable = false; + steam = { + enable = true; }; + # mangohud = { + # enable = false; + # }; }; terminal = { alacritty = { @@ -51,7 +61,7 @@ }; userd = { blueman-applet = { - enable = true; + enable = false; }; copyq = { enable = true; @@ -59,7 +69,6 @@ gpg = { enable = false; }; - mako = { enable = true; }; @@ -67,7 +76,7 @@ enable = true; }; syncthing = { - enable = true; + enable = false; }; }; utils = { @@ -84,7 +93,7 @@ enable = true; }; zathura = { - enable = true; + enable = false; }; tuirun = { enable = true; @@ -92,6 +101,9 @@ misc = { enable = true; }; + mpv = { + enable = true; + }; eza = { enable = true; }; @@ -102,10 +114,10 @@ wm = { hyprland = { cnst = { - enable = true; + enable = false; }; toothpick = { - enable = false; + enable = true; }; }; utils = { diff --git a/home/users/toothpick/shell.nix b/users/toothpick/shell.nix similarity index 100% rename from home/users/toothpick/shell.nix rename to users/toothpick/shell.nix