diff options
| -rw-r--r-- | flake.lock | 182 | ||||
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | hosts/aptos/default.nix | 2 | ||||
| -rw-r--r-- | profiles/default.nix | 6 | ||||
| -rw-r--r-- | profiles/workstation.nix | 2 |
5 files changed, 145 insertions, 52 deletions
@@ -3,16 +3,17 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1677964054, - "narHash": "sha256-xy3DhZu9U0Fs6nwp5l8o0rEfEEpqvjjNCds7+ChkOzQ=", + "lastModified": 1684153753, + "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", "owner": "ryantm", "repo": "agenix", - "rev": "1abf0ade92bdf9dbcaa5155bb39e3ae19cb98aaa", + "rev": "db5637d10f797bb251b94ef9040b237f4702cde3", "type": "github" }, "original": { @@ -70,14 +71,15 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1677955337, - "narHash": "sha256-EKsucdkQfukG/2ArjjAipcz/Z+LYifkeY06LHONEBSg=", + "lastModified": 1688552915, + "narHash": "sha256-eMG8RA9lO7YVWpZ2/+IPSnfyt9Zr03UVEc+l6gHz3WQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2efd7c8d60ce0750097bbd327ec083e3ce545b31", + "rev": "c084710df62bb9f681e52452a0cf518d1bfcedec", "type": "github" }, "original": { @@ -119,12 +121,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -134,12 +139,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -179,12 +187,15 @@ } }, "futils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -217,23 +228,41 @@ "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" - ], - "utils": [ - "futils" ] }, "locked": { - "lastModified": 1677783711, - "narHash": "sha256-eq5mOVk3gv5HITtLhPjKwi8bFnOaQplA3X0WFgHnmxE=", + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", "owner": "nix-community", "repo": "home-manager", - "rev": "b9e3a29864798d55ec1d6579ab97876bb1ee9664", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1687871164, + "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -263,11 +292,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1671096816, - "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", + "lastModified": 1688534083, + "narHash": "sha256-/bI5vsioXscQTsx+Hk9X5HfweeNZz/6kVKsbdqfwW7g=", "owner": "nix-community", "repo": "naersk", - "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", + "rev": "abca1fb7a6cfdd355231fc220c3d0302dbb4369a", "type": "github" }, "original": { @@ -278,11 +307,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "lastModified": 1688500189, + "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "rev": "78419edadf0fabbe5618643bd850b2f2198ed060", "type": "github" }, "original": { @@ -292,13 +321,29 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1688482527, + "narHash": "sha256-9zd0YC2gfsRvVJENZsVs1R5LBj5/t127JlCLggn/970=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c7a18f89ef1dc423f57f3de9bd5d9355550a5d15", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1677852945, - "narHash": "sha256-liiVJjkBTuBTAkRW3hrI8MbPD2ImYzwUpa7kvteiKhM=", + "lastModified": 1688556768, + "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5ffd5787786dde3a8bf648c7a1b5f78c4e01abb", + "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de", "type": "github" }, "original": { @@ -308,16 +353,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1677779205, - "narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=", + "lastModified": 1688482527, + "narHash": "sha256-9zd0YC2gfsRvVJENZsVs1R5LBj5/t127JlCLggn/970=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96e18717904dfedcd884541e5a92bf9ff632cf39", + "rev": "c7a18f89ef1dc423f57f3de9bd5d9355550a5d15", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -339,11 +384,11 @@ }, "nur": { "locked": { - "lastModified": 1677966287, - "narHash": "sha256-t+lpOeHlAGCgjzS2JP/hSxdZRTFmzy5E8l+gbr4R4RY=", + "lastModified": 1688571065, + "narHash": "sha256-zHWAa7c4bBY0TS8vtT2/aIHxFQPi3u8niNSXLiJ/8Qk=", "owner": "nix-community", "repo": "NUR", - "rev": "2860ab344d033a877e6a03f1c33cb4b7b5e05ddf", + "rev": "5fa21967065f59569c821da4d92416a9f2e98d2f", "type": "github" }, "original": { @@ -367,11 +412,11 @@ ] }, "locked": { - "lastModified": 1677832802, - "narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=", + "lastModified": 1688569817, + "narHash": "sha256-arDXSfIcVwHCcpB8HAHtdsMMFyhcwYC0xZZ2HjYisbk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "382bee738397ca005206eefa36922cc10df8a21c", + "rev": "8d316204b4b977202551d98ab51a7b8c9898afca", "type": "github" }, "original": { @@ -411,7 +456,7 @@ "agenix": "agenix", "emacs-overlay": "emacs-overlay", "futils": "futils", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "homeage": "homeage", "naersk": "naersk", "nixpkgs": "nixpkgs_3", @@ -429,11 +474,11 @@ ] }, "locked": { - "lastModified": 1677896940, - "narHash": "sha256-F4YW6/+35dwctY4Ogb/vvMfvA6O0UwhDbXE7urDhk4A=", + "lastModified": 1688524421, + "narHash": "sha256-EFauqXKKjbJKPWv3kbzl1lm1GnXl0+DBK4RcLuFndZQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c25d3e1951863ac0061d47a3fabf9aa7c91db5e5", + "rev": "ab050286f18ea354bfe7a49ca8ddcbd633cae1ca", "type": "github" }, "original": { @@ -516,6 +561,51 @@ "type": "git", "url": "https://git.fcuny.net/sendsms" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", @@ -6,7 +6,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-22.11"; + ref = "nixos-23.05"; }; futils.url = "github:numtide/flake-utils"; @@ -26,10 +26,9 @@ type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "master"; + ref = "release-23.05"; inputs = { nixpkgs.follows = "nixpkgs"; - utils.follows = "futils"; }; }; diff --git a/hosts/aptos/default.nix b/hosts/aptos/default.nix index 6b7f695..863e995 100644 --- a/hosts/aptos/default.nix +++ b/hosts/aptos/default.nix @@ -61,5 +61,5 @@ in # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "21.11"; # Did you read the comment? + system.stateVersion = "23.05"; # Did you read the comment? } diff --git a/profiles/default.nix b/profiles/default.nix index 198d9f4..2f2ff9b 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -14,9 +14,11 @@ efi.canTouchEfiVariables = true; }; + tmp = { + cleanOnBoot = true; + useTmpfs = true; + }; kernelPackages = pkgs.linuxPackages_latest; - cleanTmpDir = true; - tmpOnTmpfs = true; }; # Select internationalisation properties. diff --git a/profiles/workstation.nix b/profiles/workstation.nix index 5451199..c21b934 100644 --- a/profiles/workstation.nix +++ b/profiles/workstation.nix @@ -87,6 +87,8 @@ [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ]; }; + programs.zsh.enable = true; + programs.sway = { enable = true; wrapperFeatures.gtk = true; |