diff --git a/configuration/modules/desktop.nix b/configuration/modules/desktop.nix index a979daa..194d5dd 100644 --- a/configuration/modules/desktop.nix +++ b/configuration/modules/desktop.nix @@ -28,7 +28,6 @@ package = inputs.hyprland.packages."x86_64-linux".hyprland; portalPackage = inputs.hyprland.packages."x86_64-linux".xdg-desktop-portal-hyprland; }; - hyprlock.enable = true; }; security.pam.services.hyprlock = {}; diff --git a/flake.lock b/flake.lock index fd09eb4..ed0b555 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1756083905, - "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1757997814, - "narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=", + "lastModified": 1759337100, + "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", "owner": "nix-community", "repo": "home-manager", - "rev": "5820376beb804de9acf07debaaff1ac84728b708", + "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", "type": "github" }, "original": { @@ -310,11 +310,11 @@ ] }, "locked": { - "lastModified": 1757542864, - "narHash": "sha256-8i9tsVoOmLQDHJkNgzJWnmxYFGkJNsSndimYpCoqmoA=", + "lastModified": 1758192433, + "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "aa9d14963b94186934fd0715d9a7f0f2719e64bb", + "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", "type": "github" }, "original": { @@ -341,11 +341,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1757977770, - "narHash": "sha256-opWeyLdiAoI4OfEatTnijIu8JBcdAwFdd6MW2pErK4c=", + "lastModified": 1759399554, + "narHash": "sha256-FsFugHj7He5siEcmoRUdMKHB8uMzyneK/fynPS57W4E=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5e96fac52fbd353eaf51ac436d1ada16a021e5f2", + "rev": "3bcfa94ee4189faaa4daf661949e88cf28c00d94", "type": "github" }, "original": { @@ -434,11 +434,11 @@ ] }, "locked": { - "lastModified": 1757508108, - "narHash": "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=", + "lastModified": 1757694755, + "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "119bcb9aa742658107b326c50dcd24ab59b309b7", + "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -569,11 +569,11 @@ ] }, "locked": { - "lastModified": 1756961635, - "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1757955071, - "narHash": "sha256-owSpkt551cIqDDk5iHesdEus9REFeOIY3rY4C5ZPm/Y=", + "lastModified": 1758271661, + "narHash": "sha256-ENqd2/33uP5vB44ClDjjAV+J78oF8q1er4QUZuT8Z7g=", "owner": "notashelf", "repo": "nvf", - "rev": "1bd9fc116420db4c1156819d61df5d5312e1bbea", + "rev": "b7571df4d6e9ac08506a738ddceeec0b141751b0", "type": "github" }, "original": { @@ -616,11 +616,11 @@ ] }, "locked": { - "lastModified": 1757588530, - "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757956156, - "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=", + "lastModified": 1759404594, + "narHash": "sha256-k9hd15rLqG7x3OCUPrcQtpleDlOyQjy16ZEseruypNQ=", "owner": "danth", "repo": "stylix", - "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb", + "rev": "3f70c5855572004f9c630ed4a92aa186755361be", "type": "github" }, "original": { @@ -753,11 +753,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1754779259, - "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -769,11 +769,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1754788770, - "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -785,11 +785,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1755613540, - "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { diff --git a/home/modules/create-project/create-project.nix b/home/modules/create-project/create-project.nix index abde812..084efc0 100644 --- a/home/modules/create-project/create-project.nix +++ b/home/modules/create-project/create-project.nix @@ -46,17 +46,20 @@ rm "init.sh" } + git init + git add . + git commit -m "Project setup" + if $local { print "You are all done" exit 0 } - git init - git add . - git commit -m "Project setup" + tea repos create --name $name + git remote add origin $"https://git.silvers.fun/max_ag/($name).git" + git push -u origin main print "You are all done" - exit 0 } '') diff --git a/home/modules/create-project/project-blueprints/rust/.gitignore b/home/modules/create-project/project-blueprints/rust/.gitignore new file mode 100644 index 0000000..eb5a316 --- /dev/null +++ b/home/modules/create-project/project-blueprints/rust/.gitignore @@ -0,0 +1 @@ +target diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index bbd0304..e5472a2 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -103,7 +103,7 @@ "$mainMod, code:23, swapsplit" "$mainMod, code:66, togglesplit" "Alt, F4, exec, hyprctl kill" - "$mainMod, exec, hyprlock" + "$mainMod, L, exec, hyprlock" # switch focus "$mainMod, left, movefocus, l" @@ -200,48 +200,6 @@ programs.hyprlock = { enable = true; - - settings = { - general = { - hide_cursor = true; - ignore_empty_input = true; - }; - - animations = { - enabled = true; - fade_in = { - duration = 300; - bezier = "easeOutQuint"; - }; - fade_out = { - duration = 300; - bezier = "easeOutQuint"; - }; - }; - - background = [ - { - path = "screenshot"; - blur_passes = 3; - blur_size = 8; - } - ]; - - input-field = [ - { - size = "200, 50"; - position = "0, -80"; - monitor = ""; - dots_center = true; - fade_on_empty = false; - font_color = "rgb(202, 211, 245)"; - inner_color = "rgb(91, 96, 120)"; - outer_color = "rgb(24, 25, 38)"; - outline_thickness = 5; - shadow_passes = 2; - } - ]; - }; }; programs.hyprpanel = { diff --git a/home/modules/rice.nix b/home/modules/rice.nix index 8247a52..a43eb49 100644 --- a/home/modules/rice.nix +++ b/home/modules/rice.nix @@ -8,6 +8,7 @@ btop fastfetch oh-my-posh + tea ]; gtk.enable = true; @@ -59,9 +60,6 @@ main = { term = "xterm-256color"; }; - #colors = { - # alpha = "0.85"; - #}; }; }; diff --git a/home/modules/shells.nix b/home/modules/shells.nix index 5ecf8e4..2e9e92e 100644 --- a/home/modules/shells.nix +++ b/home/modules/shells.nix @@ -41,8 +41,29 @@ fastfetch } - def flake [command?: string] { + def flake [...command: string] { + let git_result = do { git rev-parse --show-toplevel } | complete + if $git_result.exit_code != 0 { + print "You are not in a git repository" + return + } + let root = $git_result.stdout | str trim + let flake_path = $root | path join "flake.nix" + if not ($flake_path | path exists) { + print "There is no flake in this repository" + return + } + let dev_check = do { nix develop $root --command true } | complete + if $dev_check.exit_code == 0 { + if ($command | is-empty) { + nix develop $root + } else { + nix develop $root --command ...$command + } + } else { + print "This flake doesn't have a default shell" + } } def edit [user_file?: path] { @@ -65,7 +86,6 @@ return } - # nix develop will exit with error if no devShell exists let dev_check = do { nix develop $root --command true } | complete if $dev_check.exit_code == 0 { diff --git a/home/modules/stylix.nix b/home/modules/stylix.nix index 318723d..b6101e3 100644 --- a/home/modules/stylix.nix +++ b/home/modules/stylix.nix @@ -31,8 +31,9 @@ opacity.terminal = 0.75; - targets.nvf = { - enable = false; + targets = { + nvf.enable = false; + hyprpanel.enable = false; }; cursor = {