diff --git a/flake.lock b/flake.lock index afb1a72..d392be0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.11", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1701539137, @@ -18,6 +39,7 @@ }, "root": { "inputs": { + "home-manager": "home-manager", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 584eb38..12f42b8 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,19 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs, + home-manager, }: let system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; - pkgs = import nixpkgs { + npkgs = import nixpkgs { inherit system; config = { @@ -20,13 +24,21 @@ }; in { nixosConfigurations = { - myNixos = nixpkgs.lib.nixosSystem { - specialArgs = {inherit system;}; - + myNixos = npkgs.lib.nixosSystem { + inherit system; modules = [ ./nixos/configuration.nix ]; }; }; + homeConfigurations = { + forestcat = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ + ./home.nix + ]; + }; + + }; }; } diff --git a/home.nix b/home.nix new file mode 100644 index 0000000..83bf9a1 --- /dev/null +++ b/home.nix @@ -0,0 +1,71 @@ +{ config, pkgs, ... }: + +{ + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = "forestcat"; + home.homeDirectory = "/home/forestcat"; + + # This value determines the Home Manager release that your configuration is + # compatible with. This helps avoid breakage when a new Home Manager release + # introduces backwards incompatible changes. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "23.11"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + home.packages = [ + # # Adds the 'hello' command to your environment. It prints a friendly + # # "Hello, world!" when run. + # pkgs.hello + + # # It is sometimes useful to fine-tune packages, for example, by applying + # # overrides. You can do that directly here, just don't forget the + # # parentheses. Maybe you want to install Nerd Fonts with a limited number of + # # fonts? + # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (pkgs.writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') + ]; + + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + home.file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; + }; + + # Home Manager can also manage your environment variables through + # 'home.sessionVariables'. If you don't want to manage your shell through Home + # Manager then you have to manually source 'hm-session-vars.sh' located at + # either + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user/forestcat/etc/profile.d/hm-session-vars.sh + # + home.sessionVariables = { + # EDITOR = "emacs"; + }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 81b0d8c..8766cec 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -90,6 +90,7 @@ environment.systemPackages = with pkgs; [ # System Packages go here pkgs.brave + pkgs.alejandra pkgs.keepassxc pkgs.kitty pkgs.swww