From 5c1727472187ee256cbe4b938bdcec5062675b7c Mon Sep 17 00:00:00 2001 From: colin Date: Mon, 23 May 2022 00:40:59 -0700 Subject: [PATCH] moby: use the 'home-manager-gen-colin' helper --- helpers/home-manager-gen-colin.nix | 12 ++- machines/moby/colin.nix | 128 ----------------------------- machines/moby/default.nix | 12 ++- machines/moby/homes.nix | 8 -- 4 files changed, 17 insertions(+), 143 deletions(-) delete mode 100644 machines/moby/colin.nix delete mode 100644 machines/moby/homes.nix diff --git a/helpers/home-manager-gen-colin.nix b/helpers/home-manager-gen-colin.nix index 16971eba..56f96b24 100644 --- a/helpers/home-manager-gen-colin.nix +++ b/helpers/home-manager-gen-colin.nix @@ -1,3 +1,7 @@ +# docs: +# https://rycee.gitlab.io/home-manager/ +# man home-configuration.nix + # system is e.g. x86_64-linux # gui is "gnome", or null { lib, pkgs, system, gui, extraPackages ? [] }: { @@ -109,17 +113,19 @@ pkgs.wireguard pkgs.zola ] - ++ (if gui != null then [ + ++ (if gui != null then + [ # GUI only pkgs.clinfo pkgs.element-desktop pkgs.gnome.dconf-editor pkgs.mesa-demos - pkgs.signal-desktop pkgs.tdesktop ] else []) - ++ (if system == "x86_64-linux" then [ + ++ (if gui != null && system == "x86_64-linux" then + [ # x86_64 only + pkgs.signal-desktop pkgs.discord ] else []) ++ extraPackages; diff --git a/machines/moby/colin.nix b/machines/moby/colin.nix deleted file mode 100644 index a5645a70..00000000 --- a/machines/moby/colin.nix +++ /dev/null @@ -1,128 +0,0 @@ -# docs: -# https://rycee.gitlab.io/home-manager/ -# man home-configuration.nix - -{ config, pkgs, ... }: -{ - - home.stateVersion = "21.11"; - home.username = "colin"; - home.homeDirectory = "/home/colin"; - programs.home-manager.enable = true; - programs.zsh.enable = true; - programs.git = { - enable = true; - userName = "colin"; - userEmail = "colin@uninsane.org"; - }; - - programs.firefox = { - enable = true; - # empty profile required to allow extensions below - profiles.default = { - # settings = { - # "browser.urlbar.placeholderName" = "DuckDuckGo"; - # }; - }; - # NB: these must be manually enabled in the Firefox settings on first start - # extensions can be found here: https://gitlab.com/rycee/nur-expressions/-/blob/master/pkgs/firefox-addons/addons.json - extensions = [ - pkgs.nur.repos.rycee.firefox-addons.bypass-paywalls-clean - pkgs.nur.repos.rycee.firefox-addons.i-dont-care-about-cookies - pkgs.nur.repos.rycee.firefox-addons.sidebery - pkgs.nur.repos.rycee.firefox-addons.sponsorblock - pkgs.nur.repos.rycee.firefox-addons.ublock-origin - ]; - }; - - programs.vim = { - enable = true; - extraConfig = '' - " wtf vim project: NOBODY LIKES MOUSE FOR VISUAL MODE - set mouse-=a - " copy/paste to system clipboard - set clipboard=unnamedplus - " completion menu settings - set wildmenu - set wildmode=longest,list,full - " highlight all matching searches (using / and ?) - set hlsearch - " allow backspace to delete empty lines in insert mode - set backspace=indent,eol,start - " built-in syntax highlighting - syntax enable - " show line/col number in bottom right - set ruler - " highlight trailing space & related syntax errors (does this work?) - let c_space_errors=1 - let python_space_errors=1 - ''; - }; - - dconf.settings = { - # control alt-tab behavior - "org/gnome/desktop/wm/keybindings" = { - switch-applications = [ "Tab" ]; - switch-applications-backward=[]; - switch-windows=["Tab"]; - switch-windows-backward=["Tab"]; - }; - # idle power savings - "org/gnome/settings-deamon/plugins/power" = { - idle-brigthness = 50; - sleep-inactive-ac-type = "nothing"; - sleep-inactive-battery-timeout = 5400; # seconds - }; - }; - - # xsession.enable = true; - # xsession.windowManager.command = "…"; - - - home.packages = [ - pkgs.btrfs-progs - pkgs.gnumake - pkgs.dig - pkgs.duplicity - pkgs.fatresize - pkgs.fd - pkgs.file - pkgs.gptfdisk - pkgs.hdparm - pkgs.htop - pkgs.iftop - pkgs.iotop - pkgs.iptables - pkgs.jq - pkgs.killall - pkgs.lm_sensors # for sensors-detect - pkgs.lsof - pkgs.pciutils - pkgs.matrix-synapse - pkgs.mix2nix - pkgs.netcat - pkgs.nixUnstable - # pkgs.nixos-generators - # pkgs.nettools - pkgs.nmap - pkgs.parted - pkgs.powertop - pkgs.python3 - pkgs.ripgrep - pkgs.smartmontools - pkgs.snapper - pkgs.socat - pkgs.sudo - pkgs.telnet - pkgs.usbutils - pkgs.wireguard - pkgs.zola - - pkgs.clinfo - # pkgs.discord - pkgs.element-desktop - pkgs.gnome.dconf-editor - pkgs.mesa-demos - pkgs.tdesktop - ]; -} diff --git a/machines/moby/default.nix b/machines/moby/default.nix index 9bd36f34..a7c2b748 100644 --- a/machines/moby/default.nix +++ b/machines/moby/default.nix @@ -1,13 +1,17 @@ -{ home-manager, config, pkgs, ... }: +{ home-manager, config, pkgs, lib, ... }: { imports = [ - ./homes.nix + ./../common/home-manager.nix ./../common/users.nix ./../common/gui.nix - # ./../common/hardware.nix - # ./fs.nix ]; + home-manager.users.colin = import ./../../helpers/home-manager-gen-colin.nix { + inherit pkgs lib; + system = "aarch64-linux"; + gui = "gnome"; + }; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/machines/moby/homes.nix b/machines/moby/homes.nix deleted file mode 100644 index fb1c31ff..00000000 --- a/machines/moby/homes.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ home-manager, config, pkgs, ... }: -{ - imports = [ home-manager.nixosModule ]; - - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.colin.imports = [ ./colin.nix ]; -}