home-manager on system level, no more sync methods needed

configuration.nix

@@ -11,6 +11,7 @@
       ./machine/current/default.nix
       ./programs/emacs
       ./programs/aspell.nix
+      ./users
     ];
 
   # Use the systemd-boot EFI boot loader.

emacs.nix

@@ -0,0 +1,22 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+let
+  ellmauEmacs = (import <nixpkgs> {}).emacs;
+  emacsWithPackages = (pkgs.emacsPackagesGen ellmauEmacs).emacsWithPackages;
+in
+  emacsWithPackages ( epkgs: (with epkgs.melpaStablePackages; [
+    beacon
+  ]) ++ (with epkgs.melpaPackages; [
+    magit
+    nix-mode
+    ewal-spacemacs-themes
+    org-roam
+    rustic
+    company
+    projectile
+    lsp-mode
+    dap-mode
+  ]) ++ (with epkgs.elpaPackages; [
+    auctex
+  ]) ++ [
+  ])

hardware-configuration.nix

@@ -0,0 +1,38 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/da267a3c-34e3-4218-933f-10738ee61eb6";
+      fsType = "ext4";
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/9ebd7aff-629b-449b-83d8-6381a04eb708";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/DE6D-C383";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e"; }
+    ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  # high-resolution display
+  hardware.video.hidpi.enable = lib.mkDefault true;
+}

home/config/Nextcloud/nextcloud.cfg

@@ -1,54 +0,0 @@
-[General]
-clientVersion=3.2.1git
-confirmExternalStorage=true
-newBigFolderSizeLimit=500
-optionalServerNotifications=true
-useNewBigFolderSizeLimit=true
-
-[Accounts]
-0\Folders\1\ignoreHiddenFiles=false
-0\Folders\1\journalPath=.sync_fb2cf0a5e340.db
-0\Folders\1\localPath=/home/ellmau/nextcloud/
-0\Folders\1\paused=false
-0\Folders\1\targetPath=/
-0\Folders\1\version=2
-0\Folders\1\virtualFilesMode=off
-0\Folders\2\ignoreHiddenFiles=false
-0\Folders\2\journalPath=.sync_661fd6cbfcd9.db
-0\Folders\2\localPath=/home/ellmau/.keepasswd/
-0\Folders\2\paused=false
-0\Folders\2\targetPath=/keepass
-0\Folders\2\version=2
-0\Folders\2\virtualFilesMode=off
-0\Folders\4\ignoreHiddenFiles=false
-0\Folders\4\journalPath=.sync_a488fb740249.db
-0\Folders\4\localPath=/home/ellmau/org-notes/
-0\Folders\4\paused=false
-0\Folders\4\targetPath=/org-notes
-0\Folders\4\version=2
-0\Folders\4\virtualFilesMode=off
-0\authType=webflow
-0\dav_user=stel830c
-0\serverVersion=21.0.4.1
-0\url=https://cloudstore.zih.tu-dresden.de
-0\user=@Invalid()
-0\version=1
-0\webflow_user=stel830c
-1\Folders\3\ignoreHiddenFiles=false
-1\Folders\3\journalPath=.sync_d9ee4258d956.db
-1\Folders\3\localPath=/home/ellmau/nextcloud_priv_digistore/
-1\Folders\3\paused=false
-1\Folders\3\targetPath=/
-1\Folders\3\version=2
-1\Folders\3\virtualFilesMode=off
-1\authType=webflow
-1\dav_user=ellmau
-1\serverVersion=20.0.9.1
-1\url=https://cloudstore.ellmauthaler.net
-1\user=@Invalid()
-1\version=1
-1\webflow_user=ellmau
-version=2
-
-[Settings]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\b-\0\0\x3\xe6\0\0\nJ\0\0\x5\xb2\0\0\b/\0\0\x3\xe6\0\0\nH\0\0\x5\xb0\0\0\0\0\0\0\0\0\xf\0\0\0\b/\0\0\x3\xe6\0\0\nH\0\0\x5\xb0)

to_git.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i zsh -p zsh
-
-cp /etc/nixos/configuration.nix .
-cp -r /etc/nixos/machine .
-cp -r /etc/nixos/programs .
-cp -r $HOME/.config/nixpkgs ./home/config/.
-mkdir -p ./home/config/Nextcloud
-cp -r $HOME/.config/Nextcloud/nextcloud.cfg ./home/config/Nextcloud/.

to_system.sh

@@ -1,12 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i zsh -p zsh
-
-
-cp configuration.nix /etc/nixos/.
-cp -r programs /etc/nixos/.
-mkdir -p /etc/nixos/machine
-cp -r machine/stel-xps /etc/nixos/machine/.
-cp -r machine/nucturne /etc/nixos/machine/.
-
-cp -r ./home/config/* /home/ellmau/.config/.
-chown -R ellmau:users /home/ellmau/.config/.

users/default.nix

@@ -0,0 +1,15 @@
+{ config, pkgs, lib,  ... }:
+{
+  imports = [ <home-manager/nixos> ];
+
+  home-manager = {
+    useUserPackages = true;
+    useGlobalPkgs = true;
+    users.ellmau = (import ./ellmau/home.nix);
+  };
+
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "zoom"
+    "skypeforlinux"
+  ];
+}

users/ellmau/autorandr.nix

@@ -27,7 +27,7 @@
             enable = true;
             primary = true;
             mode = "3840x2160";
-            dpi = 288;
+            dpi = 192;
           };
         };
       };

users/ellmau/conf/i3/config

@@ -50,6 +50,9 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
+# hide edge borders in a smart way
+#hide_edge_borders smart
+
 # Mod Ctrl d for display resetting
 #bindsym $mod+Ctrl+d exec --no-startup-id $HOME/.config/i3/set_xrandr.zsh
 

users/ellmau/home.nix

@@ -30,11 +30,6 @@
     pkgs.signal-desktop
   ];
 
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "zoom"
-    "skypeforlinux"
-  ];
-
   services = {
     udiskie = {
       enable = true;
@@ -63,7 +58,7 @@
     '';
   };
 
-  home.file.".background-image".source = ./common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
+  home.file.".background-image".source = ../common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
   
   programs.home-manager = {
     enable = true;