From 400b6cc066fd0a7744d99707974dad1dd33957ab Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 29 May 2024 13:42:13 -0500 Subject: [PATCH] Stuff that doesn't work --- flake.lock | 56 ++++++++++------------------- flake.nix | 4 ++- modules/home-manager/common.nix | 7 ++-- modules/home-manager/macos.nix | 9 ----- modules/home-manager/melee.nix | 10 +----- modules/nixos/common.nix | 1 + modules/nixos/desktop-usage.nix | 14 +++++++- modules/nixos/gnome.nix | 6 ---- modules/nixos/kde-plasma.nix | 62 +++++++++------------------------ modules/nixos/melee.nix | 13 +------ modules/nixos/sway.nix | 11 ------ nixos/dragon.nix | 14 ++++---- 12 files changed, 66 insertions(+), 141 deletions(-) diff --git a/flake.lock b/flake.lock index 2e2306b..92e98d5 100644 --- a/flake.lock +++ b/flake.lock @@ -382,15 +382,15 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "owner": "NixOS", + "lastModified": 1716769173, + "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -430,8 +430,8 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgsForIosevka": "nixpkgsForIosevka", "pre-commit-hooks": "pre-commit-hooks", - "sops-nix": "sops-nix", - "ssbm": "ssbm" + "slippi": "slippi", + "sops-nix": "sops-nix" } }, "rust-overlay": { @@ -459,20 +459,21 @@ "type": "github" } }, - "slippi-desktop": { - "flake": false, + "slippi": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1713234497, - "narHash": "sha256-UOZo3YybBldkn1McZRr0oAYEieTtjCGgcA4YqpEOyXI=", - "owner": "project-slippi", - "repo": "slippi-desktop-app", - "rev": "ae8bb69e235b6e46b24bc966aeaa80f45030c6f9", - "type": "github" + "dirtyRev": "300f48c551e1f3942780fac97607308e641c86ef-dirty", + "dirtyShortRev": "300f48c-dirty", + "lastModified": 1717003381, + "narHash": "sha256-a4ZJuN5EG7ECmYkNrMICU/QB6v7Obbv2nAhyy87057Y=", + "type": "git", + "url": "file:///home/daniel/code/open-source/slippi-nix" }, "original": { - "owner": "project-slippi", - "repo": "slippi-desktop-app", - "type": "github" + "type": "git", + "url": "file:///home/daniel/code/open-source/slippi-nix" } }, "sops-nix": { @@ -498,25 +499,6 @@ "type": "github" } }, - "ssbm": { - "inputs": { - "nixpkgs": "nixpkgs_4", - "slippi-desktop": "slippi-desktop" - }, - "locked": { - "lastModified": 1716565139, - "narHash": "sha256-kjfc9Mg/YdY8OQU+Irm8v9iIhtgIw5qW/6VAehjW6GA=", - "owner": "lytedev", - "repo": "ssbm-nix", - "rev": "922b91f3f9c0dbdf2ce17921dfc07872d7d41c4b", - "type": "github" - }, - "original": { - "owner": "lytedev", - "repo": "ssbm-nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 6c64f9d..98a727e 100644 --- a/flake.nix +++ b/flake.nix @@ -29,8 +29,10 @@ hyprland.url = "github:hyprwm/Hyprland"; - ssbm.url = "github:lytedev/ssbm-nix"; + # ssbm.url = "github:lytedev/ssbm-nix"; # ssbm.url = "git+file:///home/daniel/code/open-source/ssbm-nix"; + # slippi.url = "github:lytedev/slippi-nix"; + slippi.url = "git+file:///home/daniel/code/open-source/slippi-nix"; }; outputs = { diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix index 3e6d5ee..413d14b 100644 --- a/modules/home-manager/common.nix +++ b/modules/home-manager/common.nix @@ -39,10 +39,11 @@ MANPAGER = "less"; }; - packages = [ + packages = with pkgs; [ # tools I use when editing nix code - pkgs.nil - pkgs.alejandra + nil + alejandra + gnupg # common scripts (pkgs.buildEnv { diff --git a/modules/home-manager/macos.nix b/modules/home-manager/macos.nix index 56c175f..8b35607 100644 --- a/modules/home-manager/macos.nix +++ b/modules/home-manager/macos.nix @@ -3,13 +3,4 @@ desktop pass ]; - - # TODO: pinentry curses? - /* - programs.gnupg.agent = { - enable = true; - pinentryFlavor = "gnome3"; - enableSSHSupport = true; - }; - */ } diff --git a/modules/home-manager/melee.nix b/modules/home-manager/melee.nix index 7c14f36..b738463 100644 --- a/modules/home-manager/melee.nix +++ b/modules/home-manager/melee.nix @@ -1,13 +1,5 @@ {inputs, ...}: { imports = [ - {nixpkgs.overlays = [inputs.ssbm.overlay];} - inputs.ssbm.homeManagerModules.default + inputs.slippi.homeManagerModules.default ]; - - ssbm = { - slippi-launcher = { - enable = false; - launchMeleeOnPlay = false; - }; - }; } diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index d63a681..fb06411 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -57,6 +57,7 @@ in { file fzf gnumake + gnupg # gron # hexyl iputils diff --git a/modules/nixos/desktop-usage.nix b/modules/nixos/desktop-usage.nix index 6a8c267..86fbad6 100644 --- a/modules/nixos/desktop-usage.nix +++ b/modules/nixos/desktop-usage.nix @@ -1,7 +1,8 @@ -{ +{pkgs, ...}: { imports = [ ./sway.nix # ./hyprland.nix + ./kde-plasma.nix ./fonts.nix ./user-installed-applications.nix ./kde-connect.nix @@ -9,6 +10,17 @@ ./development-tools.nix ]; + environment = { + variables = { + GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark"; + GTK_USE_PORTAL = "1"; + }; + + systemPackages = with pkgs; [ + gnupg + ]; + }; + hardware = { opengl = { enable = true; diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix index 3592aad..097863a 100644 --- a/modules/nixos/gnome.nix +++ b/modules/nixos/gnome.nix @@ -28,12 +28,6 @@ ''; }; - # programs.gnupg.agent = { - # enable = true; - # # pinentryFlavor = "gnome3"; - # enableSSHSupport = true; - # }; - xdg.portal = { enable = true; }; diff --git a/modules/nixos/kde-plasma.nix b/modules/nixos/kde-plasma.nix index cf00093..fe59e70 100644 --- a/modules/nixos/kde-plasma.nix +++ b/modules/nixos/kde-plasma.nix @@ -1,8 +1,4 @@ -{ - pkgs, - lib, - ... -}: { +{pkgs, ...}: { imports = [./pipewire.nix]; # NOTE: Plasma and Kitty seem to have some weird interactions where @@ -16,60 +12,36 @@ # https://gitlab.archlinux.org/archlinux/packaging/packages/kitty/-/issues/3 # NOTE: I'm switching to wezterm. Will this solve my issue? - - # qt.platformTheme = "gnome"; + # Update: seems so? services.desktopManager.plasma6.enable = true; - services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; - - services.displayManager.defaultSession = "plasma"; - services.xserver.enable = lib.mkDefault true; - - hardware.pulseaudio.enable = false; - - qt = { - enable = true; - # platformTheme = "gnome"; - # style = "adwaita-dark"; - }; - - programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-qt; - + qt.enable = true; programs.dconf.enable = true; - services.dbus.enable = true; environment = { - variables = { - GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark"; - VISUAL = "hx"; - PAGER = "less"; - MANPAGER = "less"; - GTK_USE_PORTAL = "1"; - }; - systemPackages = with pkgs; [ inkscape krita noto-fonts vlc wl-clipboard - libsForQt5.kate - libsForQt5.kdenlive - libsForQt5.merkuro - libsForQt5.kcalc - libsForQt5.neochat - libsForQt5.filelight - libsForQt5.krdc - libsForQt5.krfb - libsForQt5.kclock - libsForQt5.kweather - libsForQt5.ktorrent - libsForQt5.kdevelop - libsForQt5.kdialog - libsForQt5.kdeplasma-addons + # libsForQt5.kate + # libsForQt5.kdenlive + # libsForQt5.merkuro + # libsForQt5.kcalc + # libsForQt5.neochat + # libsForQt5.filelight + # libsForQt5.krdc + # libsForQt5.krfb + # libsForQt5.kclock + # libsForQt5.kweather + # libsForQt5.ktorrent + # libsForQt5.kdevelop + # libsForQt5.kdialog + # libsForQt5.kdeplasma-addons ]; }; } diff --git a/modules/nixos/melee.nix b/modules/nixos/melee.nix index 77d78fc..da48798 100644 --- a/modules/nixos/melee.nix +++ b/modules/nixos/melee.nix @@ -1,16 +1,5 @@ {inputs, ...}: { imports = [ - {nixpkgs.overlays = [inputs.ssbm.overlay];} - inputs.ssbm.nixosModules.default + inputs.slippi.nixosModules.default ]; - - ssbm = { - cache.enable = true; - overlay.enable = true; - - gcc = { - rules.enable = true; - oc-kmod.enable = true; - }; - }; } diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index 7388073..8fe5f49 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -12,14 +12,6 @@ services.gnome.gnome-keyring.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # # settings = { - # # pinentry-program = "/run/current-system/sw/bin/pinentry"; - # # }; - # }; - xdg.portal = { enable = true; wlr.enable = true; @@ -29,9 +21,6 @@ ]; }; - # I'm currently leaning Plasma since 6.0 released, so we use that pinentry - # programs.gnupg.agent.pinentryPackage = pkgs.pinen; - services.dbus.enable = true; programs.thunar = { diff --git a/nixos/dragon.nix b/nixos/dragon.nix index fb3d733..f214e7d 100644 --- a/nixos/dragon.nix +++ b/nixos/dragon.nix @@ -59,18 +59,18 @@ pass firefox-no-tabs # wallpaper-manager - melee + inputs.slippi.homeManagerModules.default + { + slippi.launcher = { + enable = true; + isoPath = "${config.home-manager.users.daniel.home.homeDirectory}/../games/roms/dolphin/melee.iso"; + }; + } hyprland ]; services.mako.enable = lib.mkForce false; # don't use mako when using plasma - ssbm = { - slippi-launcher = { - isoPath = "${config.home-manager.users.daniel.home.homeDirectory}/../games/roms/dolphin/melee.iso"; - }; - }; - wayland.windowManager.hyprland = { settings = { env = [