steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pr/bump' into 'master'

Browse source 
steveej-t480s-work: upgrade to NixOS 20.03

See merge request steveeJ/infra!36
This commit is contained in:
steveej 2020-03-13 10:35:56 +00:00
commit 3702b5c5d5
9 changed files with 26 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -133,6 +133,7 @@ in {
hunspellDicts.de-de
# Messaging/Communication
signal-desktop
pidgin
hexchat
aspellDicts.en
@ -150,7 +151,6 @@ in {
(pkgs.lib.hiPrio qemu)
# virtualbox
vagrant
rkt
docker_compose
# unstablepkgs.kubernetes
unstablepkgs.minikube
@ -346,6 +346,8 @@ in {
unstablepkgs.swagger-codegen
# Misc Desktop Tools
# TODO: this may be required if brightness control isn't working
# brightnessctl
ltunify
# solaar # TODO: conflicts with solar over udev rules
dex

5
nix/home-manager/profiles/qtile-desktop.nix
View file

@ -259,7 +259,8 @@ in {
services = {
gnome-keyring.enable = true;
blueman-applet.enable = true;
# TODO: this has been broken for a while, removing for now.
# blueman-applet.enable = true;
screen-locker = {
enable = true;
inactiveInterval = 7;
@ -273,6 +274,7 @@ in {
enableScDaemon = true;
enableSshSupport = true;
grabKeyboardAndMouse = true;
extraConfig = "pinentry-program ${pkgs.pinentry-gtk2}/bin/pinentry";
};
flameshot.enable = true;
};
@ -281,6 +283,7 @@ in {
enable = true;
windowManager.command = "${pkgs.qtile}/bin/qtile -c ${qtileConfig}";
initExtra = ''
${pkgs.xinput}/bin/xinput set-prop "ErgoDox EZ ErgoDox EZ Mouse" "libinput Natural Scrolling Enabled"
${pkgs.autorandr}/bin/autorandr -c
${pkgs.feh}/bin/feh --bg-scale ${pkgs.nixos-artwork.wallpapers.simple-blue}/share/artwork/gnome/nix-wallpaper-simple-blue.png
'';

2
nix/os/devices/steveej-t480s-work/hw.nix
View file

@ -31,6 +31,4 @@ in
options kvm-intel enable_apicv=1
options kvm-intel ept=1
'';
hardware.brightnessctl.enable = false;
}

8
nix/os/devices/steveej-t480s-work/versions.nix
View file

@ -1,16 +1,16 @@
{
channelsNixosStable = {
ref = "nixos-19.09";
rev = "8731aaaf8b30888bc24994096db830993090d7c4";
ref = "nixos-20.03";
rev = "dbacfa172f9a6399f180bcd0aef7998fdec0d55a";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "8130f3c1c2bb0e533b5e150c39911d6e61dcecc2";
rev = "82b54d490663b6d87b7b34b9cfc0985df8b49c7d";
};
nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "329102c47bd1c68f0acdf4feec64232202948c7a";
rev = "a1bcb3a83ffdd3b50063a24e6d490c69455268ee";
};
homeManagerModule = {
url = "https://github.com/rycee/home-manager";

21
nix/os/profiles/common/system.nix
View file

@ -30,9 +30,9 @@
'';
# Fonts, I18N, Date ...
fonts = {
enableCoreFonts = true;
};
fonts.fonts = [
pkgs.corefonts
];
i18n = {
consoleFont = "lat9w-16";
@ -52,12 +52,15 @@
ln -sfT ${pkgs.bash}/bin/bash /bin/.bash
mv -Tf /bin/.bash /bin/bash
'';
system.activationScripts.etcX11sessinos = ''
echo "setting up /etc/X11/sessions..."
mkdir -p /etc/X11
ln -sfT ${config.services.xserver.displayManager.session.desktops} /etc/X11/.sessions
mv -Tf /etc/X11/.sessions /etc/X11/sessions
'';
# TODO: find out if this workaround is still required from nixos 20.03 onwards
# system.activationScripts.etcX11sessinos = ''
# echo "setting up /etc/X11/sessions..."
# mkdir -p /etc/X11
# ln -sfT ${config.services.xserver.displayManager.session.desktops} /etc/X11/.sessions
# mv -Tf /etc/X11/.sessions /etc/X11/sessions
# '';
system.activationScripts.lib64 = ''
echo "setting up /lib64..."
mkdir -p /lib64

1
nix/pkgs/default.nix
View file

@ -64,7 +64,6 @@ in rec {
});
duplicacy = pkgs.callPackage ../pkgs/duplicacy {};
just = pkgs.callPackage ../pkgs/just.nix {};
mfcl3770cdw = pkgs.callPackage ../pkgs/mfcl3770cdw.nix {};
staruml = pkgs.callPackage ../pkgs/staruml.nix { inherit (pkgs.gnome2) GConf; libgcrypt = pkgs.libgcrypt_1_5; };
}

26
nix/pkgs/just.nix
View file

@ -1,26 +0,0 @@
{ rustPlatform
, stdenv
, fetchFromGitHub
, callPackage
, bash
}:
let
naersk = callPackage (import (fetchFromGitHub {
owner = "nmattia";
repo = "naersk";
rev = "b3b328b088009972e6844f57c97807f6090fa004";
sha256 = "152fl2c174zisl2bcky7xspwhc2s8ys2qdv6nvfhqav5x1rbngbp";
})) {};
in
naersk.buildPackage rec {
version = "5acc112a9749063a554e3626a6055bb88f093468";
src = builtins.fetchGit {
url = "https://github.com/casey/just.git";
rev = version;
};
doDoc = false;
doCheck = false;
}

4
nix/variables/versions.tmpl.nix
View file

@ -1,7 +1,7 @@
{
channelsNixosStable = {
ref = "nixos-19.09";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-19.09 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "nixos-20.03";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-20.03 | awk '{ print $1 }' | tr -d '\n' -%>";
};
channelsNixosUnstable = {
ref = "nixos-unstable";

2
shell.nix
View file

@ -1,7 +1,7 @@
{ ... }:
let
channels-nixos-stable-path = (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/7e88992a8c7b2de0bcb89182d8686b27bd93e46a.tar.gz);
channels-nixos-stable-path = (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/dbacfa172f9a6399f180bcd0aef7998fdec0d55a.tar.gz);
channels-nixos-stable = import channels-nixos-stable-path { overlays = builtins.attrValues (import ./nix/overlays); };
in