diff --git a/hosts/lungmen/default.nix b/hosts/lungmen/default.nix index 3b5af45..0715bcb 100644 --- a/hosts/lungmen/default.nix +++ b/hosts/lungmen/default.nix @@ -110,11 +110,9 @@ in { driSupport = true; driSupport32Bit = true; enable = true; - /* - extraPackages = with pkgs; [amdvlk libvdpau-va-gl vaapiVdpau libva vulkan-loader pipewire]; - extraPackages32 = with pkgs.pkgsi686Linux; - [libvdpau-va-gl vaapiVdpau libva vulkan-loader pipewire] ++ [pkgs.driversi686Linux.amdvlk]; - */ + extraPackages = with pkgs; [amdvlk libvdpau-va-gl vaapiVdpau libva vulkan-loader]; + extraPackages32 = with pkgs.pkgsi686Linux; + [libvdpau-va-gl vaapiVdpau libva vulkan-loader] ++ [pkgs.driversi686Linux.amdvlk]; }; pulseaudio = { enable = false; diff --git a/users/modules/smos/default.nix b/users/modules/smos/default.nix index 03a4e88..b639f15 100644 --- a/users/modules/smos/default.nix +++ b/users/modules/smos/default.nix @@ -12,9 +12,6 @@ in { notify.enable = true; config = { workflow-dir = smosDir + "/workflows"; - projects-dir = smosDir + "/projects"; - archive-dir = smosDir + "/archive"; - archived-projects-dir = smosDir + "/archived-projects"; github.oauth-token = secrets.githubToken; }; }; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index d686917..267f740 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -159,14 +159,17 @@ in { ++ mkPaths ".local/share" [ "zoxide" "direnv" + "bottles" ] ++ mkPaths ".config" [ "dconf" "chromium" + "gsconnect" ]; files = [ ".config/gnome-initial-setup-done" - ".local/share/zsh/history" + config.programs.zsh.history.path + (lib.removePrefix "~/" config.programs.ssh.userKnownHostsFile) ]; allowOther = true; }; @@ -180,7 +183,6 @@ in { noto-fonts-cjk font-awesome dejavu_fonts - #(nerdfonts.override {fonts = [font.name];}) # Programs wezterm cargo-outdated @@ -189,18 +191,13 @@ in { vulkan-tools krita cachix - #appimage-run - pfetch gnupg imv mpv youtube-dl ffmpeg mupdf - transmission-qt - #lutris xdg_utils - tagref papirus-icon-theme wl-clipboard rust-analyzer @@ -217,6 +214,7 @@ in { src = builtins.fetchGit { url = "https://github.com/AfoninZ/MultiMC5-Cracked.git"; ref = "develop"; rev = "9069e9c9d0b7951c310fdcc8bdc70ebc422a7634"; submodules = true; }; })) */ + bottles cloudflared ]; shellAliases =