diff --git a/flake.lock b/flake.lock index df1d561..6bef695 100644 --- a/flake.lock +++ b/flake.lock @@ -203,16 +203,15 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1708031129, + "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -290,16 +289,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708105575, - "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c576391..49e7454 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,10 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/default.nix b/home/default.nix index 51b91db..55a9974 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,6 +5,7 @@ ./programs/git.nix ./programs/emacs.nix ./programs/vscode.nix + ./programs/mise.nix ]; home = { diff --git a/home/programs/mise.nix b/home/programs/mise.nix new file mode 100644 index 0000000..9bf99bc --- /dev/null +++ b/home/programs/mise.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: + +{ + programs.mise = { + enable = true; + + settings = { + experimental = true; + }; + }; +} \ No newline at end of file diff --git a/home/programs/vscode.nix b/home/programs/vscode.nix index 1e87d49..18b3580 100644 --- a/home/programs/vscode.nix +++ b/home/programs/vscode.nix @@ -29,7 +29,7 @@ elixir-lsp.vscode-elixir-ls # Ruby - rebornix.ruby # nixpkgs#unstable -> Migrate to shopify.ruby-lsp + shopify.ruby-lsp ]; }; } \ No newline at end of file diff --git a/modules/keymaps/fr.nix b/modules/keymaps/fr.nix index 53ffe96..6bd3bd9 100644 --- a/modules/keymaps/fr.nix +++ b/modules/keymaps/fr.nix @@ -2,8 +2,10 @@ { # Configure keymap in X11 services.xserver = { - layout = "fr"; - xkbVariant = ""; + xkb = { + layout = "fr"; + variant = ""; + }; }; # Configure console keymap diff --git a/modules/keymaps/us.nix b/modules/keymaps/us.nix index 167d747..ac53ffe 100644 --- a/modules/keymaps/us.nix +++ b/modules/keymaps/us.nix @@ -2,8 +2,10 @@ { # Configure keymap in X11 services.xserver = { - layout = "us"; - xkbVariant = "altgr-intl"; + xkb = { + layout = "us"; + variant = "altgr-intl"; + }; }; # Configure console keymap