From eced1a3bc14fb85a608297db8a9d29b1d3419158 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 3 Nov 2018 19:33:58 +0100 Subject: [PATCH] home-manager: cleanup&rename configuration --- ...orkstation.nix => graphical-fullblown.nix} | 13 - ...le-desktop.nix => graphical-removable.nix} | 0 .../configuration/steveej-qtile-desktop.nix | 383 ------------------ .../{root.nix => text-minimal.txt} | 2 - nix/os/profiles/common/pkg.nix | 12 +- nix/os/profiles/removable-medium/pkg.nix | 2 +- 6 files changed, 6 insertions(+), 406 deletions(-) rename nix/home-manager/configuration/{fullblown-workstation.nix => graphical-fullblown.nix} (95%) rename nix/home-manager/configuration/{removable-desktop.nix => graphical-removable.nix} (100%) delete mode 100644 nix/home-manager/configuration/steveej-qtile-desktop.nix rename nix/home-manager/configuration/{root.nix => text-minimal.txt} (79%) diff --git a/nix/home-manager/configuration/fullblown-workstation.nix b/nix/home-manager/configuration/graphical-fullblown.nix similarity index 95% rename from nix/home-manager/configuration/fullblown-workstation.nix rename to nix/home-manager/configuration/graphical-fullblown.nix index bb62534..e766ab8 100644 --- a/nix/home-manager/configuration/fullblown-workstation.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -27,19 +27,6 @@ in { }; packageOverrides = pkgs: with pkgs; { - busyboxStatic = busybox.override { - enableStatic = true; - extraConfig = '' - CONFIG_STATIC y - CONFIG_INSTALL_APPLET_DONT y - CONFIG_INSTALL_APPLET_SYMLINKS n - ''; - }; - - dropbearStatic = dropbear.override { - enableStatic = true; - }; - myPython36 = python36Full.withPackages (ps: with ps; [ pylint pep8 yapf flake8 # autopep8 (broken) diff --git a/nix/home-manager/configuration/removable-desktop.nix b/nix/home-manager/configuration/graphical-removable.nix similarity index 100% rename from nix/home-manager/configuration/removable-desktop.nix rename to nix/home-manager/configuration/graphical-removable.nix diff --git a/nix/home-manager/configuration/steveej-qtile-desktop.nix b/nix/home-manager/configuration/steveej-qtile-desktop.nix deleted file mode 100644 index 8b91980..0000000 --- a/nix/home-manager/configuration/steveej-qtile-desktop.nix +++ /dev/null @@ -1,383 +0,0 @@ -{ pkgs -, config, -... }: - -let - # gitpkgs = import /home/steveej/src/github/NixOS/nixpkgs {}; - unstablepkgs = import {}; - -in { - imports = [ - ../profiles/common.nix - ../profiles/qtile-desktop.nix - ../programs/emacs.nix - ../programs/firefox.nix - ../programs/chromium.nix - ../programs/homeshick.nix - ../programs/libreoffice.nix - ../programs/neovim.nix - ../programs/pass.nix - ../programs/zsh.nix - ]; - - nixpkgs.config = { - pidgin = { - openssl = true; - gnutls = true; - }; - - packageOverrides = pkgs: with pkgs; { - myPython36 = python36Full.withPackages (ps: with ps; [ - pylint pep8 yapf flake8 - # autopep8 (broken) - # pylint (broken) - ipython - llfuse - dugong - defusedxml - wheel - pip - virtualenv - pypi2nix - cffi - pyopenssl - urllib3 - mistune - - flask - - pyaml - ] ++ [ - pkgs.libffi - ]); - - staruml = callPackage ../../pkgs/staruml.nix { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; - }; - }; - - home.sessionVariables = { - HM_CONFIG=builtins.toString ./.; - - GOPATH="$HOME/src/go"; - - PATH=pkgs.lib.concatStringsSep ":" [ - "$HOME/.local/bin" - "$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin" - "$HOME/.cargo/bin" - "$HOME/.gem/ruby/2.3.0/bin" - "$HOME/.npm-packages/bin" - "$GOPATH/bin" - "$PATH" - ]; - }; - - home.packages = [] - ++ (with pkgs; [ - # Authentication - cacert - fprintd - openssl - mkpasswd - - # Nix package related tools - patchelf - nix-index - nox - nix-prefetch-scripts - - # Version Control Systems - git-crypt - unstablepkgs.pijul - gitFull - gitless - mr - - gitRepo - - # Cloud/Remote System Management - google-cloud-sdk - ansible - nixops - unstablepkgs.terraform - awscli - hcloud - - # Process/System Administration - htop - gnome3.gnome-tweak-tool - xorg.xhost - dmidecode - python36Packages.glances - evtest - - # Archive Managers - sshfsFuse - xarchive - p7zip - zip - unzip - gzip - lzop - - # Password Management - gnupg - yubikey-neo-manager - yubikey-personalization - yubikey-personalization-gui - gnome3.gnome_keyring - gnome3.seahorse - - # Security - tpm-tools - tpmmanager - - # Web Browsers - links2 - - # Language Support - hunspellDicts.en-us - hunspellDicts.de-de - - # Messaging/Communication - pidgin - hexchat - aspellDicts.en - aspellDicts.de - unstablepkgs.skype - zoom-us - unstablepkgs.bluejeans-gui - thunderbird - gnome3.evolution # gnome4.glib_networking - tdesktop - gnome3.cheese - - # Virtualization - virtmanager - qemu - # virtualbox - vagrant - unstablepkgs.rkt - python27Packages.docker_compose - # unstablepkgs.kubernetes - unstablepkgs.minikube - unstablepkgs.openshift - # (unstablepkgs.minikube.overrideAttrs (oldAttrs: { - # patches = oldAttrs.patches ++ [ - # (builtins.fetchurl { url ="https://patch-diff.githubusercontent.com/raw/kubernetes/minikube/pull/2517.diff"; }) - # ]; - # })) - - # Remote Control Tools - remmina - freerdp - x2goclient - teamviewer - - # Audio/Video Players - ffmpeg - vlc - audacity - spotify - smtube - python27Packages.youtube-dl-light - screenkey - quvi - - # Network Tools - openvpn - tcpdump - iftop - iperf - bind - socat - - # samba - iptables - nftables - wireshark - - # Code Editors - xclip - xsel - unstablepkgs.vscode - # (vscode-with-extensions.override { - # # When the extension is already available in the default extensions set. - # vscodeExtensions = with vscode-extensions; [ - # ] - # # Concise version from the vscode market place when not available in the default set. - # ++ vscode-utils.extensionsFromVscodeMarketplace [ - # { - # name = "vsliveshare"; - # publisher = "MS-vsliveshare"; - # version = "0.3.198"; - # sha256 = "019ffyxca3qnqyz1fr7vh0plfdkc3ikr8v295z846lghvwlzjqdh"; - # } - # ]; - # }) - - unstablepkgs.atom - - # Image/Graphic/Design Tools - gnome3.eog - gimp - imagemagick - exiv2 - graphviz - inkscape - ## barcode - qrencode - zbar - feh - # digikam - - - # Modelling Tools - plantuml - umlet - staruml - eclipses.eclipse-modeling - dia - astah-community - - # Misc Development Tools - qrcode - travis - jq - prometheus - cdrtools - - # Document Processing and Management - unstablepkgs.zathura - mendeley - jabref - zotero - hugo - pandoc - - # LaTeX - perlPackages.YAMLTiny - perlPackages.FileHomeDir - perlPackages.UnicodeLineBreak - (texlive.combine { - inherit (texlive) - scheme-small - texlive-de - texlive-en - texlive-scripts - collection-langgerman - - latexindent - latexmk - - algorithms - cm-super - - preprint - enumitem - draftwatermark - everypage - ulem - placeins - minted ifplatform fvextra xstring framed - ; - }) - - pdftk - masterpdfeditor - - # File Synchronzation - seafile-client - syncthing - grive2 - dropbox - # gocryptfs - # hubicfuse - # s3ql - # rclone - rsync - - # Filesystem Tools - ntfs3g - ddrescue - ncdu - unstablepkgs.woeusb - unetbootin - pcmanfm - hdparm - testdisk - python27Packages.binwalk - gptfdisk - - # games - zeroad - - # Compilers & Toolchains - autoconf - automake - libtool - gcc - pkgconfig - binutils - valgrind - gdb - cgdb - man-pages - gnumake - shellcheck - bazel - - ## Android - androidsdk - - ## Java - jre - openjdk - - ## Ruby - ruby - - ## Python - myPython36 - pypi2nix - - ## Webdev - nodejs-8_x - npm2nix - emscripten - etcd - sigal - - # Code generators - unstablepkgs.swagger-codegen - - # Misc Desktop Tools - ltunify - solaar - dex - roxterm - # kitty - busyboxStatic - xorg.xbacklight - coreutils - lsof - pavucontrol - x11_ssh_askpass - xdotool - xdg_utils - xdg-user-dirs - gnome3.dconf - picocom - glib.dev # contains gdbus tool - - # Screen recording - gtk-recordmydesktop # can't select the window - qt-recordmydesktop - vokoscreen - shutter - # kazam # doesn't start - # xvidcap # doesn't keep the recording rectangle - obs-studio - shotcut - openshot-qt - ]); -} diff --git a/nix/home-manager/configuration/root.nix b/nix/home-manager/configuration/text-minimal.txt similarity index 79% rename from nix/home-manager/configuration/root.nix rename to nix/home-manager/configuration/text-minimal.txt index 7430825..51d3e57 100644 --- a/nix/home-manager/configuration/root.nix +++ b/nix/home-manager/configuration/text-minimal.txt @@ -3,8 +3,6 @@ ... }: let - # gitpkgs = import /home/steveej/src/github/NixOS/nixpkgs {}; - # unstablepkgs = import {}; in { imports = [ diff --git a/nix/os/profiles/common/pkg.nix b/nix/os/profiles/common/pkg.nix index 4c3adb5..544ea83 100644 --- a/nix/os/profiles/common/pkg.nix +++ b/nix/os/profiles/common/pkg.nix @@ -1,7 +1,11 @@ { config, pkgs, ... }: { - # Package configuration + imports = [ + "${builtins.fetchGit { url = "https://github.com/rycee/home-manager.git"; ref = "master"; }}/nixos" + ]; + home-manager.users.root = import ../../../home-manager/configuration/text-minimal.txt; + nixpkgs.config = { allowBroken = false; allowUnfree = true; @@ -40,10 +44,4 @@ usbutils pciutils ]; - - imports = [ - "${builtins.fetchGit { url = "https://github.com/rycee/home-manager.git"; ref = "master"; }}/nixos" - ]; - - home-manager.users.root = import ../../../home-manager/configuration/root.nix; } diff --git a/nix/os/profiles/removable-medium/pkg.nix b/nix/os/profiles/removable-medium/pkg.nix index 33ebb38..25e09ff 100644 --- a/nix/os/profiles/removable-medium/pkg.nix +++ b/nix/os/profiles/removable-medium/pkg.nix @@ -7,5 +7,5 @@ "${builtins.fetchGit { url = "https://github.com/rycee/home-manager.git"; ref = "master"; }}/nixos" ]; - home-manager.users.steveej = import ../../../home-manager/configuration/removable-desktop.nix; + home-manager.users.steveej = import ../../../home-manager/configuration/graphical-removable.nix; }