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

adjust to nixos 21.05

Browse source
This commit is contained in:
steveej 2021-06-08 12:39:01 +02:00
parent 454aa6e386
commit 1242a8e215
14 changed files with 145 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,7 @@ in {
# Password Management
gnupg
yubikey-manager
yubikey-neo-manager
yubikey-manager-qt
yubikey-personalization
yubikey-personalization-gui
gnome3.gnome_keyring
@ -114,7 +114,7 @@ in {
unstablepkgs.zoom-us
bluejeans-gui
thunderbird
gnome3.evolution # gnome4.glib_networking
evolution # gnome4.glib_networking
# telegram
unstablepkgs.tdesktop
gnome3.cheese
@ -147,7 +147,7 @@ in {
vlc
audacity
spotify
python38Packages.youtube-dl-light
pythonPackages.youtube-dl-light
libwebcam
# Network Tools
@ -253,7 +253,7 @@ in {
pcmanfm
hdparm
testdisk
python38Packages.binwalk
pythonPackages.binwalk
gptfdisk
gparted
smartmontools

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

@ -333,7 +333,7 @@ in {
enable = true;
windowManager.command = "${pkgs.qtile}/bin/qtile -c ${qtileConfig}";
initExtra = ''
# ${pkgs.xorg.xinput}/bin/xinput set-prop "ErgoDox EZ ErgoDox EZ Mouse" "libinput Natural Scrolling Enabled"
${pkgs.xorg.xinput}/bin/xinput set-prop "ZSA Moonlander Mark I Mouse" "libinput Natural Scrolling Enabled" 1
${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
${dpmsScript} default

1
nix/home-manager/programs/firefox.nix
View file

@ -5,7 +5,6 @@
{
programs.firefox = {
enable = true;
enableAdobeFlash = false;
};
programs.browserpass = {

175
nix/home-manager/programs/neovim.nix
View file

@ -15,46 +15,32 @@ in {
openssl = true;
gnutls = true;
};
packageOverrides = pkgs: with pkgs; {
neovim = unstablepkgs.neovim;
vimPlugins = unstablepkgs.vimPlugins;
};
};
programs.neovim = {
enable = true;
extraPythonPackages = (ps: with ps; [ ]);
extraPython3Packages = (ps: with ps; [ ]);
configure = {
customRC = builtins.readFile ./neovim/vimrc;
vam = {
knownPlugins = with pkgs; vimPlugins // {
delimitMate = vimUtils.buildVimPlugin {
name = "delimitMate-vim";
src = fetchFromGitHub {
owner = "Raimondi";
repo = "delimitMate";
rev = "728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c";
sha256 = "0fskm9gz81dk8arcidrm71mv72a7isng1clssqkqn5wnygbiimsn";
};
buildInputs = [ zip vim ];
};
extraConfig = builtins.readFile ./neovim/vimrc;
yaml-folds = vimUtils.buildVimPlugin {
plugins = with pkgs; [
# yaml-folds
{
plugin = vimUtils.buildVimPlugin {
name = "vim-yaml-folds";
src = fetchFromGitHub {
owner = "pedrohdz";
repo = "vim-yaml-folds";
rev = "0672d9a3b685b51b4c49d8716c2ad4e27cfa5abd";
sha256 = "0yp2jgaqiria79lh75fkrs77rw7nk518bq63w9bvyy814i7s4scn";
rev = "890ccd8e5370808d569e96dbb06cbeca2cf5993a";
sha256 = "018z6xcwrq58q6lj6gwhrifjaxkmrlkkg0n86s6mjjlwkbs2qa4m";
};
buildInputs = [ zip vim ];
};
}
vim-yaml = vimUtils.buildVimPlugin {
{
plugin = vimUtils.buildVimPlugin {
name = "vim-yaml";
src = fetchFromGitHub {
owner = "stephpy";
@ -63,104 +49,91 @@ in {
sha256 = "0vqahbrnr43lxanpziyrmzaqqb3cmyny8ry1xvmy2xyd1larzfrk";
};
};
}
# broken 2021-06-08
# {
# plugin = vimUtils.buildVimPlugin {
# name = "vim-markdown-toc";
# src = fetchFromGitHub {
# owner = "mzlogin";
# repo = "vim-markdown-toc";
# rev = "b7bb6c37033d3a6c93906af48dc0e689bd948638";
# sha256 = "026xf2gid4qivwawh7if3nfk7zja9di0flhdzdx82lvil9x48lyz";
# };
# };
# }
vim-markdown-toc = vimUtils.buildVimPlugin {
name = "vim-markdown-toc";
src = fetchFromGitHub {
owner = "mzlogin";
repo = "vim-markdown-toc";
rev = "a6e227023f405a7c39590a8aaf0d54dde5614a2e";
sha256 = "1vpsnjzc7hvrkp6mq68myxl3k1x363iif58rrd17njcsa4jh1zwy";
};
};
vim-perl = vimUtils.buildVimPlugin {
name = "vim-perl";
src = fetchFromGitHub {
owner = "vim-perl";
repo = "vim-perl";
rev = "21d0a0d795336acf8a9306da35f379c32cfc5e08";
sha256 = "0f2sa0v3djd89k16n4saji9n7grziyhkljq75dskcbv8r19m8i1j";
};
};
# broken 2021-06-08
# {
# plugin = vimUtils.buildVimPlugin {
# name = "vim-perl";
# src = fetchFromGitHub {
# owner = "vim-perl";
# repo = "vim-perl";
# rev = "f330b5d474c44e6cfae22ba50868093dea3e9adb";
# sha256 = "1dy40ixgixj0536c5ggra51b4yd1lbw4j6l0j5zc3diasb7m2gvr";
# };
# };
# }
git-blame = vimUtils.buildVimPlugin {
{
plugin = vimUtils.buildVimPlugin {
name = "git-blame";
src = fetchFromGitHub {
"owner" = "zivyangll";
"repo" = "git-blame.vim";
"rev" = "a5b666840eead1b1ea1c351038da6ce026716bb6";
"sha256" = "181siphb87yzln9433159ssa6vmm1h2dd0kqhlx7bgsi51gng4rv";
"rev" = "9d144b7bed5d8f1c9259551768b7f3b3d1294917";
"sha256" = "06zb5xcc59k25rpwl46j82fcqckiznmj97v6i0mwlb8jhqqrhy9j";
};
};
}
]
++ (with pkgs.vimPlugins; [
delimitMate
vim-airline
vim-airline-themes
ctrlp
vim-css-color
rainbow_parentheses
vim-colorschemes
vim-colorstepper
vim-signify
fugitive
vim-indent-guides
UltiSnips
fzfWrapper
tlib = vimPlugins.tlib_vim;
};
ncm2
ncm2-bufword
ncm2-path
ncm2-tmux
ncm2-ultisnips
nvim-yarp
pluginDictionaries = let
default = [
"delimitMate"
"vim-airline"
"vim-airline-themes"
"ctrlp"
"vim-css-color"
"rainbow_parentheses"
"vim-colorschemes"
"vim-colorstepper"
"vim-signify"
"fugitive"
"vim-indent-guides"
"UltiSnips"
"fzfWrapper"
LanguageClient-neovim
"ncm2"
"ncm2-bufword"
"ncm2-path"
"ncm2-tmux"
"ncm2-ultisnips"
"nvim-yarp"
"LanguageClient-neovim"
"Improved-AnsiEsc"
"tabular"
"git-blame"
Improved-AnsiEsc
tabular
# Nix
"vim-addon-nix" "tlib"
"vim-addon-vim2nix"
vim-addon-nix tlib
vim-addon-vim2nix
# LaTeX
"vim-latex-live-preview"
"vimtex"
vim-latex-live-preview
vimtex
# YAML
"yaml-folds"
"vim-yaml"
# Perl
# "vim-perl"
vim-yaml
# markdown
"vim-markdown"
"vim-markdown-toc"
vim-markdown
vim-markdown-toc
# misc syntax support
"vim-bazel" "maktaba"
];
in [
{ names = default; }
{ names = default ++ [
];
filename_regex = ".*\.nix\$";
}
{ names = default ++ [
];
filename_regex = ".*\.tex\$";
}
];
};
};
vim-bazel maktaba
])
;
};
}

40
nix/home-manager/programs/vscode/default.nix
View file

@ -4,21 +4,23 @@ let
packagedExtensions = with pkgs.vscode-extensions; [
bbenoist.Nix
ms-vscode-remote.remote-ssh
vscodevim.vim
];
marketPlaceExtensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
name = "vim";
publisher = "vscodevim";
version = "1.17.1";
sha256 = "10f8jz52gr6k2553awa66m006wszj9z2rnshsic6h2aawxiz3zq1";
}
{
name = "remote-ssh-edit";
publisher = "ms-vscode-remote";
version = "0.56.0";
sha256 = "1gy03ff2xqg7q3y4j47z2l94x5gbw0mjd5h4cl3n0q3iaswk1c1r";
}
# {
# name = "vim";
# publisher = "vscodevim";
# version = "1.17.1";
# sha256 = "10f8jz52gr6k2553awa66m006wszj9z2rnshsic6h2aawxiz3zq1";
# }
# {
# name = "remote-ssh-edit";
# publisher = "ms-vscode-remote";
# version = "0.56.0";
# sha256 = "1gy03ff2xqg7q3y4j47z2l94x5gbw0mjd5h4cl3n0q3iaswk1c1r";
# }
{
name = "Theme-NaturalContrast-With-HC";
publisher = "74th";
@ -411,12 +413,12 @@ let
# version = "1.6.0";
# sha256 = "15m0idk75bvbzfxipdxwz2vpdklr15zv92h4mxxpr8db9jjr32vi";
# }
{
name = "vim";
publisher = "vscodevim";
version = "1.17.1";
sha256 = "10f8jz52gr6k2553awa66m006wszj9z2rnshsic6h2aawxiz3zq1";
}
# {
# name = "vim";
# publisher = "vscodevim";
# version = "1.17.1";
# sha256 = "10f8jz52gr6k2553awa66m006wszj9z2rnshsic6h2aawxiz3zq1";
# }
{
name = "prettify-selected-json";
publisher = "vthiery";
@ -467,7 +469,7 @@ in
enable = true;
extensions = []
++ packagedExtensions
++ marketPlaceExtensions
# ++ marketPlaceExtensions
;
};
}

3
nix/os/devices/steveej-t14/hw.nix
View file

@ -7,11 +7,8 @@ let
"nvme"
"nvme_core"
"pcieport"
"thunderbolt"
"e1000e"
"xhci_pci"
"hxci_hcd"
];
in

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

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

6
nix/os/profiles/graphical/system.nix
View file

@ -38,7 +38,7 @@
services.xserver = {
enable = true;
libinput.enable = true;
libinput.naturalScrolling = true;
libinput.touchpad.naturalScrolling = true;
videoDrivers = [ "qxl" "modesetting" "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ];
xkbVariant = "altgr-intl";
@ -46,7 +46,7 @@
desktopManager = {
# FIXME: gnome should be moved to user session
gnome3.enable = true;
gnome.enable = true;
xterm.enable = true;
plasma5.enable = false;
@ -77,7 +77,7 @@
programs.gnome-documents.enable = false;
programs.gnome-disks.enable = false;
services.gnome3 = {
services.gnome = {
# gnome-online-miners.enable = false; TODO: enable this again
games.enable = false;
gnome-remote-desktop.enable = false;

2
nix/overlays/overrides.nix
View file

@ -61,7 +61,7 @@ in {
preFixup = ''
wrapProgram $out/bin/btrbk \
--set PERL5LIB $PERL5LIB \
--prefix PATH ':' "${self.stdenv.lib.makeBinPath (with self; [ btrfs-progs bash mbuffer openssh ])}"
--prefix PATH ':' "${self.lib.makeBinPath (with self; [ btrfs-progs bash mbuffer openssh ])}"
'';
});
}

3
nix/pkgs/default.nix
View file

@ -86,7 +86,8 @@ in rec {
mfcl3770cdw = pkgs.callPackage ../pkgs/mfcl3770cdw.nix {};
staruml = pkgs.callPackage ../pkgs/staruml.nix { inherit (pkgs.gnome2) GConf; libgcrypt = pkgs.libgcrypt_1_5; };
myPython = pkgs.python37Full.withPackages (ps: with ps; [
pythonPackages = pkgs.python38Packages;
myPython = pkgs.python38Full.withPackages (ps: with ps; [
pep8 yapf flake8
# autopep8 (broken)
# pylint (broken)

12
nix/pkgs/mfcl3770cdw.nix
View file

@ -37,7 +37,7 @@ in rec {
--replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
--replace "PRINTER =~" "PRINTER = \"${model}\"; #"
wrapProgram $dir/lpd/filter_${model} \
--prefix PATH : ${stdenv.lib.makeBinPath [
--prefix PATH : ${lib.makeBinPath [
coreutils ghostscript gnugrep gnused which
]}
# need to use i686 glibc here, these are 32bit proprietary binaries
@ -48,9 +48,9 @@ in rec {
meta = {
description = "Brother ${lib.strings.toUpper model} driver";
homepage = http://www.brother.com/;
license = stdenv.lib.licenses.unfree;
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.steveej ];
maintainers = [ lib.maintainers.steveej ];
};
};
@ -70,7 +70,7 @@ in rec {
--replace "basedir =~" "basedir = \"$basedir\"; #" \
--replace "PRINTER =~" "PRINTER = \"${model}\"; #"
wrapProgram $dir/cupswrapper/brother_lpdwrapper_${model} \
--prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
--prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]}
mkdir -p $out/lib/cups/filter
mkdir -p $out/share/cups/model
ln $dir/cupswrapper/brother_lpdwrapper_${model} $out/lib/cups/filter
@ -80,9 +80,9 @@ in rec {
meta = {
description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver";
homepage = http://www.brother.com/;
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.steveej ];
maintainers = [ lib.maintainers.steveej ];
};
};
}

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

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

0
services/home-ch/router-wan.lan/Justfile → services/home-ch/router-family.lan/Justfile
View file

0
services/home-ch/router-wan.lan/mlsia.qrcode.png.secret → services/home-ch/router-family.lan/mlsia.qrcode.png.secret
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 405 B

After

Width:  |  Height:  |  Size: 405 B

Before After
Before After