diff --git a/flake.lock b/flake.lock index 1ec7a51..a2a03f8 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1669740584, - "narHash": "sha256-rHxz/olYeCx9GHjJTZElkVCVo4aXaP9FNaQ8oyCLz9A=", + "lastModified": 1669825171, + "narHash": "sha256-HxlZHSiRGXnWAFbIJMeujqBe2KgACYx5XDRY0EA9P+4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b0a446bbf29cfeb78e0d1a8210bdf6fae8efccd", + "rev": "478610aa37c8339eacabfa03f07dacf5574edd47", "type": "github" }, "original": { @@ -64,19 +64,20 @@ "inputs": { "nixpkgs": [ "nixpkgs-stable" - ] + ], + "utils": "utils_3" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1669724862, + "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -121,27 +122,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1669546925, - "narHash": "sha256-Gvtk9agz88tBgqmCdHl5U7gYttTkiuEd8/Rq1Im0pTg=", + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fecf05d4861f3985e8dee73f08bc82668ef75125", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1669758617, - "narHash": "sha256-aOucvlsBl2c6YXXw+byes7kLUILBbFp2/e3VSJYDs2U=", + "lastModified": 1669805596, + "narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=", "owner": "nix-community", "repo": "nur", - "rev": "0517f9ff4814db2a25b994b089157e38b036af96", + "rev": "c81b1e527f3a220abfa9bf8096153d52784c5007", "type": "github" }, "original": { @@ -190,6 +191,21 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 995754c..fe9211d 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.11"; home-manager-stable = { - url = "github:nix-community/home-manager/release-22.05"; + url = "github:nix-community/home-manager/release-22.11"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; diff --git a/users/common/programs.nix b/users/common/programs.nix index 084687f..e12ea32 100644 --- a/users/common/programs.nix +++ b/users/common/programs.nix @@ -8,16 +8,16 @@ enable = true; historyFile = "~/.cache/bash_history"; }; - #micro = { - # enable = true; - # settings = { - # clipboard = "terminal"; - # mkparents = true; - # scrollbar = true; - # tabstospaces = true; - # tabsize = 2; - # }; - #}; + micro = { + enable = true; + settings = { + clipboard = "terminal"; + mkparents = true; + scrollbar = true; + tabstospaces = true; + tabsize = 2; + }; + }; fish = { enable = true; interactiveShellInit = "any-nix-shell fish --info-right | source"; diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix index d2ef92c..988a23e 100644 --- a/users/desktops/common/programs.nix +++ b/users/desktops/common/programs.nix @@ -31,16 +31,6 @@ upgrade-boot = "rm ~/.gtkrc-2.0; nix flake update --commit-lock-file /home/user/Projects/nix-config; sudo nixos-rebuild boot --upgrade --flake '/home/user/Projects/nix-config#'"; }; }; - micro = { - enable = true; - settings = { - clipboard = "terminal"; - mkparents = true; - scrollbar = true; - tabstospaces = true; - tabsize = 2; - }; - }; btop = { enable = true; settings = {