From d63f4174a83e7ace32c999b13276771c594a176e Mon Sep 17 00:00:00 2001 From: Mats Rauhala Date: Wed, 17 Nov 2021 21:16:13 +0200 Subject: [PATCH] Initial commit --- flake.lock | 238 ++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 60 ++++++++++++ macbook/masse.nix | 16 ++++ 3 files changed, 314 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 macbook/masse.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..e784439 --- /dev/null +++ b/flake.lock @@ -0,0 +1,238 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1601282935, + "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1637088670, + "narHash": "sha256-d49wUICXl1iItqvk0lbMwjpUbro86mBrV6876C+SLcA=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "5559ef002306dde0093f3d329725259cada9ed41", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "kobodl": { + "inputs": { + "flake-utils": "flake-utils", + "mach-nix": "mach-nix", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1637176046, + "narHash": "sha256-knv4Y7tTWePpYh1zQ+GnUH4BZLGKGaVwinHbeSG+cog=", + "owner": "MasseR", + "repo": "nix-kobodl", + "rev": "df9ebba1b5c8ef6a2328ba8ab68f56ce7da0dca5", + "type": "github" + }, + "original": { + "owner": "MasseR", + "repo": "nix-kobodl", + "type": "github" + } + }, + "mach-nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs", + "pypi-deps-db": "pypi-deps-db" + }, + "locked": { + "lastModified": 1636732295, + "narHash": "sha256-nVHV50D1AqlTIvtZXecUlS5O7BSI2a1ZTmB9x/aMGrc=", + "owner": "DavHau", + "repo": "mach-nix", + "rev": "50367a977bb9a1a267e7f12472725ad08c54702f", + "type": "github" + }, + "original": { + "owner": "DavHau", + "repo": "mach-nix", + "type": "github" + } + }, + "myEmacs": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1637082588, + "narHash": "sha256-wiVv1CIQg+HN32/pXJJAfL+m0XAXX2qZjVncdT/K3r8=", + "owner": "MasseR", + "repo": "nix-conf-emacs", + "rev": "7ede12ff40829b77806975d74abd38b699ff9eb2", + "type": "github" + }, + "original": { + "owner": "MasseR", + "repo": "nix-conf-emacs", + "type": "github" + } + }, + "myVim": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1637082547, + "narHash": "sha256-nN0ffdGYuHmu9flvgS9Mb5dl4c65ZX+NR3dNX8hle/Q=", + "owner": "MasseR", + "repo": "nix-conf-nvim", + "rev": "2490cb536df419f69479b85ff97ca49f387e7c9a", + "type": "github" + }, + "original": { + "owner": "MasseR", + "repo": "nix-conf-nvim", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1622797669, + "narHash": "sha256-xIyWeoYExzF0KNaKcqfxEX58fN4JTIQxTJWbsAujllc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1ca6b0a0cc38dbba0441202535c92841dd39d1ae", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1637172950, + "narHash": "sha256-QOLYv1qhxKkzbL8j5a8EA3vzHy7x6BJO0oCVDNpMNUU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f54808ee5925a90c575dae67459ce0c790ce5b05", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1636886446, + "narHash": "sha256-4xsVM2H8CG3d/3V+GqDDLDOmb3kdrugbqKVyrg8Q/zc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5cb226a06c49f7a2d02863d0b5786a310599df6b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "pypi-deps-db": { + "flake": false, + "locked": { + "lastModified": 1622970040, + "narHash": "sha256-u//RFnae/XMIhoy83G2uH2Qu/1LiUhVCdwwY1xj4Ufs=", + "owner": "DavHau", + "repo": "pypi-deps-db", + "rev": "be6591698c67a86a69c81fef72167e38d038a9fc", + "type": "github" + }, + "original": { + "owner": "DavHau", + "repo": "pypi-deps-db", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "kobodl": "kobodl", + "myEmacs": "myEmacs", + "myVim": "myVim", + "nixpkgs": "nixpkgs_3" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..36f30f6 --- /dev/null +++ b/flake.nix @@ -0,0 +1,60 @@ +{ + description = "Home-manager configuration"; + + inputs = { + nixpkgs = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + myEmacs = { + url = "github:MasseR/nix-conf-emacs"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + myVim = { + url = "github:MasseR/nix-conf-nvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + kobodl = { + url = "github:MasseR/nix-kobodl"; + }; + }; + + outputs = { self, nixpkgs, home-manager, ... } @ inputs: { + + overlays = [ + inputs.myEmacs.overlay + inputs.myVim.overlay + ]; + + homeConfigurations = + let system = "x86_64-linux"; + in + { + "masse@omena" = home-manager.lib.homeManagerConfiguration { + system = system; + homeDirectory = "/home/masse"; + username = "masse"; + stateVersion = "21.05"; + + pkgs = import nixpkgs { + system = system; + overlays = self.overlays ++ [ + (final: prev: { + kobodl = inputs.kobodl.packages.${system}.kobodl; + }) + ]; + }; + + configuration = {pkgs,...}: + { + programs.home-manager.enable = true; + imports = [ + ./macbook/masse.nix + ]; + }; + }; + }; + + }; +} diff --git a/macbook/masse.nix b/macbook/masse.nix new file mode 100644 index 0000000..008ca49 --- /dev/null +++ b/macbook/masse.nix @@ -0,0 +1,16 @@ +{ config, pkgs, ...}: +{ + programs.command-not-found.enable = true; + + home.keyboard.layout = "fi"; + + home.packages = with pkgs; [ + pass + vifm + qutebrowser + kobodl + + myEmacs + myVim + ]; +}