From 6ae9e628fb6553456bc2b4d90499d0acd149b392 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Thu, 21 Oct 2021 23:32:21 +0200 Subject: [PATCH] home-manager on system level, no more sync methods needed --- configuration.nix | 1 + emacs.nix | 22 +++++++ hardware-configuration.nix | 38 ++++++++++++ home/config/Nextcloud/nextcloud.cfg | 54 ------------------ to_git.sh | 9 --- to_system.sh | 12 ---- .../nix-wallpaper-nineish-dark-gray.png | Bin .../wallpaper/nix-wallpaper-nineish.png | Bin users/default.nix | 15 +++++ .../nixpkgs => users/ellmau}/autorandr.nix | 2 +- .../ellmau}/conf/gpgsm/chain.txt | 0 .../ellmau}/conf/gpgsm/trustlist.txt | 0 .../nixpkgs => users/ellmau}/conf/i3/config | 3 + .../ellmau}/conf/i3/fill_workspace4.zsh | 0 .../ellmau}/conf/i3/keepassxc.sh | 0 .../ellmau}/conf/i3/keyboard_layout_toggle.sh | 0 .../ellmau}/conf/i3/workspace4.json | 0 .../config/nixpkgs => users/ellmau}/dunst.nix | 0 {home/config/nixpkgs => users/ellmau}/git.nix | 0 {home/config/nixpkgs => users/ellmau}/gpg.nix | 0 .../config/nixpkgs => users/ellmau}/home.nix | 7 +-- {home/config/nixpkgs => users/ellmau}/i3.nix | 0 .../nixpkgs => users/ellmau}/nextcloud.nix | 0 .../nixpkgs => users/ellmau}/polybar.nix | 0 {home/config/nixpkgs => users/ellmau}/zsh.nix | 0 25 files changed, 81 insertions(+), 82 deletions(-) create mode 100644 emacs.nix create mode 100644 hardware-configuration.nix delete mode 100644 home/config/Nextcloud/nextcloud.cfg delete mode 100755 to_git.sh delete mode 100755 to_system.sh rename {home/config/nixpkgs => users}/common/wallpaper/nix-wallpaper-nineish-dark-gray.png (100%) rename {home/config/nixpkgs => users}/common/wallpaper/nix-wallpaper-nineish.png (100%) create mode 100644 users/default.nix rename {home/config/nixpkgs => users/ellmau}/autorandr.nix (99%) rename {home/config/nixpkgs => users/ellmau}/conf/gpgsm/chain.txt (100%) rename {home/config/nixpkgs => users/ellmau}/conf/gpgsm/trustlist.txt (100%) rename {home/config/nixpkgs => users/ellmau}/conf/i3/config (99%) rename {home/config/nixpkgs => users/ellmau}/conf/i3/fill_workspace4.zsh (100%) rename {home/config/nixpkgs => users/ellmau}/conf/i3/keepassxc.sh (100%) rename {home/config/nixpkgs => users/ellmau}/conf/i3/keyboard_layout_toggle.sh (100%) rename {home/config/nixpkgs => users/ellmau}/conf/i3/workspace4.json (100%) rename {home/config/nixpkgs => users/ellmau}/dunst.nix (100%) rename {home/config/nixpkgs => users/ellmau}/git.nix (100%) rename {home/config/nixpkgs => users/ellmau}/gpg.nix (100%) rename {home/config/nixpkgs => users/ellmau}/home.nix (82%) rename {home/config/nixpkgs => users/ellmau}/i3.nix (100%) rename {home/config/nixpkgs => users/ellmau}/nextcloud.nix (100%) rename {home/config/nixpkgs => users/ellmau}/polybar.nix (100%) rename {home/config/nixpkgs => users/ellmau}/zsh.nix (100%) diff --git a/configuration.nix b/configuration.nix index 9f5c7d1..413e115 100644 --- a/configuration.nix +++ b/configuration.nix @@ -11,6 +11,7 @@ ./machine/current/default.nix ./programs/emacs ./programs/aspell.nix + ./users ]; # Use the systemd-boot EFI boot loader. diff --git a/emacs.nix b/emacs.nix new file mode 100644 index 0000000..3d86733 --- /dev/null +++ b/emacs.nix @@ -0,0 +1,22 @@ +{ pkgs ? import {} }: + +let + ellmauEmacs = (import {}).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 + ]) ++ [ + ]) \ No newline at end of file diff --git a/hardware-configuration.nix b/hardware-configuration.nix new file mode 100644 index 0000000..43d6e91 --- /dev/null +++ b/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; +} diff --git a/home/config/Nextcloud/nextcloud.cfg b/home/config/Nextcloud/nextcloud.cfg deleted file mode 100644 index 0d67576..0000000 --- a/home/config/Nextcloud/nextcloud.cfg +++ /dev/null @@ -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) diff --git a/to_git.sh b/to_git.sh deleted file mode 100755 index afc0e9b..0000000 --- a/to_git.sh +++ /dev/null @@ -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/. diff --git a/to_system.sh b/to_system.sh deleted file mode 100755 index bd3af07..0000000 --- a/to_system.sh +++ /dev/null @@ -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/. diff --git a/home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish-dark-gray.png b/users/common/wallpaper/nix-wallpaper-nineish-dark-gray.png similarity index 100% rename from home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish-dark-gray.png rename to users/common/wallpaper/nix-wallpaper-nineish-dark-gray.png diff --git a/home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish.png b/users/common/wallpaper/nix-wallpaper-nineish.png similarity index 100% rename from home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish.png rename to users/common/wallpaper/nix-wallpaper-nineish.png diff --git a/users/default.nix b/users/default.nix new file mode 100644 index 0000000..89f54d5 --- /dev/null +++ b/users/default.nix @@ -0,0 +1,15 @@ +{ config, pkgs, lib, ... }: +{ + imports = [ ]; + + home-manager = { + useUserPackages = true; + useGlobalPkgs = true; + users.ellmau = (import ./ellmau/home.nix); + }; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "zoom" + "skypeforlinux" + ]; +} diff --git a/home/config/nixpkgs/autorandr.nix b/users/ellmau/autorandr.nix similarity index 99% rename from home/config/nixpkgs/autorandr.nix rename to users/ellmau/autorandr.nix index af18137..ae0e818 100644 --- a/home/config/nixpkgs/autorandr.nix +++ b/users/ellmau/autorandr.nix @@ -27,7 +27,7 @@ enable = true; primary = true; mode = "3840x2160"; - dpi = 288; + dpi = 192; }; }; }; diff --git a/home/config/nixpkgs/conf/gpgsm/chain.txt b/users/ellmau/conf/gpgsm/chain.txt similarity index 100% rename from home/config/nixpkgs/conf/gpgsm/chain.txt rename to users/ellmau/conf/gpgsm/chain.txt diff --git a/home/config/nixpkgs/conf/gpgsm/trustlist.txt b/users/ellmau/conf/gpgsm/trustlist.txt similarity index 100% rename from home/config/nixpkgs/conf/gpgsm/trustlist.txt rename to users/ellmau/conf/gpgsm/trustlist.txt diff --git a/home/config/nixpkgs/conf/i3/config b/users/ellmau/conf/i3/config similarity index 99% rename from home/config/nixpkgs/conf/i3/config rename to users/ellmau/conf/i3/config index fe33050..92d12d1 100644 --- a/home/config/nixpkgs/conf/i3/config +++ b/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 diff --git a/home/config/nixpkgs/conf/i3/fill_workspace4.zsh b/users/ellmau/conf/i3/fill_workspace4.zsh similarity index 100% rename from home/config/nixpkgs/conf/i3/fill_workspace4.zsh rename to users/ellmau/conf/i3/fill_workspace4.zsh diff --git a/home/config/nixpkgs/conf/i3/keepassxc.sh b/users/ellmau/conf/i3/keepassxc.sh similarity index 100% rename from home/config/nixpkgs/conf/i3/keepassxc.sh rename to users/ellmau/conf/i3/keepassxc.sh diff --git a/home/config/nixpkgs/conf/i3/keyboard_layout_toggle.sh b/users/ellmau/conf/i3/keyboard_layout_toggle.sh similarity index 100% rename from home/config/nixpkgs/conf/i3/keyboard_layout_toggle.sh rename to users/ellmau/conf/i3/keyboard_layout_toggle.sh diff --git a/home/config/nixpkgs/conf/i3/workspace4.json b/users/ellmau/conf/i3/workspace4.json similarity index 100% rename from home/config/nixpkgs/conf/i3/workspace4.json rename to users/ellmau/conf/i3/workspace4.json diff --git a/home/config/nixpkgs/dunst.nix b/users/ellmau/dunst.nix similarity index 100% rename from home/config/nixpkgs/dunst.nix rename to users/ellmau/dunst.nix diff --git a/home/config/nixpkgs/git.nix b/users/ellmau/git.nix similarity index 100% rename from home/config/nixpkgs/git.nix rename to users/ellmau/git.nix diff --git a/home/config/nixpkgs/gpg.nix b/users/ellmau/gpg.nix similarity index 100% rename from home/config/nixpkgs/gpg.nix rename to users/ellmau/gpg.nix diff --git a/home/config/nixpkgs/home.nix b/users/ellmau/home.nix similarity index 82% rename from home/config/nixpkgs/home.nix rename to users/ellmau/home.nix index 85938d7..b21c39b 100644 --- a/home/config/nixpkgs/home.nix +++ b/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; diff --git a/home/config/nixpkgs/i3.nix b/users/ellmau/i3.nix similarity index 100% rename from home/config/nixpkgs/i3.nix rename to users/ellmau/i3.nix diff --git a/home/config/nixpkgs/nextcloud.nix b/users/ellmau/nextcloud.nix similarity index 100% rename from home/config/nixpkgs/nextcloud.nix rename to users/ellmau/nextcloud.nix diff --git a/home/config/nixpkgs/polybar.nix b/users/ellmau/polybar.nix similarity index 100% rename from home/config/nixpkgs/polybar.nix rename to users/ellmau/polybar.nix diff --git a/home/config/nixpkgs/zsh.nix b/users/ellmau/zsh.nix similarity index 100% rename from home/config/nixpkgs/zsh.nix rename to users/ellmau/zsh.nix