diff options
| -rw-r--r-- | flake.lock | 18 | ||||
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | home.nix | 28 |
3 files changed, 21 insertions, 34 deletions
@@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675935446, - "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", + "lastModified": 1678271387, + "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", + "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676110339, - "narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=", + "lastModified": 1678380223, + "narHash": "sha256-HUxnK38iqrX84QdQxbFcosRKV3/koj1Zzp5b5aP4lIo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8", + "rev": "1e2590679d0ed2cee2736e8b80373178d085d263", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -20,6 +20,7 @@ home-manager, ... }: let + username = builtins.getEnv "USER"; system = "x86_64-linux"; mvinkioPkgs = mvinkio.legacyPackages.${system}; @@ -39,21 +40,21 @@ modules = [./configuration.nix ./lemptop.nix]; }; - homeConfigurations.mike = home-manager.lib.homeManagerConfiguration { + homeConfigurations.mvinkio = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ ./home.nix ]; - extraSpecialArgs = { flake = self; home-manager = home-manager; + username = username; }; }; templates.default = { - path = ./templates/flake; - description = "nix flake new -t ~/flake"; + path = ./templates/flake; + description = "nix flake new -t ~/flake"; }; }; } @@ -1,5 +1,6 @@ { flake, + username, config, pkgs, home-manager, @@ -10,10 +11,11 @@ ./home/neovim.nix ./home/st.nix ]; - - home.username = "mike"; - home.homeDirectory = "/home/mike"; + home.homeDirectory = "/home/${username}"; + home.username = username; home.stateVersion = "22.05"; + + programs.home-manager.enable = true; home.sessionVariables = { @@ -26,35 +28,19 @@ home.packages = with pkgs; [ - docker - k9s + ansible kubernetes-helm powershell azure-cli kubectl krew jq - wireshark htop - fortune - vim - dmenu - stow - (nerdfonts.override {fonts = ["FiraCode"];}) subversion ripgrep inotify-tools fzf - - firefox-wayland - - swaylock - swayidle - xclip - mako - wofi - waybar ] ++ (import ./shell-scripts.nix {inherit pkgs config;}); @@ -68,7 +54,7 @@ shellAliases = { s = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/flake#"; b = "/run/current-system/bin/switch-to-configuration boot"; - h = "home-manager switch --flake ${config.home.homeDirectory}/flake#${config.home.username}"; + h = "home-manager switch --flake ${config.home.homeDirectory}/flake#mvinkio"; V = "xrandr --output HDMI1 --auto --output eDP1 --off"; v = "xrandr --output eDP1 --auto --output HDMI1 --off"; vV = "xrandr --output eDP1 --auto --output HDMI1 --off"; |