From 1242a8e215cf2c744821404b49c108dc00dd314a Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 8 Jun 2021 12:39:01 +0200 Subject: [PATCH] adjust to nixos 21.05 --- .../configuration/graphical-fullblown.nix | 8 +- nix/home-manager/profiles/qtile-desktop.nix | 2 +- nix/home-manager/programs/firefox.nix | 1 - nix/home-manager/programs/neovim.nix | 225 ++++++++---------- nix/home-manager/programs/vscode/default.nix | 40 ++-- nix/os/devices/steveej-t14/hw.nix | 3 - nix/os/devices/steveej-t14/versions.tmpl.nix | 8 +- nix/os/profiles/graphical/system.nix | 6 +- nix/overlays/overrides.nix | 2 +- nix/pkgs/default.nix | 3 +- nix/pkgs/mfcl3770cdw.nix | 12 +- nix/variables/versions.tmpl.nix | 8 +- .../Justfile | 0 .../mlsia.qrcode.png.secret | Bin 14 files changed, 145 insertions(+), 173 deletions(-) rename services/home-ch/{router-wan.lan => router-family.lan}/Justfile (100%) rename services/home-ch/{router-wan.lan => router-family.lan}/mlsia.qrcode.png.secret (100%) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 91f37cd..994cdc8 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -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 diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix index a3df277..32cf476 100644 --- a/nix/home-manager/profiles/qtile-desktop.nix +++ b/nix/home-manager/profiles/qtile-desktop.nix @@ -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 diff --git a/nix/home-manager/programs/firefox.nix b/nix/home-manager/programs/firefox.nix index f93f020..426c6d6 100644 --- a/nix/home-manager/programs/firefox.nix +++ b/nix/home-manager/programs/firefox.nix @@ -5,7 +5,6 @@ { programs.firefox = { enable = true; - enableAdobeFlash = false; }; programs.browserpass = { diff --git a/nix/home-manager/programs/neovim.nix b/nix/home-manager/programs/neovim.nix index 3f6fa44..febea42 100644 --- a/nix/home-manager/programs/neovim.nix +++ b/nix/home-manager/programs/neovim.nix @@ -15,152 +15,125 @@ 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 { - name = "vim-yaml-folds"; - src = fetchFromGitHub { - owner = "pedrohdz"; - repo = "vim-yaml-folds"; - rev = "0672d9a3b685b51b4c49d8716c2ad4e27cfa5abd"; - sha256 = "0yp2jgaqiria79lh75fkrs77rw7nk518bq63w9bvyy814i7s4scn"; - }; - buildInputs = [ zip vim ]; + plugins = with pkgs; [ + # yaml-folds + { + plugin = vimUtils.buildVimPlugin { + name = "vim-yaml-folds"; + src = fetchFromGitHub { + owner = "pedrohdz"; + repo = "vim-yaml-folds"; + rev = "890ccd8e5370808d569e96dbb06cbeca2cf5993a"; + sha256 = "018z6xcwrq58q6lj6gwhrifjaxkmrlkkg0n86s6mjjlwkbs2qa4m"; }; - - vim-yaml = vimUtils.buildVimPlugin { - name = "vim-yaml"; - src = fetchFromGitHub { - owner = "stephpy"; - repo = "vim-yaml"; - rev = "e97e063b16eba4e593d620676a0a15fa98613979"; - sha256 = "0vqahbrnr43lxanpziyrmzaqqb3cmyny8ry1xvmy2xyd1larzfrk"; - }; - }; - - - 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"; - }; - }; - - git-blame = vimUtils.buildVimPlugin { - name = "git-blame"; - src = fetchFromGitHub { - "owner" = "zivyangll"; - "repo" = "git-blame.vim"; - "rev" = "a5b666840eead1b1ea1c351038da6ce026716bb6"; - "sha256" = "181siphb87yzln9433159ssa6vmm1h2dd0kqhlx7bgsi51gng4rv"; - }; - }; - - tlib = vimPlugins.tlib_vim; + buildInputs = [ zip vim ]; }; + } - 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" + { + plugin = vimUtils.buildVimPlugin { + name = "vim-yaml"; + src = fetchFromGitHub { + owner = "stephpy"; + repo = "vim-yaml"; + rev = "e97e063b16eba4e593d620676a0a15fa98613979"; + sha256 = "0vqahbrnr43lxanpziyrmzaqqb3cmyny8ry1xvmy2xyd1larzfrk"; + }; + }; + } - "ncm2" - "ncm2-bufword" - "ncm2-path" - "ncm2-tmux" - "ncm2-ultisnips" - "nvim-yarp" + # broken 2021-06-08 + # { + # plugin = vimUtils.buildVimPlugin { + # name = "vim-markdown-toc"; + # src = fetchFromGitHub { + # owner = "mzlogin"; + # repo = "vim-markdown-toc"; + # rev = "b7bb6c37033d3a6c93906af48dc0e689bd948638"; + # sha256 = "026xf2gid4qivwawh7if3nfk7zja9di0flhdzdx82lvil9x48lyz"; + # }; + # }; + # } - "LanguageClient-neovim" + # broken 2021-06-08 + # { + # plugin = vimUtils.buildVimPlugin { + # name = "vim-perl"; + # src = fetchFromGitHub { + # owner = "vim-perl"; + # repo = "vim-perl"; + # rev = "f330b5d474c44e6cfae22ba50868093dea3e9adb"; + # sha256 = "1dy40ixgixj0536c5ggra51b4yd1lbw4j6l0j5zc3diasb7m2gvr"; + # }; + # }; + # } - "Improved-AnsiEsc" - "tabular" - "git-blame" + { + plugin = vimUtils.buildVimPlugin { + name = "git-blame"; + src = fetchFromGitHub { + "owner" = "zivyangll"; + "repo" = "git-blame.vim"; + "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 - # Nix - "vim-addon-nix" "tlib" - "vim-addon-vim2nix" + ncm2 + ncm2-bufword + ncm2-path + ncm2-tmux + ncm2-ultisnips + nvim-yarp - # LaTeX - "vim-latex-live-preview" - "vimtex" + LanguageClient-neovim - # YAML - "yaml-folds" - "vim-yaml" + Improved-AnsiEsc + tabular - # Perl - # "vim-perl" + # Nix + vim-addon-nix tlib + vim-addon-vim2nix + # LaTeX + vim-latex-live-preview + vimtex - # markdown - "vim-markdown" - "vim-markdown-toc" + # YAML + vim-yaml - # misc syntax support - "vim-bazel" "maktaba" - ]; - in [ - { names = default; } - { names = default ++ [ - ]; - filename_regex = ".*\.nix\$"; - } - { names = default ++ [ - ]; - filename_regex = ".*\.tex\$"; - } - ]; - }; - }; + # markdown + vim-markdown + vim-markdown-toc + + # misc syntax support + vim-bazel maktaba + ]) + ; }; } diff --git a/nix/home-manager/programs/vscode/default.nix b/nix/home-manager/programs/vscode/default.nix index 6e54887..ffe1057 100644 --- a/nix/home-manager/programs/vscode/default.nix +++ b/nix/home-manager/programs/vscode/default.nix @@ -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 ; }; } diff --git a/nix/os/devices/steveej-t14/hw.nix b/nix/os/devices/steveej-t14/hw.nix index bc5c3fa..b951fc4 100644 --- a/nix/os/devices/steveej-t14/hw.nix +++ b/nix/os/devices/steveej-t14/hw.nix @@ -7,11 +7,8 @@ let "nvme" "nvme_core" - "pcieport" "thunderbolt" "e1000e" - "xhci_pci" - "hxci_hcd" ]; in diff --git a/nix/os/devices/steveej-t14/versions.tmpl.nix b/nix/os/devices/steveej-t14/versions.tmpl.nix index 09f95fd..a3a1e8f 100644 --- a/nix/os/devices/steveej-t14/versions.tmpl.nix +++ b/nix/os/devices/steveej-t14/versions.tmpl.nix @@ -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' -%>"; }; } diff --git a/nix/os/profiles/graphical/system.nix b/nix/os/profiles/graphical/system.nix index 06e7d69..d210472 100644 --- a/nix/os/profiles/graphical/system.nix +++ b/nix/os/profiles/graphical/system.nix @@ -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; diff --git a/nix/overlays/overrides.nix b/nix/overlays/overrides.nix index a8e0e87..ad06b85 100644 --- a/nix/overlays/overrides.nix +++ b/nix/overlays/overrides.nix @@ -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 ])}" ''; }); } diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index d115f06..0796dfb 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -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) diff --git a/nix/pkgs/mfcl3770cdw.nix b/nix/pkgs/mfcl3770cdw.nix index 9fa1c05..f41a2b8 100644 --- a/nix/pkgs/mfcl3770cdw.nix +++ b/nix/pkgs/mfcl3770cdw.nix @@ -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 ]; }; }; } diff --git a/nix/variables/versions.tmpl.nix b/nix/variables/versions.tmpl.nix index 09f95fd..a3a1e8f 100644 --- a/nix/variables/versions.tmpl.nix +++ b/nix/variables/versions.tmpl.nix @@ -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' -%>"; }; } diff --git a/services/home-ch/router-wan.lan/Justfile b/services/home-ch/router-family.lan/Justfile similarity index 100% rename from services/home-ch/router-wan.lan/Justfile rename to services/home-ch/router-family.lan/Justfile diff --git a/services/home-ch/router-wan.lan/mlsia.qrcode.png.secret b/services/home-ch/router-family.lan/mlsia.qrcode.png.secret similarity index 100% rename from services/home-ch/router-wan.lan/mlsia.qrcode.png.secret rename to services/home-ch/router-family.lan/mlsia.qrcode.png.secret