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

feat(common,steveej-t14,graphical): udpate to nixos-22.05

Browse source
This commit is contained in:
steveej 2022-06-02 11:34:21 +02:00
parent aec8ff4e9a
commit 4a2ee46f7f
13 changed files with 42 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -76,13 +76,13 @@ in {
# Process/System Administration
htop
gnome3.gnome-tweak-tool
gnome.gnome-tweaks
xorg.xhost
dmidecode
evtest
# Archive Managers
sshfsFuse
sshfs-fuse
xarchive
p7zip
zip
@ -96,8 +96,8 @@ in {
yubikey-manager-qt
yubikey-personalization
yubikey-personalization-gui
gnome3.gnome_keyring
gnome3.seahorse
gnome.gnome-keyring
gnome.seahorse
# Language Support
hunspellDicts.en-us
@ -109,13 +109,13 @@ in {
hexchat
aspellDicts.en
aspellDicts.de
skype
skypeforlinux
unstablepkgs.jitsi-meet-electron
unstablepkgs.zoom-us
thunderbird
evolution # gnome4.glib_networking
unstablepkgs.kotatogram-desktop
gnome3.cheese
gnome.cheese
discord
# Virtualization
@ -170,7 +170,7 @@ in {
xsel
# Image/Graphic/Design Tools
gnome3.eog
gnome.eog
gimp
imagemagick
exiv2
@ -284,7 +284,7 @@ in {
xdotool
xdg_utils
xdg-user-dirs
gnome3.dconf
dconf
picocom
glib.dev # contains gdbus tool
alacritty

10
nix/home-manager/configuration/graphical-gnome3.nix
View file

@ -50,13 +50,13 @@ in {
# Process/System Administration
htop
gnome3.gnome-tweak-tool
gnome.gnome-tweaks
xorg.xhost
dmidecode
evtest
# Archive Managers
sshfsFuse
sshfs-fuse
xarchive
p7zip
zip
@ -65,8 +65,8 @@ in {
lzop
# Password Management
gnome3.gnome_keyring
gnome3.seahorse
gnome.gnome-keyring
gnome.seahorse
# Remote Control Tools
remmina
@ -91,7 +91,7 @@ in {
unstablepkgs.vscode
# Image/Graphic/Design Tools
gnome3.eog
gnome.eog
gimp
inkscape

10
nix/home-manager/configuration/graphical-removable.nix
View file

@ -52,13 +52,13 @@ in {
# Process/System Administration
htop
gnome3.gnome-tweak-tool
gnome.gnome-tweaks
xorg.xhost
dmidecode
evtest
# Archive Managers
sshfsFuse
sshfs-fuse
xarchive
p7zip
zip
@ -67,8 +67,8 @@ in {
lzop
# Password Management
gnome3.gnome_keyring
gnome3.seahorse
gnome.gnome-keyring
gnome.seahorse
# Remote Control Tools
remmina
@ -93,7 +93,7 @@ in {
unstablepkgs.vscode
# Image/Graphic/Design Tools
gnome3.eog
gnome.eog
gimp
inkscape

2
nix/home-manager/configuration/text-minimal.nix
View file

@ -29,7 +29,7 @@ in {
home.packages = extraPackages
++ (with pkgs; [
iperf3
telnet
inetutils
speedtest-cli
]);
}

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

@ -37,7 +37,7 @@ let
dpmsScript = pkgs.writeScript "dpmsScript" ''
#!${pkgs.bash}/bin/bash
export PATH=${with pkgs; lib.makeBinPath [
xlibs.xset
xorg.xset
]}:$PATH
set -xe
@ -307,11 +307,11 @@ in {
home.packages = with pkgs; [
# X Tools/Libraries
lightdm
gnome3.networkmanagerapplet
networkmanagerapplet
autorandr
arandr
gnome3.gnome_themes_standard
gnome3.adwaita-icon-theme
gnome.gnome-themes-extra
gnome.adwaita-icon-theme
lxappearance
xorg.xcursorthemes
pavucontrol

2
nix/home-manager/programs/pass.nix
View file

@ -14,7 +14,7 @@
};
home.packages = with pkgs; [
pass-otp
pass
qtpass
rofi-pass
gnupg

14
nix/os/devices/steveej-t14/versions.tmpl.nix
View file

@ -1,8 +1,8 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.11";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "nixos-22.05";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
in
@ -12,12 +12,6 @@ in
suffix = "/nixos";
};
"channels-nixos-stable" = nixpkgs;
"channels-nixos-21.05" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.05";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
@ -30,7 +24,7 @@ in
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-21.11";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "release-22.05";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
}

4
nix/os/profiles/common/boot.nix
View file

@ -5,13 +5,13 @@
{
boot.kernelPackages = pkgs.linuxPackages;
boot.loader.grub = {
enable = true;
efiSupport = true;
efiInstallAsRemovable = false;
enable = true;
version = 2;
};
boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.enable = false;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmpOnTmpfs = true;

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

@ -70,7 +70,7 @@
system.activationScripts.lib64 = ''
echo "setting up /lib64..."
mkdir -p /lib64
ln -sfT ${pkgs.stdenv.glibc}/lib/ld-linux-x86-64.so.2 /lib64/.ld-linux-x86-64.so.2
ln -sfT ${pkgs.glibc}/lib/ld-linux-x86-64.so.2 /lib64/.ld-linux-x86-64.so.2
mv -Tf /lib64/.ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
'';

2
nix/pkgs/browserpass/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libPath = lib.makeLibraryPath [ ];
installPhase = ''
set -x
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 browserpass-linux64
patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 browserpass-linux64
mkdir -p $out/bin
cp -a * $out/bin/

29
nix/pkgs/nomad/default.nix
View file

@ -1,29 +0,0 @@
with import <nixpkgs> {};
stdenv.mkDerivation rec {
name = "nomad";
version = "0.1.2";
filename = "nomad_${version}_linux_amd64.zip";
src = fetchurl {
url = "https://releases.hashicorp.com/nomad/${version}/${filename}";
sha256 = "0d3r3n1wwlic1kg3hgghds7f3b0qhh97v8xf36mcmsnmn2ngfd9k";
};
unpackPhase = ''
unzip ${src}
'';
buildInputs = [ makeWrapper unzip ];
libPath = lib.makeLibraryPath [ ];
installPhase = ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 ./nomad
mkdir -p $out/bin
cp ./nomad $out/bin/nomad
# wrapProgram $out/bin/nomad \
# --prefix LD_LIBRARY_PATH : "${libPath}"
#
'';
}

18
nix/variables/versions.nix
View file

@ -1,8 +1,8 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.11";
rev = "00acdb2aa817048fbe1f91ece18fe7de09762531";
ref = "nixos-22.05";
rev = "08950a6e29cf7bddee466592eb790a417550f7f9";
};
in
@ -12,25 +12,19 @@ in
suffix = "/nixos";
};
"channels-nixos-stable" = nixpkgs;
# "channels-nixos-21.05" = {
# url = "https://github.com/NixOS/nixpkgs/";
# ref = "nixos-21.05";
# rev = "88579effa7e88c25087faf6de6388d0cd1738dc0";
# };
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = "ff377a78794d412a35245e05428c8f95fef3951f";
rev = "f1c167688a6f81f4a51ab542e5f476c8c595e457";
};
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "2ac65dd85b7fbe81b88e3c2a80d351aba4c4a9d8";
rev = "5ebfb1845b1a77716ecd706b8f589c722584ed2a";
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-21.11";
rev = "697cc8c68ed6a606296efbbe9614c32537078756";
ref = "release-22.05";
rev = "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675";
};
}

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

@ -1,8 +1,8 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.11";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "nixos-22.05";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
in
@ -12,12 +12,6 @@ in
suffix = "/nixos";
};
"channels-nixos-stable" = nixpkgs;
# "channels-nixos-21.05" = {
# url = "https://github.com/NixOS/nixpkgs/";
# ref = "nixos-21.05";
# rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
# };
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
@ -30,7 +24,7 @@ in
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-21.11";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "release-22.05";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
}