flake.nix

@@ -77,57 +77,11 @@
               {
                 programs.home-manager.enable = true;
                 imports = self.nixosModules ++ [
-                  ./omena/masse.nix
+                  ./macbook/masse.nix
                 ];
               };
           };
-          "masse@freya" = 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 = self.nixosModules ++ [
-                  ./freya/masse.nix
-                ];
-              };
-          };
-          "enishen@freya" = home-manager.lib.homeManagerConfiguration {
-            system = system;
-            homeDirectory = "/home/enishen";
-            username = "enishen";
-            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 = self.nixosModules ++ [
-                  ./freya/enishen.nix
-                ];
-              };
-          };
-        };
 
   };
 }

freya/enishen.nix

@@ -1,16 +0,0 @@
-{lib, pkgs, ...}:
-
-let
-
-in
-
-{
-  home.packages = with pkgs; [
-  ];
-
-  imports = [
-  ];
-
-}
-
-

freya/masse.nix

@@ -1,92 +0,0 @@
-{config, lib, pkgs,...}:
-
-
-{
-  programs.command-not-found.enable = true;
-
-  home.keyboard.layout = "fi";
-
-  home.packages = with pkgs; [
-    calibre
-    okular
-    gimp
-    inkscape
-    gwenview
-    myVim
-    myEmacs
-    firefox-bin
-  ];
-
-  services.flameshot = {
-    enable = true;
-  };
-  services.syncthing = {
-    enable = true;
-    tray = false;
-  };
-  services.xcape = {
-    enable = true;
-    mapExpression = {
-      "Hyper_L" = "Tab";
-    };
-  };
-  home.file.".xprofile".text = ''
-    xmodmap ~/.Xmodmap
-  '';
-
-  services.emacs = {
-    enable = true;
-    package = pkgs.myEmacs;
-  };
-
-  home.file.".Xmodmap".text = ''
-remove Lock = Caps_Lock
-add Lock = Escape
-keysym Caps_Lock = Escape
-keysym Escape = Caps_Lock
-
-keycode 23 = Hyper_L
-keycode 255 = Tab
-  '';
-  programs.git = {
-    enable = true;
-    userName = "Mats Rauhala";
-    userEmail = "mats.rauhala@iki.fi";
-    signing = {
-      key = "2104943D6033C8F4F7D4F560BDA6DFEDBCFB6779";
-    };
-    ignores = [
-      "env"
-      "*.swp"
-      "*.swo"
-      "*.orig"
-      "*.crt"
-      "*.key"
-      "*.log"
-      "tags"
-      "result"
-      "*.pub"
-      "*.db"
-      "*.sqlite"
-      ".projectile"
-      ".dir-locals.el"
-    ];
-    extraConfig = {
-      push = {
-        default = "simple";
-      };
-    };
-  };
-  programs.ssh = {
-    enable = true;
-    # controlMaster = "yes";
-    # controlPersist = "10m";
-    forwardAgent = true;
-
-    matchBlocks = {
-    };
-  };
-
-  programs.myZsh.enable = true;
-  programs.myUrxvt.enable = true;
-}