diff --git a/config.nix b/config.nix index 4a80538..4284847 100644 --- a/config.nix +++ b/config.nix @@ -8,7 +8,7 @@ Terminal = { font = "JetBrainsMono Nerd Font"; size = "18"; - shell = "zsh"; # or zsh + shell = "fish"; # or zsh aliases = { }; }; diff --git a/flake.lock b/flake.lock index d6a7d79..860fc34 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,29 @@ "type": "github" } }, + "chaotic": { + "inputs": { + "flake-schemas": "flake-schemas", + "home-manager": "home-manager", + "jovian": "jovian", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1751984126, + "narHash": "sha256-PrNg+sypyNMU0dHLbfVFQx58NEnS59DUIu0SZSq3DSk=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "8feb220c99c94c4957d37253eff6100cc33d7e8a", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -166,6 +189,20 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1721999734, + "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", + "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", + "revCount": 75, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -276,6 +313,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -295,7 +353,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "nixovim", @@ -608,6 +666,28 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751529406, + "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "matugen": { "inputs": { "nixpkgs": [ @@ -651,6 +731,29 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixovim": { "inputs": { "flake-parts": "flake-parts", @@ -658,7 +761,7 @@ "nixpkgs" ], "nixvim": "nixvim", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1751734292, @@ -676,16 +779,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -703,6 +806,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1738797219, + "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1736320768, "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", @@ -718,7 +837,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", @@ -740,9 +859,9 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -851,20 +970,42 @@ }, "root": { "inputs": { + "chaotic": "chaotic", "darwin": "darwin", "flake-utils": "flake-utils", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hyprland": "hyprland", "matugen": "matugen", "nixovim": "nixovim", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", "quickshell": "quickshell" } }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751856221, + "narHash": "sha256-/QE1eV0ckFvgRMcKjZqgdJDoXFNwSMepwRoBjaw2MCk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "34cae4b56929c5b340e1c5b10d9a98a425b2a51e", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1739327257, diff --git a/flake.nix b/flake.nix index e17fd2a..dfb9c10 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; nur = { url = "github:nix-community/NUR"; diff --git a/home/hakase.nix b/home/hakase.nix index 8e873de..35aaff9 100644 --- a/home/hakase.nix +++ b/home/hakase.nix @@ -1,10 +1,16 @@ -{pkgs, ...}: let +{ + pkgs, + inputs, + ... +}: let info = import ../config.nix; in { imports = [ + # inputs.chaotic.homeManagerModules.default ../modules/home/desktop.nix ../modules/home/terminal.nix ]; + # nix.package = pkgs.nix; home.packages = info.myConfig.nixos.Apps.packages pkgs; home.stateVersion = "25.05"; } diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 73e4ab0..c7b1b67 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -8,6 +8,7 @@ }: { imports = [ inputs.home-manager.nixosModules.home-manager + inputs.chaotic.nixosModules.default ./hardware-configuration.nix ../../modules/default/desktop.nix ../../modules/default/dev.nix @@ -84,6 +85,7 @@ services = { displayManager.gdm.enable = true; + scx.enable = true; # by default uses scx_rustland scheduler libinput.enable = true; blueman.enable = true; printing.enable = true; @@ -130,6 +132,8 @@ proxy.default = null; proxy.noProxy = null; }; + + boot.kernelPackages = pkgs.linuxPackages_cachyos; # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether.