| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
| |
Might come in handy if you want to look up documentation to syscalls or libc
calls.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
So, this was a big adventure during the last days, because as you might have
guessed from my older configuration this was a single-disk system. And that
single disk failed, so I had to do data recovery instead of actual useful things
in upstream NixOS. Fortunately I could recover everything, so nothing is lost...
just a bit hard to find :-D
Anyway, the new filesystem layout is now without LUKS and LVM, as I really want
to have the flexibility to change striping/raid behaviour per file and possibly
encryption as well someday.
Well, as you might have noticed from the previous commit: ecryptfs is now built
into the kernel and is currently my workaround for encryption until btrfs
finally gets native crypto support.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
| |
In reality it's not the -rc1 tag directly but the master branch, so we are a few
commits ahead.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The first one was for ffmpeg and x11grab support. Maybe I'll need this someday
again if I happen to create a screencast again. But for now, just remove it.
And the second one actually was an attempt to patch git to always sign commits.
I have found a better and more selective solution by just adding the following
alias:
rebase-sign = !EDITOR=cat git rebase -i -x 'git commit --amend --no-edit -S'
This should make it easy to sign all commits prior to pushing easily with:
git rebase-sign upstream/master
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
| |
This is still somewhat tedious to do because we need to revert
7e62e31f9f2bba0864ee8dd05b490c17387f5322, rebuild the nix file and then reset
the revert.
So, let's see when I start getting annouyed by this ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
| |
So, now we have lots of duplication which needs to be merged as soon as
possible.
This commit is obviously quite similar to the previous commit:
7e62e31f9f2bba0864ee8dd05b490c17387f5322
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
| |
So, this is the first step towards enhancing manual kernel configuration. Of
course. this still looks a bit ugly because I personally don't like
all-uppercase variable names for the kernel config and it still needs to have a
few more expressions to properly handle value types (y/n/m, int, hex, string).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
| |
Great, more updates from the 3.8.0 merge window :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
| |
Thes packages are now in upstream nixpkgs, please have a look at these commits
for more details:
NixOS/nixpkgs@e42dc52f4266cd39a0c3a30c2b12f9bc4360a7e5
NixOS/nixpkgs@6acc5289fc3a6c82de1b5099c0b27fbaca7cb252
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
The chromium package in upstream nixpkgs no longer uses the config attribute set
in order to determine package build options, so we don't need to pass around
fake config attributes anymore.
In addition we now have a convenient chromiemBetaWrapper attribute which allows
us to directly specify a specific channel, which is possibly already built by
Hydra.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
| |
So, as promised, finally upgrading kernels on both machines to the latest
version :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
I'm just using the kernel source from mmrnmhrm, even though it's older than
dnyarri's kernel config. The reason is because I want to make sure that a
nixos-rebuild won't bring up any changes. It is rather unlikely, but I better
want to make sure it won't happen.
Afterwards, let's upgrade that old kernel, because the 3.7.0-rc7 tag was pushed
by Linus just about two hours ago.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
| |
This finally results in a consistent nixpkgs configuration among all machines
and regardless of system env and user env.
The config.git expression is no longer needed, as I'm using gitFull anyway.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Luckily, this file is already common on all my machines, so there's no need to
consolidate anything, except that it may be useful to set nixpkgs.config to
those expressions as well.
The expressions in this new file are partly unfinished and not yet cleaned up
packages I'm either working on or just needed "right now", so these will
eventually become part of upstream nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
| |
This should at least clean up some of this mess and only hardware and filesystem
specific stuff should now endup within the respective machine expressions.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
| |
Now all kernel configuration files should point to a consistent location
(/home/aszlig/linux/.config). While I'm still not happy how the kernel
configuration stuff is handled right now, this at least consolidates the issue a
bit.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
| |
The network.nix file roughly resembles a charon network expression file.
Not that i intend to use charon in order to manage both machines right now, but
it definitely makes sense that way. At the moment the network.nix file is just
imported by /etc/nixos/configuration.nix on both machines, pointing to the
respective attribute set.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
This is a somewhat messy change, as I experimented around with the new audio
setup, had a filesystem corruption in-between, checked if the memory is okay,
repaired the filesystem, added NIX_OTHER_STORES, found out that it doesn't work
so well, as we might have impurities, proceeded with the audio stuff.
So, that's how both configurations are now and I still need to clean up this
configuration mess by having one single configuration "library" which is shared
by both machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|
|
|
|
|
| |
This should get pinning right for my shiny new 10.2-"allaround" surround system.
This is no patch that should go into upstream kernel, because I'm just retasking
all the jacks of the sound card to be output channels.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
This is the initial commit in an effort to merge Nix configurations of both
machines. These configurations are the onmodified /etc/nixos/configuration.nix
files.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
