diff --git a/flake.lock b/flake.lock index 13275b2..8a2a553 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1736591904, - "narHash": "sha256-LFO8pSrPKrH8OPq2HaAuBG5skk8/MNJ/9YmK3KsnSks=", + "lastModified": 1735468753, + "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", "owner": "nix-community", "repo": "disko", - "rev": "33827d2bd16bfe2e21b62956526c72d313595dfd", + "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", "type": "github" }, "original": { @@ -107,22 +107,6 @@ "type": "github" } }, - "firefox-gnome-theme": { - "flake": false, - "locked": { - "lastModified": 1734969791, - "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -161,11 +145,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -255,37 +239,6 @@ "type": "github" } }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "stylix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -308,28 +261,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "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" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -354,11 +285,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1735925111, + "narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1", "type": "github" }, "original": { @@ -375,11 +306,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1735900408, + "narHash": "sha256-U+oZBQ3f5fF2hHsupKQH4ihgTKLHgcJh6jEmKDg+W10=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "1c8d4c8d592e8fab4cff4397db5529ec6f078cf9", "type": "github" }, "original": { @@ -445,11 +376,11 @@ ] }, "locked": { - "lastModified": 1736580596, - "narHash": "sha256-t+BygGMcg1yyyTBXCAJWx4ZnH1StDzbd8CfzQonAJp8=", + "lastModified": 1735931035, + "narHash": "sha256-f3WRxasPYVKzrvAlLq+/3FRHQVfxVf5xxf0WWwnO99k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1ddf0b3bfe076fa50b84244e42a55b9234f96083", + "rev": "7e530766a5fd9b7577296fedd655f3255f7495d8", "type": "github" }, "original": { @@ -470,11 +401,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1736578404, - "narHash": "sha256-T3+GRxn40DHAlPuhTL7C25GSiRnB04A83Py11K06Y70=", + "lastModified": 1735926524, + "narHash": "sha256-BRcp1VNIeGL709AfiVTKx06ZnjhuixZtB7Wjryo8c+s=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d975e5fc32ed51c6f26e1d8cd77e37fb2d0e1ec2", + "rev": "470ebbc098914eded248cc257bcd67f0036e96a4", "type": "github" }, "original": { @@ -503,11 +434,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1736575845, - "narHash": "sha256-sLPCK9H4rIGV11xEckMPn7u+GzrPkDdoYr6HGHsJ6V4=", + "lastModified": 1735914396, + "narHash": "sha256-QMvvPKqqaTCfGQf4v77lyz8n8gabuQbocc5tzA8x8cw=", "owner": "YaLTeR", "repo": "niri", - "rev": "d574341f1f00dfeb7bedbd592d53f62e2911752d", + "rev": "b3c6f0e661878c7ab4f3c84c480ae61a5de5d3b3", "type": "github" }, "original": { @@ -524,11 +455,11 @@ ] }, "locked": { - "lastModified": 1736370755, - "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", + "lastModified": 1735685839, + "narHash": "sha256-62xAPSs5VRZoPH7eRanUn5S5vZEd+8vM4bD5I+zxokc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", + "rev": "6a1fdb2a1204c0de038847b601cff5012e162b5e", "type": "github" }, "original": { @@ -561,11 +492,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -576,11 +507,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -592,11 +523,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { @@ -621,11 +552,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736598781, - "narHash": "sha256-Y0o9ahm6Kk0DumTo80/vKspkHOkbtFgKCNiICyRjhMs=", + "lastModified": 1735937973, + "narHash": "sha256-kUNsnN7AUMS7I/GOSRCdftM77zY4EOuEROlE7whBRPU=", "owner": "nix-community", "repo": "nixvim", - "rev": "2fc2132a78753fc3d7ec732044eff7ad69530055", + "rev": "4f4917be697e7ef39ebada3737e51cb42e0cbe79", "type": "github" }, "original": { @@ -678,11 +609,11 @@ ] }, "locked": { - "lastModified": 1736515725, - "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", + "lastModified": 1735844895, + "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", "owner": "mic92", "repo": "sops-nix", - "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", + "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", "type": "github" }, "original": { @@ -697,10 +628,8 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", - "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", - "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": [ @@ -709,15 +638,14 @@ "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux", - "tinted-zed": "tinted-zed" + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1736530113, - "narHash": "sha256-a+IUtGdzESNSQEZkW99TXf5js8o4Oy9M4H2am+2ECp4=", + "lastModified": 1735933801, + "narHash": "sha256-SbkFaIYzfoasvu6GN5fdlaltrcEtUcoPsTRulWNkH7E=", "owner": "danth", "repo": "stylix", - "rev": "f1e003194cb528bbd4eda50b781d1f703611782d", + "rev": "e0a41d3a2562ce1b43cad8560333673d04b111b8", "type": "github" }, "original": { @@ -806,22 +734,6 @@ "type": "github" } }, - "tinted-zed": { - "flake": false, - "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -830,11 +742,11 @@ ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "type": "github" }, "original": { @@ -863,11 +775,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1736487362, - "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=", + "lastModified": 1734745564, + "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1", + "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766", "type": "github" }, "original": { diff --git a/modules/default/home-manager/default.nix b/modules/default/home-manager/default.nix index 4d85d70..53c6443 100644 --- a/modules/default/home-manager/default.nix +++ b/modules/default/home-manager/default.nix @@ -6,7 +6,6 @@ ./shell ./tmux ./utils - ./direnv.nix ./git.nix ./stylix.nix ]; diff --git a/modules/default/home-manager/desktop/default.nix b/modules/default/home-manager/desktop/default.nix index e04d1d3..5f68f43 100644 --- a/modules/default/home-manager/desktop/default.nix +++ b/modules/default/home-manager/desktop/default.nix @@ -8,7 +8,6 @@ ./options.nix ./kitty.nix ./vscodium.nix - ./zed.nix ]; home-manager.users.willifan = { diff --git a/modules/default/home-manager/desktop/vscodium.nix b/modules/default/home-manager/desktop/vscodium.nix index 6fdab9a..50da789 100644 --- a/modules/default/home-manager/desktop/vscodium.nix +++ b/modules/default/home-manager/desktop/vscodium.nix @@ -11,8 +11,6 @@ "explorer.confirmDragAndDrop" = false; "cmake.showOptionsMovedNotification" = false; "extensions.autoUpdate" = false; - "rust-analyzer.check.command" = "clippy"; - "editor.formatOnSave" = true; }; extensions = with pkgs.vscode-extensions; [ # System diff --git a/modules/default/home-manager/desktop/zed.nix b/modules/default/home-manager/desktop/zed.nix deleted file mode 100644 index 06e2ce5..0000000 --- a/modules/default/home-manager/desktop/zed.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, config, pkgs, ... }: -lib.mkIf config.desktop.enable { - home-manager.users.willifan.programs.zed-editor = { - enable = true; - extensions = [ "nix" "toml" ]; - userSettings = { - load_direnv = "direct"; - }; - }; - - fonts.packages = [ pkgs.nerd-fonts.jetbrains-mono ]; -} diff --git a/modules/default/home-manager/direnv.nix b/modules/default/home-manager/direnv.nix deleted file mode 100644 index 957ac88..0000000 --- a/modules/default/home-manager/direnv.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: -{ - - programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - }; - - }; -}