lytedev/nix
1
0
Fork 1
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Stuff that doesn't work

Browse source
This commit is contained in:
Daniel Flanagan 2024-05-29 13:42:13 -05:00
parent 6888a2f3e1
commit 400b6cc066
12 changed files with 66 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
flake.lock
View file

@ -382,15 +382,15 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1716330097, "lastModified": 1716769173,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -430,8 +430,8 @@
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgsForIosevka": "nixpkgsForIosevka", "nixpkgsForIosevka": "nixpkgsForIosevka",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"sops-nix": "sops-nix", "slippi": "slippi",
"ssbm": "ssbm" "sops-nix": "sops-nix"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -459,20 +459,21 @@
"type": "github" "type": "github"
} }
}, },
"slippi-desktop": { "slippi": {
"flake": false, "inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": { "locked": {
"lastModified": 1713234497, "dirtyRev": "300f48c551e1f3942780fac97607308e641c86ef-dirty",
"narHash": "sha256-UOZo3YybBldkn1McZRr0oAYEieTtjCGgcA4YqpEOyXI=", "dirtyShortRev": "300f48c-dirty",
"owner": "project-slippi", "lastModified": 1717003381,
"repo": "slippi-desktop-app", "narHash": "sha256-a4ZJuN5EG7ECmYkNrMICU/QB6v7Obbv2nAhyy87057Y=",
"rev": "ae8bb69e235b6e46b24bc966aeaa80f45030c6f9", "type": "git",
"type": "github" "url": "file:///home/daniel/code/open-source/slippi-nix"
}, },
"original": { "original": {
"owner": "project-slippi", "type": "git",
"repo": "slippi-desktop-app", "url": "file:///home/daniel/code/open-source/slippi-nix"
"type": "github"
} }
}, },
"sops-nix": { "sops-nix": {
@ -498,25 +499,6 @@
"type": "github" "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": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

4
flake.nix
View file

@ -29,8 +29,10 @@
hyprland.url = "github:hyprwm/Hyprland"; 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"; # 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 = { outputs = {

7
modules/home-manager/common.nix
View file

@ -39,10 +39,11 @@
MANPAGER = "less"; MANPAGER = "less";
}; };
packages = [ packages = with pkgs; [
# tools I use when editing nix code # tools I use when editing nix code
pkgs.nil nil
pkgs.alejandra alejandra
gnupg
# common scripts # common scripts
(pkgs.buildEnv { (pkgs.buildEnv {

9
modules/home-manager/macos.nix
View file

@ -3,13 +3,4 @@
desktop desktop
pass pass
]; ];
# TODO: pinentry curses?
/*
programs.gnupg.agent = {
enable = true;
pinentryFlavor = "gnome3";
enableSSHSupport = true;
};
*/
} }

10
modules/home-manager/melee.nix
View file

@ -1,13 +1,5 @@
{inputs, ...}: { {inputs, ...}: {
imports = [ imports = [
{nixpkgs.overlays = [inputs.ssbm.overlay];} inputs.slippi.homeManagerModules.default
inputs.ssbm.homeManagerModules.default
]; ];
ssbm = {
slippi-launcher = {
enable = false;
launchMeleeOnPlay = false;
};
};
} }

1
modules/nixos/common.nix
View file

@ -57,6 +57,7 @@ in {
file file
fzf fzf
gnumake gnumake
gnupg
# gron # gron
# hexyl # hexyl
iputils iputils

14
modules/nixos/desktop-usage.nix
View file

@ -1,7 +1,8 @@
{ {pkgs, ...}: {
imports = [ imports = [
./sway.nix ./sway.nix
# ./hyprland.nix # ./hyprland.nix
./kde-plasma.nix
./fonts.nix ./fonts.nix
./user-installed-applications.nix ./user-installed-applications.nix
./kde-connect.nix ./kde-connect.nix
@ -9,6 +10,17 @@
./development-tools.nix ./development-tools.nix
]; ];
environment = {
variables = {
GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark";
GTK_USE_PORTAL = "1";
};
systemPackages = with pkgs; [
gnupg
];
};
hardware = { hardware = {
opengl = { opengl = {
enable = true; enable = true;

6
modules/nixos/gnome.nix
View file

@ -28,12 +28,6 @@
''; '';
}; };
# programs.gnupg.agent = {
# enable = true;
# # pinentryFlavor = "gnome3";
# enableSSHSupport = true;
# };
xdg.portal = { xdg.portal = {
enable = true; enable = true;
}; };

62
modules/nixos/kde-plasma.nix
View file

@ -1,8 +1,4 @@
{ {pkgs, ...}: {
pkgs,
lib,
...
}: {
imports = [./pipewire.nix]; imports = [./pipewire.nix];
# NOTE: Plasma and Kitty seem to have some weird interactions where # 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 # https://gitlab.archlinux.org/archlinux/packaging/packages/kitty/-/issues/3
# NOTE: I'm switching to wezterm. Will this solve my issue? # NOTE: I'm switching to wezterm. Will this solve my issue?
# Update: seems so?
# qt.platformTheme = "gnome";
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
services.displayManager.sddm.enable = true; services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true; services.displayManager.sddm.wayland.enable = true;
qt.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;
programs.dconf.enable = true; programs.dconf.enable = true;
services.dbus.enable = true; services.dbus.enable = true;
environment = { environment = {
variables = {
GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark";
VISUAL = "hx";
PAGER = "less";
MANPAGER = "less";
GTK_USE_PORTAL = "1";
};
systemPackages = with pkgs; [ systemPackages = with pkgs; [
inkscape inkscape
krita krita
noto-fonts noto-fonts
vlc vlc
wl-clipboard wl-clipboard
libsForQt5.kate # libsForQt5.kate
libsForQt5.kdenlive # libsForQt5.kdenlive
libsForQt5.merkuro # libsForQt5.merkuro
libsForQt5.kcalc # libsForQt5.kcalc
libsForQt5.neochat # libsForQt5.neochat
libsForQt5.filelight # libsForQt5.filelight
libsForQt5.krdc # libsForQt5.krdc
libsForQt5.krfb # libsForQt5.krfb
libsForQt5.kclock # libsForQt5.kclock
libsForQt5.kweather # libsForQt5.kweather
libsForQt5.ktorrent # libsForQt5.ktorrent
libsForQt5.kdevelop # libsForQt5.kdevelop
libsForQt5.kdialog # libsForQt5.kdialog
libsForQt5.kdeplasma-addons # libsForQt5.kdeplasma-addons
]; ];
}; };
} }

13
modules/nixos/melee.nix
View file

@ -1,16 +1,5 @@
{inputs, ...}: { {inputs, ...}: {
imports = [ imports = [
{nixpkgs.overlays = [inputs.ssbm.overlay];} inputs.slippi.nixosModules.default
inputs.ssbm.nixosModules.default
]; ];
ssbm = {
cache.enable = true;
overlay.enable = true;
gcc = {
rules.enable = true;
oc-kmod.enable = true;
};
};
} }

11
modules/nixos/sway.nix
View file

@ -12,14 +12,6 @@
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# # settings = {
# # pinentry-program = "/run/current-system/sw/bin/pinentry";
# # };
# };
xdg.portal = { xdg.portal = {
enable = true; enable = true;
wlr.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; services.dbus.enable = true;
programs.thunar = { programs.thunar = {

14
nixos/dragon.nix
View file

@ -59,18 +59,18 @@
pass pass
firefox-no-tabs firefox-no-tabs
# wallpaper-manager # 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 hyprland
]; ];
services.mako.enable = lib.mkForce false; # don't use mako when using plasma 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 = { wayland.windowManager.hyprland = {
settings = { settings = {
env = [ env = [