Skip to content

Commit

Permalink
remove not used files
Browse files Browse the repository at this point in the history
  • Loading branch information
@garbas
garbas committed Jun 4, 2020
1 parent f2fd9bf commit 91a9d5a
Show file tree
Hide file tree
Showing 25 changed files with 106 additions and 730 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Expand Up @@ -3,14 +3,15 @@

/nixos/manual/
/nixos/nix-pills/
/nixos/screenshots/nixos-*-small.png
/nixos/packages-explorer.js

/nixpkgs/manual/
/nixpkgs/packages-channels.json

/nix/manual/

/images/screenshots/nixos-*-small.png

/build/
/blogs.json
/blogs.xml
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Expand Up @@ -62,7 +62,7 @@ $(NIXPKGS_MANUAL_OUT): $(NIXPKGS_MANUAL_IN) bootstrapify-docbook.sh bootstrapify
ln -sfn manual.html $(NIXPKGS_MANUAL_OUT)/index.html


all: $(HTML) favicon.png favicon.ico robots.txt $(subst .png,-small.png,$(filter-out %-small.png,$(wildcard nixos/screenshots/*))) \
all: $(HTML) favicon.png favicon.ico robots.txt $(subst .png,-small.png,$(filter-out %-small.png,$(wildcard images/screenshots/*))) \
nixos/packages-explorer.js \
nixpkgs/packages-channels.json

Expand Down
6 changes: 3 additions & 3 deletions features.tt
View file
Expand Up @@ -308,13 +308,13 @@ upgrades.</p>
<pre class="code">$ nixos-rebuild switch --rollback
</pre>

<a href="/nixos/screenshots/nixos-grub.png"><img class="inline screenshot"
src="/nixos/screenshots/nixos-grub-small.png" alt="Grub boot menu" /></a>
<a href="/images/screenshots/nixos-grub.png"><img class="inline screenshot"
src="/images/screenshots/nixos-grub-small.png" alt="Grub boot menu" /></a>

<p>In fact, all old system configurations automatically show up in the
Grub boot menu. So if the new configuration crashes or doesn’t boot
properly, you can just roll back by selecting an older configuration
in the <a href="/nixos/screenshots/nixos-grub.png">Grub boot
in the <a href="/images/screenshots/nixos-grub.png">Grub boot
menu</a>. Rollbacks are very fast: it doesn’t involve lots of files
having to be restored from copies.</p>

Expand Down
0 nixos/klogo-official-crystal-128x128.png → images/klogo-official-crystal-128x128.png
View file
File renamed without changes
0 nixos/screenshots/nixos-apps.png → images/screenshots/nixos-apps.png
View file
File renamed without changes
0 nixos/screenshots/nixos-compiz-cube.png → images/screenshots/nixos-compiz-cube.png
View file
File renamed without changes
0 nixos/screenshots/nixos-games.png → images/screenshots/nixos-games.png
View file
File renamed without changes
0 nixos/screenshots/nixos-grub.png → images/screenshots/nixos-grub.png
View file
File renamed without changes
0 nixos/screenshots/nixos-installer-help.png → images/screenshots/nixos-installer-help.png
View file
File renamed without changes
0 nixos/screenshots/nixos-kde.png → images/screenshots/nixos-kde.png
View file
File renamed without changes
0 nixos/screenshots/nixos-kde42-1.png → images/screenshots/nixos-kde42-1.png
View file
File renamed without changes
0 nixos/screenshots/nixos-kde42-2.png → images/screenshots/nixos-kde42-2.png
View file
File renamed without changes
0 nixos/screenshots/nixos-nixops-vbox.png → images/screenshots/nixos-nixops-vbox.png
View file
File renamed without changes
0 nixos/screenshots/nixos-openoffice-3.png → images/screenshots/nixos-openoffice-3.png
View file
File renamed without changes
0 nixos/screenshots/nixos-openoffice.png → images/screenshots/nixos-openoffice.png
View file
File renamed without changes
0 nixos/screenshots/nixos-terminals.png → images/screenshots/nixos-terminals.png
View file
File renamed without changes
0 nixos/screenshots/nixos-virtualbox.png → images/screenshots/nixos-virtualbox.png
View file
File renamed without changes
0 nixos/screenshots/nixos-xfce.png → images/screenshots/nixos-xfce.png
View file
File renamed without changes
112 changes: 77 additions & 35 deletions netlify.toml
View file
Expand Up @@ -11,14 +11,20 @@
force = true

[[redirects]]
from = "/nixos"
from = "/nix/index.html"
to = "/"
status = 302
force = true

[[redirects]]
from = "/nixpkgs"
to = "/"
from = "/nix/about.html"
to = "/features.html"
status = 302
force = true

[[redirects]]
from = "/nix/learn.html"
to = "/learn.html"
status = 302
force = true

Expand All @@ -28,21 +34,75 @@
status = 302
force = true

[[redirects]]
from = "/nixpkgs"
to = "/"
status = 302
force = true

[[redirects]]
from = "/nixpkgs/index.html"
to = "/"
status = 302
force = true

[[redirects]]
from = "/nixpkgs/download.html"
to = "/download.html"
status = 302
force = true

[[redirects]]
from = "/nixpkgs/packages-nixos-19.09.json.gz"
to = "https://channels.nixos.org/nixos-19.09/packages.json.br"
status = 302
force = true

[[redirects]]
from = "/nixpkgs/packages-nixos-unstable.json.gz"
to = "https://channels.nixos.org/nixos-unstable/packages.json.br"
status = 302
force = true

[[redirects]]
from = "/nixos"
to = "/"
status = 302
force = true

[[redirects]]
from = "/nixos/index.html"
to = "/"
status = 302
force = true

[[redirects]]
from = "/nixos/about.html"
to = "/features.html"
status = 302
force = true

[[redirects]]
from = "/nixos/screenshots/*"
to = "/images/screenshots/:splat"
status = 302
force = true

[[redirects]]
from = "/nixos/klogo-official-crystal-128x128.png"
to = "/images/klogo-official-crystal-128x128.png"
status = 302
force = true

[[redirects]]
from = "/nixos/download.html"
to = "/download.html"
status = 302
force = true

[[redirects]]
from = "/nix/learn.html"
to = "/learn.html"
from = "/nixos/foundation.html"
to = "/governance.html"
status = 302
force = true

Expand All @@ -52,6 +112,12 @@
status = 302
force = true

[[redirects]]
from = "/nixos/security.html"
to = "/governance.html"
status = 302
force = true

[[redirects]]
from = "/nixos/support.html"
to = "/community.html"
Expand All @@ -76,18 +142,6 @@
status = 302
force = true

[[redirects]]
from = "/nixos/security.html"
to = "/governance.html"
status = 302
force = true

[[redirects]]
from = "/nixos/foundation.html"
to = "/governance.html"
status = 302
force = true

[[redirects]]
from = "/channels/*"
to = "https://channels.nixos.org/:splat"
Expand Down Expand Up @@ -156,24 +210,6 @@
status = 302
force = true

[[redirects]]
from = "/~eelco/*"
to = "https://edolstra.github.io/:splat"
status = 301
force = true

[[redirects]]
from = "/nixpkgs/packages-nixos-19.09.json.gz"
to = "https://channels.nixos.org/nixos-19.09/packages.json.br"
status = 302
force = true

[[redirects]]
from = "/nixpkgs/packages-nixos-unstable.json.gz"
to = "https://channels.nixos.org/nixos-unstable/packages.json.br"
status = 302
force = true

[[redirects]]
from = "/patchelf.html"
to = "https://github.com/NixOS/patchelf"
Expand Down Expand Up @@ -222,6 +258,12 @@
status = 302
force = true

[[redirects]]
from = "/~eelco/*"
to = "https://edolstra.github.io/:splat"
status = 301
force = true

[[redirects]]
from = "/~eelco/pubs/bootstrap/css/bootstrap-responsive.min.css"
to = "/bootstrap/css/bootstrap-responsive.min.css"
Expand Down
46 changes: 23 additions & 23 deletions news.xml
View file
Expand Up @@ -974,7 +974,7 @@ $ nix-store -qR /run/current-system | grep openssl
modern, light-weight desktop environment. It can be enabled by
setting the NixOS configuration value
<tt>services.xserver.desktopManager.xfce.enable</tt> to
<tt>true</tt>. (<a href="nixos/screenshots/nixos-xfce.png">Screenshot</a>)
<tt>true</tt>. (<a href="images/screenshots/nixos-xfce.png">Screenshot</a>)
</description>
</item>

Expand Down Expand Up @@ -1102,11 +1102,11 @@ $ nix-store -qR /run/current-system | grep openssl
OpenOffice.org 3 in Nixpkgs
</title>
<description>
<a href="nixos/screenshots/nixos-openoffice-3.png"><img class="inline screenshot"
src="nixos/screenshots/nixos-openoffice-3-small.png" alt="OpenOffice.org 3.0.1 screenshot" /></a>
<a href="images/screenshots/nixos-openoffice-3.png"><img class="inline screenshot"
src="images/screenshots/nixos-openoffice-3-small.png" alt="OpenOffice.org 3.0.1 screenshot" /></a>

Lluís Batlle has updated OpenOffice.org in Nixpkgs to 3.0.1
(<a href="nixos/screenshots/nixos-openoffice-3.png">screenshot</a>).
(<a href="images/screenshots/nixos-openoffice-3.png">screenshot</a>).
</description>
</item>

Expand All @@ -1116,8 +1116,8 @@ $ nix-store -qR /run/current-system | grep openssl
KDE 4.2 in Nixpkgs/NixOS
</title>
<description>
<a href="nixos/screenshots/nixos-kde42-1.png"><img class="inline screenshot"
src="nixos/screenshots/nixos-kde42-1-small.png" alt="KDE 4.2 screenshot" /></a>
<a href="images/screenshots/nixos-kde42-1.png"><img class="inline screenshot"
src="images/screenshots/nixos-kde42-1-small.png" alt="KDE 4.2 screenshot" /></a>

We now have a fairly complete set of KDE 4.2 packages in Nixpkgs
and NixOS. Previously we had KDE 3.5, but it was rather
Expand All @@ -1128,8 +1128,8 @@ $ nix-store -qR /run/current-system | grep openssl
<tt>services.xserver.sessionType</tt> option to
<tt>kde4</tt>. Thanks go to Yury G. Kudryashov, Andrew
Morsillo and Sander van der Burg for doing the hard work on
adding KDE 4 to Nixpkgs. (<a href="nixos/screenshots/nixos-kde42-1.png">Screenshot 1</a>,
<a href="nixos/screenshots/nixos-kde42-2.png">screenshot
adding KDE 4 to Nixpkgs. (<a href="images/screenshots/nixos-kde42-1.png">Screenshot 1</a>,
<a href="images/screenshots/nixos-kde42-2.png">screenshot
2</a>)
</description>
</item>
Expand Down Expand Up @@ -1311,8 +1311,8 @@ $ nix-store -qR /run/current-system | grep openssl
<description>
<p>

<a href="nixos/screenshots/nixos-installer-help.png"><img class="inline screenshot"
src="nixos/screenshots/nixos-installer-help-small.png" alt="NixOS installer online help" /></a>
<a href="images/screenshots/nixos-installer-help.png"><img class="inline screenshot"
src="images/screenshots/nixos-installer-help-small.png" alt="NixOS installer online help" /></a>

New NixOS installation CD images for <tt>i686</tt> and
<tt>x86_64</tt> are <a href="https://nixos.org/releases/nixos-0.1pre10083/">available</a>,
Expand Down Expand Up @@ -1364,11 +1364,11 @@ $ nix-store -qR /run/current-system | grep openssl
<description>
<p>

<a href="nixos/screenshots/nixos-openoffice.png"><img class="inline screenshot"
src="nixos/screenshots/nixos-openoffice-small.png" alt="OpenOffice screenshot" /></a>
<a href="images/screenshots/nixos-openoffice.png"><img class="inline screenshot"
src="images/screenshots/nixos-openoffice-small.png" alt="OpenOffice screenshot" /></a>

<a href="https://www.openoffice.org/">OpenOffice</a> is now in
Nixpkgs (<a href="nixos/screenshots/nixos-openoffice.png">screenshot of
Nixpkgs (<a href="images/screenshots/nixos-openoffice.png">screenshot of
OpenOffice 2.2.1 running under NixOS</a>, and <a
href="http://www.denbreejen.net/public/nixos/nixos-oo-scrs.png">another
screenshot</a>). Despite being a rather gigantic package (it
Expand All @@ -1393,11 +1393,11 @@ $ nix-store -qR /run/current-system | grep openssl
<description>
<p>

<a href="nixos/screenshots/nixos-games.png"><img class="inline screenshot"
src="nixos/screenshots/nixos-games-small.png" alt="NixOS screenshot" /></a>
<a href="images/screenshots/nixos-games.png"><img class="inline screenshot"
src="images/screenshots/nixos-games-small.png" alt="NixOS screenshot" /></a>

<a href="https://www.winehq.org/">Wine</a> now runs on NixOS!
Finally we can run all those <a href="nixos/screenshots/nixos-games.png">legacy
Finally we can run all those <a href="images/screenshots/nixos-games.png">legacy
applications</a>... Thanks to Michael Raskin for adding Wine
and a NPTL-enabled Glibc (which Wine seems to need). This is a
nice application of purely functional package composition, by
Expand Down Expand Up @@ -1452,11 +1452,11 @@ $ nix-store -qR /run/current-system | grep openssl

<p>

<a href="https://www.kde.org"><img class="inline screenshot" src="nixos/klogo-official-crystal-128x128.png"
<a href="https://www.kde.org"><img class="inline screenshot" src="images/klogo-official-crystal-128x128.png"
alt="KDE logo" /></a>

We now have <a href="https://www.kde.org/">KDE</a> running on
NixOS (<a href="nixos/screenshots/nixos-kde.png">obligatory
NixOS (<a href="images/screenshots/nixos-kde.png">obligatory
screenshot</a>). Just <tt>kdebase</tt> for now (Martin
Bravenboer already added <tt>kdelibs</tt> a long time ago so
that we could run the wonderful <a href="http://kcachegrind.sourceforge.net/cgi-bin/show.cgi">KCachegrind</a>),
Expand All @@ -1477,22 +1477,22 @@ $ nix-store -qR /run/current-system | grep openssl
NixOS progress report
</title>
<description>
<a href="nixos/screenshots/nixos-compiz-cube.png"><img class="inline screenshot"
src="nixos/screenshots/nixos-compiz-cube-small.png" alt="NixOS screenshot" /></a>
<a href="images/screenshots/nixos-compiz-cube.png"><img class="inline screenshot"
src="images/screenshots/nixos-compiz-cube-small.png" alt="NixOS screenshot" /></a>

NixOS is now <em>almost</em> usable as a desktop OS ;-). We
have an X server, a bunch of Gnome packages, basic wireless
support, and of course all the applications in Nixpkgs that we
had all along running on other Linux distributions. Here are a
few screenshots:
<ul>
<li><a href="nixos/screenshots/nixos-compiz-cube.png">X server
<li><a href="images/screenshots/nixos-compiz-cube.png">X server
with Compiz window manager</a>.</li>
<li><a href="nixos/screenshots/nixos-terminals.png">Emacs and
<li><a href="images/screenshots/nixos-terminals.png">Emacs and
a few terminals</a> showing off the (near) absence of
<tt>/lib</tt>, <tt>/bin</tt> etc.; everything is in the Nix
store.</li>
<li><a href="nixos/screenshots/nixos-apps.png">Some
<li><a href="images/screenshots/nixos-apps.png">Some
applications</a>.</li>
</ul>
</description>
Expand Down

0 comments on commit 91a9d5a

Please sign in to comment.