From 7177ce3a10f3142cb99296e30f3b9601cfcf5e02 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Sat, 29 Jun 2024 10:10:36 +0200 Subject: [PATCH] Fix breakages after upgrading to NixOS 24.05 some things still have to be fixed, but normal operation can go on for now --- flake.nix | 4 +-- home/adalbert.nix | 5 ++- home/features/cli/gpg.nix | 2 +- home/features/coding/nvim/default.nix | 6 ++-- home/features/coding/nvim/plugin/none-ls.lua | 8 ++--- home/features/desktop/common/3d-printing.nix | 2 +- hosts/adalbert/default.nix | 4 +-- hosts/common/global/default.nix | 1 - hosts/common/optional/gaming/vr.nix | 6 ---- modules/nixos/alvr.nix | 34 ------------------ modules/nixos/default.nix | 1 - pkgs/alvr/default.nix | 36 -------------------- pkgs/default.nix | 1 - 13 files changed, 18 insertions(+), 92 deletions(-) delete mode 100644 hosts/common/optional/gaming/vr.nix delete mode 100644 modules/nixos/alvr.nix delete mode 100644 pkgs/alvr/default.nix diff --git a/flake.nix b/flake.nix index 406061a..e33dadf 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,14 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager - home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hardware.url = "github:nixos/nixos-hardware"; diff --git a/home/adalbert.nix b/home/adalbert.nix index b29da96..1cb57e5 100644 --- a/home/adalbert.nix +++ b/home/adalbert.nix @@ -16,7 +16,10 @@ in { colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; - home.packages = [inputs.picokontroller.packages.x86_64-linux.default pkgs.citrix_workspace]; + home.packages = [ + inputs.picokontroller.packages.x86_64-linux.default + # pkgs.citrix_workspace + ]; nixpkgs = { config = { permittedInsecurePackages = [ diff --git a/home/features/cli/gpg.nix b/home/features/cli/gpg.nix index f87e9ab..22a6510 100644 --- a/home/features/cli/gpg.nix +++ b/home/features/cli/gpg.nix @@ -11,7 +11,7 @@ enableSshSupport = true; enableFishIntegration = true; enableZshIntegration = true; - pinentryFlavor = "gnome3"; + pinentryPackage = pkgs.pinentry-gnome3; }; # Prevent clobbering SSH_AUTH_SOCK diff --git a/home/features/coding/nvim/default.nix b/home/features/coding/nvim/default.nix index 78fa7ab..40840cb 100644 --- a/home/features/coding/nvim/default.nix +++ b/home/features/coding/nvim/default.nix @@ -10,7 +10,6 @@ stableExtraPkgs = with pkgs; [ # LSP lua-language-server - lua pkgs.nodePackages.typescript-language-server # Formatters @@ -33,6 +32,9 @@ wl-clipboard fzf gcc + + # idk? + lua ]; unstableExtraPkgs = with pkgs.unstable; [ # LSP @@ -132,7 +134,7 @@ in { vim-nix { - plugin = nvim-base16; + plugin = base16-nvim; config = '' require('base16-colorscheme').setup({ base00 = '#${colors.base00}', base01 = '#${colors.base01}', base02 = '#${colors.base02}', base03 = '#${colors.base03}', diff --git a/home/features/coding/nvim/plugin/none-ls.lua b/home/features/coding/nvim/plugin/none-ls.lua index eaa2494..b42911c 100644 --- a/home/features/coding/nvim/plugin/none-ls.lua +++ b/home/features/coding/nvim/plugin/none-ls.lua @@ -7,16 +7,16 @@ local opts = { null_ls.builtins.formatting.stylua, -- Python null_ls.builtins.formatting.black, - null_ls.builtins.diagnostics.ruff, + -- null_ls.builtins.diagnostics.ruff, -- Javascript - null_ls.builtins.diagnostics.eslint_d, - null_ls.builtins.diagnostics.jsonlint, + -- null_ls.builtins.diagnostics.eslint_d, + -- null_ls.builtins.diagnostics.jsonlint, -- C/C++ null_ls.builtins.formatting.clang_format, -- Nix null_ls.builtins.formatting.alejandra, -- Rust - null_ls.builtins.formatting.rustfmt, + -- null_ls.builtins.formatting.rustfmt, -- YAML null_ls.builtins.formatting.yamlfmt, -- Typescript diff --git a/home/features/desktop/common/3d-printing.nix b/home/features/desktop/common/3d-printing.nix index 359bb49..52de6ae 100644 --- a/home/features/desktop/common/3d-printing.nix +++ b/home/features/desktop/common/3d-printing.nix @@ -1,3 +1,3 @@ {pkgs, ...}: { - home.packages = with pkgs; [freecad cura super-slicer]; + home.packages = with pkgs; [freecad cura]; } diff --git a/hosts/adalbert/default.nix b/hosts/adalbert/default.nix index 28bc691..065fc5f 100644 --- a/hosts/adalbert/default.nix +++ b/hosts/adalbert/default.nix @@ -32,7 +32,6 @@ ../common/optional/docker.nix ../common/optional/gaming/gamemode.nix ../common/optional/gaming/steam.nix - ../common/optional/gaming/vr.nix ../common/optional/desktop/japanese.nix ../common/optional/udisks.nix ]; @@ -68,7 +67,8 @@ services.udev.packages = [inputs.heliox-cli.packages.x86_64-linux.default]; environment.systemPackages = [inputs.heliox-cli.packages.x86_64-linux.default]; - services.xserver.displayManager.sddm.enable = true; + # services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.gdm.enable = true; # Force disable Nvidia PRIME, needed by nix-hardware hardware.nvidia.prime.offload.enable = false; diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index 088e56b..163e238 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -2,7 +2,6 @@ { inputs, outputs, - config, ... }: { imports = diff --git a/hosts/common/optional/gaming/vr.nix b/hosts/common/optional/gaming/vr.nix deleted file mode 100644 index 1ece2ca..0000000 --- a/hosts/common/optional/gaming/vr.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.alvr = { - enable = true; - openFirewall = true; - }; -} diff --git a/modules/nixos/alvr.nix b/modules/nixos/alvr.nix deleted file mode 100644 index 334fce8..0000000 --- a/modules/nixos/alvr.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -with lib; let - cfg = config.programs.alvr; -in { - options = { - programs.alvr = { - enable = mkEnableOption (lib.mdDoc "ALVR"); - - package = mkPackageOption pkgs "alvr" {}; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Open the default ports in the firewall for the ALVR server. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [cfg.package]; - - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [9943 9944]; - allowedUDPPorts = [9943 9944]; - }; - }; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 402d229..c682b92 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -2,5 +2,4 @@ # These should be stuff you would like to share with others, not your personal configurations. { # List your module files here - alvr = import ./alvr.nix; } diff --git a/pkgs/alvr/default.nix b/pkgs/alvr/default.nix deleted file mode 100644 index c478ad2..0000000 --- a/pkgs/alvr/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, -}: let - pname = "alvr"; - version = "v21.0.0-dev00+nightly.2024.03.03"; - src = fetchurl { - url = "https://github.com/alvr-org/ALVR-nightly/releases/download/v21.0.0-dev00%2Bnightly.2024.03.03/ALVR-x86_64.AppImage"; - hash = "sha256-DCkx8MHcFEkK/IlxIplOYKEzcBM90GQcuqwaftrEdOs="; - }; - - appimageContents = appimageTools.extractType2 {inherit pname version src;}; -in - appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - - install -Dm444 ${appimageContents}/alvr.desktop -t $out/share/applications - substituteInPlace $out/share/applications/alvr.desktop \ - --replace 'Exec=alvr_dashboard' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "Stream VR games from your PC to your headset via Wi-Fi"; - homepage = "https://github.com/alvr-org/ALVR/"; - changelog = "https://github.com/alvr-org/ALVR/releases/tag/v${version}"; - license = licenses.mit; - mainProgram = "alvr"; - maintainers = with maintainers; [passivelemon]; - platforms = ["x86_64-linux"]; - }; - } diff --git a/pkgs/default.nix b/pkgs/default.nix index 0527a76..82c7abd 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,7 +2,6 @@ # You can build them using 'nix build .#example' {pkgs, ...}: { # example = pkgs.callPackage ./example { }; - alvr = pkgs.callPackage ./alvr {}; feishin-appimage = pkgs.callPackage ./feishin {}; protonup-rs = pkgs.callPackage ./protonup-rs {}; rofi-audio-switcher = pkgs.callPackage ./rofi-audio-switcher {};