From caf4bed854462a3fe755f2d07300e26768a7bf22 Mon Sep 17 00:00:00 2001 From: Random936 Date: Sun, 9 Jun 2024 12:52:36 -0700 Subject: [PATCH] Switched to 24.05 channel --- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- home-manager/common.nix | 3 ++- home-manager/darwin-home.nix | 1 - home-manager/nixos-home.nix | 2 -- home-manager/zsh.nix | 2 +- nixos/configuration.nix | 2 +- nixos/darwin-configuration.nix | 1 + 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 3522931..b9ac50b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -43,16 +43,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715668745, - "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", + "lastModified": 1717696253, + "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", + "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 83b7d41..afec4ee 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "Configuration flake for RandomCTF"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/common.nix b/home-manager/common.nix index 41306dc..4cc7b8c 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -25,7 +25,6 @@ ffuf nikto sqlmap - wpscan thc-hydra exploitdb feroxbuster @@ -54,4 +53,6 @@ home.file = { ".functions.zsh".source = ../dotfiles/.functions.zsh; }; + + home.stateVersion = "24.05"; } diff --git a/home-manager/darwin-home.nix b/home-manager/darwin-home.nix index 8f78359..d3e6a80 100644 --- a/home-manager/darwin-home.nix +++ b/home-manager/darwin-home.nix @@ -18,5 +18,4 @@ in ]; home.file.".tmux/plugins/tpm".source = "${mypkgs.tpm}"; - home.stateVersion = "23.11"; } diff --git a/home-manager/nixos-home.nix b/home-manager/nixos-home.nix index e418a99..498e1eb 100644 --- a/home-manager/nixos-home.nix +++ b/home-manager/nixos-home.nix @@ -58,6 +58,4 @@ ".config/polybar/config.ini".source = ../dotfiles/.config/polybar/config.ini; }; - - home.stateVersion = "23.11"; } diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index f2ad2e7..61dd74f 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -7,7 +7,7 @@ programs.zsh = { enable = true; enableCompletion = true; - enableAutosuggestions = true; + autosuggestion.enable = true; syntaxHighlighting.enable = true; history.size = 100000000; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 1353f4d..dcf6e7a 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -120,5 +120,5 @@ # Enable sshd service. services.openssh.enable = true; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; } diff --git a/nixos/darwin-configuration.nix b/nixos/darwin-configuration.nix index a1a6f19..048a7c4 100644 --- a/nixos/darwin-configuration.nix +++ b/nixos/darwin-configuration.nix @@ -53,5 +53,6 @@ }; # Used for backwards compatibility. + system.stateVersion = 4; }