From 11141465a4f8d1d3065321561c924ae2a2d47952 Mon Sep 17 00:00:00 2001 From: TheK0tYaRa Date: Mon, 23 Feb 2026 02:27:22 +0200 Subject: [PATCH] fixup --- configuration.nix | 2 +- flake.lock | 227 ++++++++++++++++++++++++---------------------- home.nix | 31 ++++--- 3 files changed, 134 insertions(+), 126 deletions(-) diff --git a/configuration.nix b/configuration.nix index 1f1dd9f..714be48 100644 --- a/configuration.nix +++ b/configuration.nix @@ -217,7 +217,7 @@ programs = { niri.enable = true; gnome-terminal.enable = true; - thunar.enable = true; + thunar.enable = true; # TODO: replace winbox = { enable = true; package = pkgs.winbox4; diff --git a/flake.lock b/flake.lock index 4d3925f..4c5a1c8 100644 --- a/flake.lock +++ b/flake.lock @@ -8,7 +8,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1736955230, @@ -69,24 +69,6 @@ "type": "github" } }, - "cosmic-unstable": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1771388570, - "narHash": "sha256-FWWZEzLWqS6ewMdzDFg1OHhKE6p8Gq9sZsAQPQDOgh4=", - "owner": "ninelore", - "repo": "nixpkgs-cosmic-unstable", - "rev": "38761c5789401312651773e895c06e4ccd39c7cd", - "type": "github" - }, - "original": { - "owner": "ninelore", - "repo": "nixpkgs-cosmic-unstable", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1771121070, @@ -148,11 +130,11 @@ ] }, "locked": { - "lastModified": 1771355198, - "narHash": "sha256-89m5VKxIs8QNiIvLsxHu5NpyhDsoXTtoN801IAurnW4=", + "lastModified": 1771469470, + "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", "owner": "nix-community", "repo": "disko", - "rev": "92fceb111901a6f13e81199be4fab95fce86a5c9", + "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", "type": "github" }, "original": { @@ -234,20 +216,35 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ "intel-hw", - "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -294,7 +291,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -320,11 +317,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1771581339, - "narHash": "sha256-urDIO7dXioLRRA8GAPFlAvfcOzcEAyGWr43532/yWo0=", + "lastModified": 1771769077, + "narHash": "sha256-8+hb213QO3gG73xSVzpABabr0ZkEuEuJQIqc38PRosI=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "585bf3fcd25be3d1d70383a0f1b55e0f6744d639", + "rev": "504a3611f6f2d9a1cb1a4eb419b41aea3c8049ca", "type": "github" }, "original": { @@ -334,7 +331,52 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "intel-hw", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770726378, + "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { + "inputs": { + "nixpkgs": [ + "intel-hw", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "intel-hw", @@ -385,11 +427,11 @@ ] }, "locked": { - "lastModified": 1771531206, - "narHash": "sha256-1R3Wx6KUkMb4x4E5UOhW9p6rqiexzSGGWxZqSHqW5n0=", + "lastModified": 1771756436, + "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "91be7cce763fa4022c7cf025a71b0c366d1b6e77", + "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", "type": "github" }, "original": { @@ -406,11 +448,11 @@ ] }, "locked": { - "lastModified": 1771269455, - "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", + "lastModified": 1771519029, + "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", + "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", "type": "github" }, "original": { @@ -445,23 +487,24 @@ "inputs": { "classified": "classified", "comoji": "comoji", - "cosmic-unstable": "cosmic-unstable", "disko": "disko", "fenix": "fenix", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", "home-manager": "home-manager_3", "lanzaboote": "lanzaboote", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nu-env": "nu-env", - "nur": "nur", + "systems": "systems_5", "templates": "templates", "valhali": "valhali" }, "locked": { - "lastModified": 1771418655, - "narHash": "sha256-bsmRubUzPpcmLW2lEiaF7AhNJ5jFNu2/CA9sVO3UTf8=", + "lastModified": 1771784907, + "narHash": "sha256-UnvCwYVWZ6ScYYRZ0B9i4Nl5hAfw+Y/GFJkjLG1KL6w=", "owner": "MordragT", "repo": "nixos", - "rev": "a054fdf806adfe4245af3349fcdfd5550825382c", + "rev": "d466cf2c055ab6017cdfcde89fb19cbbf757f7d9", "type": "github" }, "original": { @@ -481,11 +524,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1771322141, - "narHash": "sha256-7NF2aiWw7cL+KAdOgSXEV9fg4Y6SH8NmEgSBYIdKfcw=", + "lastModified": 1771492583, + "narHash": "sha256-nQzvnU4BGu8dA6BsPPCqmVcab/3ebVmHtX3ZWbW3Hxc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "89594c01208e1e0218050d63a3570a3e1b4447ac", + "rev": "5e9380994665ef66c87ab8e22c913ff837174ce4", "type": "github" }, "original": { @@ -518,7 +561,7 @@ }, "niri": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -567,27 +610,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -596,23 +623,7 @@ "type": "indirect" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1757584362, "narHash": "sha256-XeTX/w16rUNUNBsfaOVCDoMMa7Xu7KvIMT7tn1zIEcg=", @@ -626,7 +637,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1757967192, "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", @@ -642,7 +653,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1771369470, "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", @@ -658,7 +669,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -696,29 +707,10 @@ "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1771399164, - "narHash": "sha256-4do0dRhBXjQwjtZhdpHvIsvF27vQv2rGA3GuJ6uZtZE=", - "owner": "nix-community", - "repo": "NUR", - "rev": "974e255a87ea2b1f4b150b0732102207f662abd0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", "nixpkgs": [ "intel-hw", "lanzaboote", @@ -744,7 +736,7 @@ "agenix": "agenix", "crane": "crane_2", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay_3" }, "locked": { @@ -769,7 +761,7 @@ "home-manager": "home-manager_2", "intel-hw": "intel-hw", "niri": "niri", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "ragenix": "ragenix" } }, @@ -959,9 +951,24 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "templates": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1757668691, @@ -1015,7 +1022,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, diff --git a/home.nix b/home.nix index bd86831..2820d6a 100644 --- a/home.nix +++ b/home.nix @@ -382,21 +382,6 @@ }; }; # - wezterm = { - enable = true; - extraConfig = '' -local wezterm = require 'wezterm' - -local config = wezterm.config_builder() - -config.default_prog = { "fish", "--login" --, "-c", "tmux attach -t dev || tmux new -s dev" -} -config.color_scheme = "Ayu Dark" -config.hide_tab_bar_if_only_one_tab = true - -return config - ''; - }; ghostty = { # enable = true; # package = ghostty.packages.${system}.default; @@ -454,6 +439,7 @@ return config }; }; }; + # nheko.enable = true; nix-your-shell.enable = true; obs-studio = { enable = true; @@ -481,6 +467,21 @@ return config }; vscode.enable = true; waybar.enable = true; + wezterm = { + enable = true; + extraConfig = '' + local wezterm = require 'wezterm' + + local config = wezterm.config_builder() + + config.default_prog = { "fish", "--login" --, "-c", "tmux attach -t dev || tmux new -s dev" + } + config.color_scheme = "Ayu Dark" + config.hide_tab_bar_if_only_one_tab = true + + return config + ''; + }; yt-dlp = { enable = true; package = pkgs.yt-dlp;