diff --git a/.envrc b/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/flake.lock b/flake.lock index b547bc8..d4f9e75 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -48,11 +48,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -62,6 +62,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -79,7 +100,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -87,11 +108,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -122,7 +143,7 @@ "inputs": { "nixpkgs": [ "lanzaboote", - "pre-commit", + "pre-commit-hooks-nix", "nixpkgs" ] }, @@ -147,11 +168,11 @@ ] }, "locked": { - "lastModified": 1763748372, - "narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=", + "lastModified": 1759337100, + "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", "owner": "nix-community", "repo": "home-manager", - "rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1", + "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", "type": "github" }, "original": { @@ -191,24 +212,25 @@ "lanzaboote": { "inputs": { "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "pre-commit": "pre-commit", - "rust-overlay": [ - "rust-overlay" - ] + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763563389, - "narHash": "sha256-ATuiSBINBTjVXiGOYJAX6ttiDElV9MmjkqG4A8a/J8g=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b2f781751764ff57d54f7cf1910ae1bbf268ed1c", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -231,17 +253,17 @@ "nixcord": { "inputs": { "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1763800004, - "narHash": "sha256-YMWX2gSXHCaQBtGi3r1C3/pyVS6RKRjiUkyXDh1AsZI=", + "lastModified": 1760145372, + "narHash": "sha256-DoYFmqHa/enkUcqJZ4vJ56cE9OdA/VZVPBDByAi4iLw=", "owner": "kaylorben", "repo": "nixcord", - "rev": "52515efd0f8a42e13d6f19e0ba30568a41b8f0b8", + "rev": "a875b64598bf15ae54ad4de539221359de1a2448", "type": "github" }, "original": { @@ -258,11 +280,11 @@ ] }, "locked": { - "lastModified": 1763738061, - "narHash": "sha256-VpNRcInaj1MOya8NmcqhFmdO7KGO7SSZelJQmPl6HoQ=", + "lastModified": 1759348509, + "narHash": "sha256-at9xMhxMP65JYWlGWYJ412VKbS+tXkTM3f5t9Q8IyMA=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "3bcc267c4e0efa023b98b9c5cfbe11b88ec2dc8f", + "rev": "d96dda76c1f1827634ddf28d386feabd2d135d21", "type": "github" }, "original": { @@ -274,11 +296,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -303,9 +325,25 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ], @@ -313,11 +351,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763804171, - "narHash": "sha256-Xu9FXXDHBD2yJRAbeZIiivZXumjgEoWEeUN+XqYnz/o=", + "lastModified": 1759363470, + "narHash": "sha256-qazFCflj7aEqI9YRB+qxKeHHrLMRZnKQB0m/AKn9IKg=", "owner": "nix-community", "repo": "nixvim", - "rev": "85939e8768af58c57e609febfedb40a20ffc16a3", + "rev": "5c4a10093d5367af740c04f2bbe3bab7310d9ad0", "type": "github" }, "original": { @@ -336,11 +374,11 @@ ] }, "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", + "lastModified": 1758662783, + "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", "owner": "NuschtOS", "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", + "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", "type": "github" }, "original": { @@ -349,21 +387,25 @@ "type": "github" } }, - "pre-commit": { + "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": [ + "lanzaboote", + "flake-compat" + ], "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1763741496, - "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -381,22 +423,22 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nixvim": "nixvim", - "rust-overlay": "rust-overlay", "sops-nix": "sops-nix" } }, "rust-overlay": { "inputs": { "nixpkgs": [ + "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1763778964, - "narHash": "sha256-qeOBcixYtZ4yUsBWO6kcjr7ylkrBib4kGDImHNKba9I=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f3aa46dfa230ec2a4ca9281186a24771650ccd1", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -412,11 +454,11 @@ ] }, "locked": { - "lastModified": 1763607916, - "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=", + "lastModified": 1759188042, + "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b", + "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4b487de..5a88538 100644 --- a/flake.nix +++ b/flake.nix @@ -19,14 +19,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { - url = "github:nix-community/lanzaboote"; - inputs = { - nixpkgs.follows = "nixpkgs"; - rust-overlay.follows = "rust-overlay"; - }; - }; - rust-overlay = { - url = "github:oxalica/rust-overlay"; + url = "github:nix-community/lanzaboote/v0.4.2"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-wsl = { @@ -91,17 +84,9 @@ shellHook = '' HOST=$(hostname) - deploy-nixos() { - sudo nixos-rebuild switch --flake .#$HOST "$@" - } - - deploy-vps() { - nixos-rebuild switch --flake .#vps --target-host root@vps "$@" - } - - deploy-home() { - home-manager switch --flake .#$USER@$HOST - } + alias deploy-nixos="sudo nixos-rebuild switch --flake .#$HOST" + alias deploy-vps="nixos-rebuild switch --flake .#vps --target-host root@vps" + alias deploy-home="home-manager switch --flake .#$USER@$HOST" ''; }; } diff --git a/home/modules/cli/direnv.nix b/home/modules/cli/direnv.nix deleted file mode 100644 index fb7dffc..0000000 --- a/home/modules/cli/direnv.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - programs.direnv = { - enable = true; - enableZshIntegration = true; - nix-direnv.enable = true; - }; -} diff --git a/home/modules/cli/git.nix b/home/modules/cli/git.nix index 9669d48..62bc02d 100644 --- a/home/modules/cli/git.nix +++ b/home/modules/cli/git.nix @@ -1,11 +1,9 @@ { programs.git = { enable = true; - settings = { - user = { - name = "lightly-toasted"; - email = "tooast@duck.com"; - }; + userName = "lightly-toasted"; + userEmail = "tooast@duck.com"; + extraConfig = { init.defaultBranch = "main"; }; }; diff --git a/home/modules/cli/nixvim/keymaps.nix b/home/modules/cli/nixvim/keymaps.nix index 8137082..ce7904e 100644 --- a/home/modules/cli/nixvim/keymaps.nix +++ b/home/modules/cli/nixvim/keymaps.nix @@ -88,12 +88,6 @@ action = "lua vim.lsp.buf.code_action()"; options.desc = "LSP Code Action"; } - { - mode = "n"; - key = "rn"; - action = "lua vim.lsp.buf.rename()"; - options.desc = "LSP Rename"; - } { mode = ["n" "x"]; key = "oa"; diff --git a/home/modules/graphical/fonts.nix b/home/modules/graphical/fonts.nix index 24df37b..e5b771c 100644 --- a/home/modules/graphical/fonts.nix +++ b/home/modules/graphical/fonts.nix @@ -6,7 +6,7 @@ home.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-color-emoji + noto-fonts-emoji dejavu_fonts fira-code font-awesome