diff options
| -rw-r--r-- | machines/profpatsch/katara.nix | 122 | ||||
| -rw-r--r-- | machines/profpatsch/pkgs.nix | 6 | ||||
| -rw-r--r-- | modules/module-list.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/humblebundle/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/games/humblebundle/fetch-humble-bundle/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/games/humblebundle/liads.nix | 2 |
6 files changed, 42 insertions, 109 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix index efecfc15..23cb69f4 100644 --- a/machines/profpatsch/katara.nix +++ b/machines/profpatsch/katara.nix @@ -36,15 +36,8 @@ in { hardware.pulseaudio = { enable = true; zeroconf.discovery.enable = true; - extraConfig = '' - flat-volumes = no - ''; - # for Pillars of Eternity - support32Bit = true; }; - hardware.opengl.driSupport32Bit = true; - vuizvui.hardware.thinkpad.enable = true; ###### @@ -83,7 +76,6 @@ in { pkgs.vuizvui.jmtpfs # MTP fuse mosh # ssh with stable connections nfs-utils # the filesystem of the future for 20 years - tarsnap # encrypting online backup tool # TODO move into atool deps unzip # extract zip archives ]; @@ -113,9 +105,6 @@ in { # mercurial # the other version control system telnet # tcp debugging ]; - documentation = [ - # mustache-spec NOT IN 16.09 - ]; userPrograms = [ abcde # high-level cd-ripper with tag support anki # spaced repetition system @@ -126,7 +115,6 @@ in { (chromium.override { enablePepperFlash = true; }) # droopy # simple HTML upload server unfreeAndNonDistributablePkgs.dropbox-cli # dropbox.com client - electrum # bitcoin client emacs # pretty neat operating system i guess feh # brother of meh, displays images in a meh way, but fast filezilla # FTP GUI business-ready interface framework @@ -145,21 +133,18 @@ in { remind # calender & reminder program rtorrent # monster of a bittorrent client myPkgs.sent # suckless presentation tool + pkgs.vuizvui.show-qr-code # display a QR code + youtube-dl # download videos myPkgs.xmpp-client # CLI XMPP Client - myPkgs.youtube-dl # download videos zathura # pdf viewer ]; - userScripts = with pkgs.vuizvui; [ - profpatsch.display-infos # show time & battery - show-qr-code # display a QR code - ]; mailPkgs = [ - elinks # command line browser + elinks # command line browser # myPkgs.offlineimap # IMAP client - mutt-with-sidebar # has been sucking less since 1970 - msmtp # SMTP client - notmuch # mail indexer - pythonPackages.alot # the next cool thing! + mutt-with-sidebar # has been sucking less since 1970 + msmtp # SMTP client + notmuch # mail indexer + pythonPackages.alot # the next cool thing! ]; nixPkgs = [ nix-repl # nix REPL @@ -169,51 +154,31 @@ in { # TODO needs user service redshift # increases screen warmth at night (so i don’t have to feel cold) ]; - in systemPkgs ++ xPkgs ++ guiPkgs - ++ programmingTools ++ documentation - ++ userPrograms ++ userScripts - ++ mailPkgs ++ nixPkgs ++ tmpPkgs; - # system.extraDependencies = with pkgs; lib.singleton ( - # # Haskell packages I want to keep around - # haskellPackages.ghcWithPackages (hpkgs: with hpkgs; - # [ - # # frp - # frpnow - # gloss - # gtk - # frpnow-gtk - # frpnow-gloss - - # lens - # wreq - # aeson-lens - # ])) - # ++ - # # other packages that I use sometimes in a shell - # [ - # ]; + in systemPkgs ++ xPkgs ++ guiPkgs ++ programmingTools ++ userPrograms ++ mailPkgs ++ nixPkgs ++ tmpPkgs; + system.extraDependencies = with pkgs; lib.singleton ( + # Haskell packages I want to keep around + haskellPackages.ghcWithPackages (hpkgs: with hpkgs; + [ + # frp + frpnow + gloss + gtk + frpnow-gtk + frpnow-gloss + + lens + wreq + aeson-lens + ])) + ++ + # other packages that I use sometimes in a shell + [ + ]; ########### # Services - services.tinc.networks.freifunk = { - name = "profpatsch_client"; - debugLevel = 3; - listenAddress = "10.11.63.101"; - ed25519PrivateKeyFile = "/var/lib/tinc/key.priv"; - hosts = { - steini = '' - Address = augsburg2.total-connection.net - Port = 4223 - ECDSAPublicKey = CEwnNOmriVHPnhQvVZLFNhU9vk/HCIhLotixM0w/eJh+FKEs8IbgX6mof30s3WTBHQd33XYXldx1fulLpAXURzTPgD - ''; - }; - extraConfig = '' - ConnectTo = steini - ''; - }; - - services.searx.enable = true; + #services.searx.enable = true; services.printing = { enable = true; @@ -257,13 +222,9 @@ in { Option "SuspendTime" "20" Option "OffTime" "30" ''; - synaptics = { - enable = true; - minSpeed = "0.5"; - accelFactor = "0.01"; - twoFingerScroll = true; - vertEdgeScroll = false; - }; + synaptics.enable = true; + synaptics.minSpeed = "0.5"; + synaptics.accelFactor = "0.01"; videoDrivers = [ "intel" ]; @@ -284,7 +245,8 @@ in { # }; displayManager = { - sessionCommands = with pkgs; '' + sessionCommands = with pkgs; + '' #TODO add as nixpkg export PATH+=":$HOME/scripts" #add utility scripts export PATH+=":$HOME/.bin" #add (temporary) executables @@ -294,13 +256,12 @@ in { set-background & # TODO xbindkeys user service file - ${lib.getBin xbindkeys}/bin/xbindkeys + ${xbindkeys}/bin/xbindkeys nice -n19 dropbox-cli start & nm-applet & # synchronize clipboards - ${lib.getBin autocutsel}/bin/autocutsel -s PRIMARY & - ${lib.getBin twmn}/bin/twmnd & - ''; + ${autocutsel}/bin/autocutsel -s PRIMARY & + ''; }; }; @@ -311,7 +272,7 @@ in { monospace = [ "Source Code Pro" "DejaVu Sans Mono" ]; # TODO does not work sansSerif = [ "Liberation Sans" ]; }; - ultimate.preset = "ultimate4"; + ultimate.preset = "ultimate3"; ultimate.substitutions = "combi"; }; fonts.fonts = with pkgs; [ @@ -345,12 +306,7 @@ in { # build derivation on taalo vuizvui.user.aszlig.programs.taalo-build.enable = true; - vuizvui.user.profpatsch.programs = { - scanning.enable = true; - - taffybar.enable = true; - taffybar.package = myPkgs.taffybar; - }; + vuizvui.user.profpatsch.programs.scanning.enable = true; ####### # Misc @@ -363,8 +319,6 @@ in { # fix for emacs ssh programs.bash.promptInit = "PS1=\"# \""; - # containers.isso.config = ./isso-test.nix; - ################ # User services # systemd.user = { diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index 87c6dfaa..3e96479b 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -64,11 +64,7 @@ let sha256 = "03006xzs250knzcyr6j564kn9jf2a6cp3mxkpqsqmmyp6v28w90z"; })}/overrides.nix") {}; - youtube-dl = pkgs.youtube-dl.overrideDerivation (old: { - patches = old.patches or [] ++ [ ./patches/youtube-dl.patch ]; - }); - xmpp-client = pkgs.callPackage (import ./xmpp-client.nix myLib.philip.home "irc/xmppOla.wtf") { inherit (pkgs) xmpp-client; }; in -{ inherit taffybar offlineimap sent mpv beets poezio vim fast-init youtube-dl xmpp-client; } +{ inherit taffybar offlineimap sent mpv beets poezio vim fast-init xmpp-client; } diff --git a/modules/module-list.nix b/modules/module-list.nix index 77084f05..c4483938 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -30,6 +30,4 @@ ./user/openlab/labtops.nix ./user/openlab/stackenblocken.nix ./user/profpatsch/programs/scanning.nix - # XXX: @Profpatsch forgot to include this - #./user/profpatsch/programs/taffybar.nix ] diff --git a/pkgs/games/humblebundle/default.nix b/pkgs/games/humblebundle/default.nix index fa16cf23..e1c7c0e1 100644 --- a/pkgs/games/humblebundle/default.nix +++ b/pkgs/games/humblebundle/default.nix @@ -11,12 +11,9 @@ let inherit (config.humblebundle) email password; }; - humbleApi = callPackage ./humbleApi { requests2 = pkgs.pythonPackages.requests2; }; - bastion = callPackage ./bastion.nix {}; brigador = callPackage ./brigador.nix {}; cavestoryplus = callPackage ./cavestoryplus.nix {}; - curious-expedition = callPackage ./curious-expedition.nix {}; fez = callPackage ./fez.nix {}; ftl = callPackage ./ftl.nix {}; guacamelee = callPackage_i686 ./guacamelee.nix {}; diff --git a/pkgs/games/humblebundle/fetch-humble-bundle/default.nix b/pkgs/games/humblebundle/fetch-humble-bundle/default.nix index 301b31ca..a27138d8 100644 --- a/pkgs/games/humblebundle/fetch-humble-bundle/default.nix +++ b/pkgs/games/humblebundle/fetch-humble-bundle/default.nix @@ -1,9 +1,5 @@ { stdenv, curl, cacert, writeText, fetchFromGitHub, fetchpatch -<<<<<<< Updated upstream , python, pythonPackages -======= -, python, buildPythonPackage, pythonPackages, humbleApi ->>>>>>> Stashed changes , email, password }: @@ -11,7 +7,6 @@ { name ? null, machineName, downloadName ? "Download", suffix ? "humblebundle", md5 }: let cafile = "${cacert}/etc/ssl/certs/ca-bundle.crt"; -<<<<<<< Updated upstream humbleAPI = pythonPackages.buildPythonPackage rec { name = "humblebundle-${version}"; version = "0.1.1"; @@ -25,8 +20,6 @@ propagatedBuildInputs = with pythonPackages; [ requests2 ]; }; -======= ->>>>>>> Stashed changes pyStr = str: "'${stdenv.lib.escape ["'" "\\"] str}'"; @@ -55,12 +48,7 @@ ${pyStr "Unable to find ${downloadName} for ${machineName}!"} print >>sys.stderr, 'Available download types:' for ds in dstruct: - print >>sys.stderr, """ - Name: {} - md5: {} - Url: {} - Size: {} - """.format(ds.name, ds.md5, ds.url, ds.human_size) + print >>sys.stderr, " " + ds.name raise SystemExit(1) hb = humblebundle.HumbleApi() @@ -88,7 +76,7 @@ in stdenv.mkDerivation { outputHashAlgo = "md5"; outputHash = md5; - buildInputs = [ python humbleApi ]; + buildInputs = [ python humbleAPI ]; buildCommand = '' url="$(python "${getDownloadURL}")" diff --git a/pkgs/games/humblebundle/liads.nix b/pkgs/games/humblebundle/liads.nix index 695119ec..281b137d 100644 --- a/pkgs/games/humblebundle/liads.nix +++ b/pkgs/games/humblebundle/liads.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchHumbleBundle { machineName = "loversinadangerousspacetime_linux"; suffix = "zip"; - md5 = "38927a73e1fe84620ebc876f8f039adb"; + md5 = "e838cad67e8814e955dab42efd4995e2"; }; unpackCmd = '' |