diff --git a/flake.lock b/flake.lock index dc53967..5214d6c 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,43 @@ "type": "github" } }, + "aquamarine_2": { + "inputs": { + "hyprutils": [ + "illogical-impulse", + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "illogical-impulse", + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753216019, + "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "be166e11d86ba4186db93e10c54a141058bdce49", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -115,6 +152,22 @@ } }, "flake-compat_2": { + "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-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -202,7 +255,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -225,7 +278,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore_3", "nixpkgs": [ "nixovim", "nixvim", @@ -269,6 +322,29 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { "inputs": { "nixpkgs": [ "nixovim", @@ -333,6 +409,27 @@ } }, "home-manager_3": { + "inputs": { + "nixpkgs": [ + "illogical-impulse", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754924470, + "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "67393957c27b4e4c6c48a60108a201413ced7800", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_4": { "inputs": { "nixpkgs": [ "nixovim", @@ -383,6 +480,38 @@ "type": "github" } }, + "hyprcursor_2": { + "inputs": { + "hyprlang": [ + "illogical-impulse", + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprgraphics": { "inputs": { "hyprutils": [ @@ -412,6 +541,38 @@ "type": "github" } }, + "hyprgraphics_2": { + "inputs": { + "hyprutils": [ + "illogical-impulse", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1752149140, + "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -468,6 +629,33 @@ "type": "github" } }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1749046714, + "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "hyprland-qt-support": { "inputs": { "hyprlang": [ @@ -500,6 +688,41 @@ "type": "github" } }, + "hyprland-qt-support_2": { + "inputs": { + "hyprlang": [ + "illogical-impulse", + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1749154592, + "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", @@ -536,6 +759,78 @@ "type": "github" } }, + "hyprland-qtutils_2": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support_2", + "hyprlang": [ + "illogical-impulse", + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "illogical-impulse", + "hyprland", + "hyprland-qtutils", + "hyprlang", + "hyprutils" + ], + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753819801, + "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, + "hyprland_2": { + "inputs": { + "aquamarine": "aquamarine_2", + "hyprcursor": "hyprcursor_2", + "hyprgraphics": "hyprgraphics_2", + "hyprland-protocols": "hyprland-protocols_2", + "hyprland-qtutils": "hyprland-qtutils_2", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": [ + "illogical-impulse", + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks_2", + "systems": "systems_3", + "xdph": "xdph_2" + }, + "locked": { + "lastModified": 1754662442, + "narHash": "sha256-+nJzzAL+YcU17uuQyfv9KqVIwitbjPf+ZS5P3Qw3E1c=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "00da4450db9bab1abfda169eefec8dab98f63a0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -565,6 +860,38 @@ "type": "github" } }, + "hyprlang_2": { + "inputs": { + "hyprutils": [ + "illogical-impulse", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753622892, + "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -590,6 +917,33 @@ "type": "github" } }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753800567, + "narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -615,6 +969,58 @@ "type": "github" } }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1751897909, + "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "illogical-impulse": { + "inputs": { + "home-manager": "home-manager_3", + "hyprland": "hyprland_2", + "matugen": "matugen", + "nixpkgs": [ + "nixpkgs" + ], + "oneUI": "oneUI", + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1754948165, + "narHash": "sha256-a9z+HGKg/2t213kyzvGBb36FR+Fr3wYXnmUF5CQNl+Q=", + "ref": "refs/heads/main", + "rev": "a34c685b739e3a41bad66fe1d27e3def2ad8a353", + "revCount": 3680, + "type": "git", + "url": "https://git.sakamoto.dev/kenji/illogical-impulse.git" + }, + "original": { + "type": "git", + "url": "https://git.sakamoto.dev/kenji/illogical-impulse.git" + } + }, "ixx": { "inputs": { "flake-utils": [ @@ -688,6 +1094,49 @@ "type": "github" } }, + "matugen": { + "inputs": { + "nixpkgs": [ + "illogical-impulse", + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1745334376, + "narHash": "sha256-GZAesQW51EwCEB9w5caxgi87LiAMhVfP6GqZmet9VZc=", + "owner": "InioX", + "repo": "Matugen", + "rev": "4619cca93513470dc2a1833d9a138297cbccaf2e", + "type": "github" + }, + "original": { + "owner": "InioX", + "repo": "Matugen", + "type": "github" + } + }, + "matugen_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_5" + }, + "locked": { + "lastModified": 1745334376, + "narHash": "sha256-GZAesQW51EwCEB9w5caxgi87LiAMhVfP6GqZmet9VZc=", + "owner": "InioX", + "repo": "Matugen", + "rev": "4619cca93513470dc2a1833d9a138297cbccaf2e", + "type": "github" + }, + "original": { + "owner": "InioX", + "repo": "Matugen", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -857,10 +1306,10 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", - "home-manager": "home-manager_3", + "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_2", "nuschtosSearch": "nuschtosSearch", @@ -904,6 +1353,22 @@ "type": "github" } }, + "oneUI": { + "flake": false, + "locked": { + "lastModified": 1745612116, + "narHash": "sha256-VWgITEJQFbPqIbiGDfDeD0R74y9tCKEfjO/M/tcO94M=", + "owner": "end-4", + "repo": "OneUI4-Icons", + "rev": "693095d45c67e6b48a9873e36af6283f05080e66", + "type": "github" + }, + "original": { + "owner": "end-4", + "repo": "OneUI4-Icons", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -927,6 +1392,51 @@ "type": "github" } }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore_2", + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "illogical-impulse", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1753595452, + "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", + "ref": "refs/heads/master", + "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", + "revCount": 665, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "chaotic": "chaotic", @@ -934,7 +1444,9 @@ "flake-utils": "flake-utils", "home-manager": "home-manager_2", "hyprland": "hyprland", + "illogical-impulse": "illogical-impulse", "jovian": "jovian_2", + "matugen": "matugen_2", "nixovim": "nixovim", "nixpkgs": "nixpkgs_4" } @@ -1009,6 +1521,51 @@ } }, "systems_3": { + "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_4": { + "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_5": { + "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_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1085,6 +1642,53 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "xdph_2": { + "inputs": { + "hyprland-protocols": [ + "illogical-impulse", + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "illogical-impulse", + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "illogical-impulse", + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "illogical-impulse", + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "illogical-impulse", + "hyprland", + "nixpkgs" + ], + "systems": [ + "illogical-impulse", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753633878, + "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 623bd72..8bacf42 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + matugen = { + url = "github:/InioX/Matugen"; + inputs.nixpkgs.follows = "nixpkgs"; + # ref = "refs/tags/matugen-v0.10.0"; + }; + hyprland = { url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; @@ -62,7 +68,6 @@ chaotic.nixosModules.default home-manager.nixosModules.home-manager jovian.nixosModules.default - illogical-impulse.nixosModules.default ./hosts/hakase/configuration.nix ]; }; diff --git a/home/hakase.nix b/home/hakase.nix index 1f564db..79156e0 100644 --- a/home/hakase.nix +++ b/home/hakase.nix @@ -6,10 +6,12 @@ info = import ../config.nix; in { imports = [ + inputs.illogical-impulse.homeManagerModules.default # inputs.chaotic.homeManagerModules.default # ../modules/home/desktop.nix ../modules/home/terminal.nix ]; + programs.illogical-impulse.enable = true; # 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 28e5f46..616c7a2 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -8,7 +8,7 @@ }: { imports = [ ./hardware-configuration.nix - # ../../modules/default/desktop.nix + ../../modules/default/desktop.nix ../../modules/default/remote.nix ../../modules/default/gaming.nix ../../modules/default/udev.nix @@ -16,8 +16,6 @@ ../../modules/default/dev.nix ]; - programs.illogical-impulse.enable = true; - system.stateVersion = "25.05"; i18n.defaultLocale = "en_US.UTF-8"; diff --git a/modules/default/boot.nix b/modules/default/boot.nix index 6005d72..47dc060 100644 --- a/modules/default/boot.nix +++ b/modules/default/boot.nix @@ -50,7 +50,6 @@ }; consoleLogLevel = 0; - - hardware.amdgpu.initrd.enable = true; }; + hardware.amdgpu.initrd.enable = true; } diff --git a/modules/default/desktop.nix b/modules/default/desktop.nix index ca746e2..76ee9dc 100644 --- a/modules/default/desktop.nix +++ b/modules/default/desktop.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - ../../packages/quickshell/default.nix + # ../../packages/quickshell/default.nix ../../packages/hyprland/default.nix ]; } diff --git a/modules/home/apps.nix b/modules/home/apps.nix new file mode 100644 index 0000000..c5f21ea --- /dev/null +++ b/modules/home/apps.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ../../packages/firefox/home.nix + ]; +} diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index a982b99..e52f386 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -2,7 +2,6 @@ imports = [ ../../packages/fonts/home.nix - ../../packages/firefox/home.nix ../../packages/hyprland/home.nix ../../packages/hyprlock/home.nix diff --git a/modules/home/terminal.nix b/modules/home/terminal.nix index 3e80dde..44fd301 100644 --- a/modules/home/terminal.nix +++ b/modules/home/terminal.nix @@ -3,7 +3,7 @@ ../../packages/fish/home.nix ../../packages/kitty/home.nix ../../packages/neovim/home.nix - ../../packages/starship/home.nix + # ../../packages/starship/home.nix ../../packages/fastfetch/home.nix ../../packages/zsh/home.nix ../../packages/zoxide/home.nix diff --git a/result b/result new file mode 120000 index 0000000..34f7152 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/bbmjfn520yfij7z284imjm3dcfvs8fkx-nixos-system-nixos-25.11.20250630.3016b4b \ No newline at end of file