aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.nix3
-rw-r--r--modules/hosts/adam/flake-parts.nix1
-rw-r--r--modules/pkgs/fluffy-mod-manager.nix86
-rw-r--r--modules/programs/bash.nix30
-rw-r--r--modules/programs/discord.nix7
-rw-r--r--modules/programs/foot.nix21
-rw-r--r--modules/programs/ghostty.nix18
-rw-r--r--modules/programs/nixcord.nix28
-rw-r--r--modules/programs/opencode.nix12
-rw-r--r--modules/programs/vscode.nix63
-rw-r--r--modules/system/sway.nix2
-rw-r--r--modules/users/schererleander/hm-base.nix2
-rw-r--r--modules/users/schererleander/hm-linux.nix3
13 files changed, 31 insertions, 245 deletions
diff --git a/flake.nix b/flake.nix
index 2ea8be0..03dd5ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,9 +22,6 @@
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
- nixcord.url = "github:kaylorben/nixcord";
- nixcord.inputs.nixpkgs.follows = "nixpkgs";
-
firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
firefox-addons.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/hosts/adam/flake-parts.nix b/modules/hosts/adam/flake-parts.nix
index 0c35d9f..dc1239e 100644
--- a/modules/hosts/adam/flake-parts.nix
+++ b/modules/hosts/adam/flake-parts.nix
@@ -8,7 +8,6 @@
inputs.nixpkgs-wayland.overlays.default
inputs.self.overlays.ida-pro
inputs.self.overlays.ida-pro-mcp
- inputs.self.overlays.fluffy-mod-manager
];
}
adam
diff --git a/modules/pkgs/fluffy-mod-manager.nix b/modules/pkgs/fluffy-mod-manager.nix
deleted file mode 100644
index d1dfe83..0000000
--- a/modules/pkgs/fluffy-mod-manager.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ ... }:
-{
- flake.overlays.fluffy-mod-manager = final: prev: {
- fluffy-mod-manager = final.callPackage (
- {
- lib,
- stdenv,
- makeWrapper,
- wine,
- requireFile,
- copyDesktopItems,
- makeDesktopItem,
- icoutils,
- imagemagick,
- unzip,
- }:
- stdenv.mkDerivation rec {
- pname = "fluffy-mod-manager";
- version = "3.016";
-
- src = requireFile {
- name = "fluffy-mod-manager.zip";
- url = "https://www.nexusmods.com/residentevil32020/mods/8";
- sha256 = "071sa9a8dw2zzk3pamhalfn8whzjp8ch3a6wjx6jqgp1g60k6ai6";
- };
-
- nativeBuildInputs = [ makeWrapper copyDesktopItems icoutils imagemagick unzip ];
-
- sourceRoot = ".";
-
- desktopItems = [
- (makeDesktopItem {
- name = "fluffy-mod-manager";
- exec = "fluffy-mod-manager";
- icon = "fluffy-mod-manager";
- desktopName = "Fluffy Mod Manager";
- categories = [ "Game" ];
- startupWMClass = "modmanager.exe";
- })
- ];
-
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/share/fluffy-mod-manager
- cp -r * $out/share/fluffy-mod-manager/
-
- mkdir -p $out/share/pixmaps
- EXE_NAME=$(find . -maxdepth 1 -iname "modmanager.exe" -print -quit)
- if [ -n "$EXE_NAME" ]; then
- wrestool -x -t 14 -n 105 "$EXE_NAME" -o fluffy.ico || true
- if [ -f fluffy.ico ]; then
- magick "fluffy.ico[0]" $out/share/pixmaps/fluffy-mod-manager.png || convert "fluffy.ico[0]" $out/share/pixmaps/fluffy-mod-manager.png || true
- fi
- fi
-
- mkdir -p $out/bin
-
- makeWrapper ${wine}/bin/wine $out/bin/fluffy-mod-manager \
- --run "export WINEPREFIX=\"''${WINEPREFIX:-\$HOME/.wine}\"" \
- --run "mkdir -p \"\$WINEPREFIX/drive_c/FluffyModManager\"" \
- --run "cp -rn $out/share/fluffy-mod-manager/* \"\$WINEPREFIX/drive_c/FluffyModManager/\"" \
- --run "chmod -R +w \"\$WINEPREFIX/drive_c/FluffyModManager\"" \
- --run "cd \"\$WINEPREFIX/drive_c/FluffyModManager\"" \
- --add-flags "Modmanager.exe"
-
- runHook postInstall
- '';
-
- meta = with lib; {
- description = "Mod manager for many Capcom games and others";
- homepage = "https://www.fluffymanager.com/";
- license = licenses.unfree;
- platforms = platforms.linux;
- };
- }
- ) {
- # Use Wow64 package to ensure 64-bit prefix compatibility
- wine = final.wineWow64Packages.waylandFull;
- };
- };
-
- flake.modules.homeManager.fluffy-mod-manager = { pkgs, ... }: {
- home.packages = [ pkgs.fluffy-mod-manager ];
- };
-}
diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
deleted file mode 100644
index 6fd488d..0000000
--- a/modules/programs/bash.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- flake.modules.homeManager.bash =
- {
- pkgs,
- ...
- }:
- {
- home.packages = with pkgs; [
- zoxide
- ];
-
- programs.bash = {
- enable = true;
- enableCompletion = true;
- initExtra = ''
- # view man pages with nvim
- export MANPAGER="nvim +Man!"
-
- # vim keybindings
- set -o vi
-
- # zoxide smarter cd command
- eval "$(zoxide init bash)"
- '';
- shellAliases = {
- ls = "ls --color=auto";
- };
- };
- };
-}
diff --git a/modules/programs/discord.nix b/modules/programs/discord.nix
new file mode 100644
index 0000000..20f0601
--- /dev/null
+++ b/modules/programs/discord.nix
@@ -0,0 +1,7 @@
+{
+ flake.modules.homeManager.discord = {
+ programs.discord = {
+ enable = true;
+ };
+ };
+}
diff --git a/modules/programs/foot.nix b/modules/programs/foot.nix
new file mode 100644
index 0000000..b75c05c
--- /dev/null
+++ b/modules/programs/foot.nix
@@ -0,0 +1,21 @@
+{
+ flake.modules.homeManager.foot =
+ { ... }:
+ {
+ programs.foot = {
+ enable = true;
+ settings = {
+ main = {
+ term = "xterm-256color";
+ font = "JetBrains Mono:size=11";
+ dpi-aware = "yes";
+ };
+ colors = {
+ alpha = 0.9;
+ background = "000000";
+ foreground = "ffffff";
+ };
+ };
+ };
+ };
+}
diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
deleted file mode 100644
index 10b366f..0000000
--- a/modules/programs/ghostty.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- flake.modules.homeManager.ghostty =
- { ... }:
- {
- programs.ghostty = {
- enable = true;
- settings = {
- font-family = "JetBrains Mono";
- font-size = 13;
- font-thicken = true;
- theme = "Gruvbox Dark";
- background = "#000000";
- window-decoration = false;
- copy-on-select = "clipboard";
- };
- };
- };
-}
diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix
deleted file mode 100644
index 9d3360b..0000000
--- a/modules/programs/nixcord.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- flake.modules.homeManager.nixcord =
- {
- inputs,
- ...
- }:
- {
- imports = [
- inputs.nixcord.homeModules.nixcord
- ];
-
- programs.nixcord = {
- enable = true;
- config = {
- themeLinks = [
- "https://refact0r.github.io/system24/theme/system24.theme.css"
- ];
- frameless = true;
- plugins = {
- alwaysAnimate.enable = false;
- imageLink.enable = true;
- imageZoom.enable = true;
- translate.enable = true;
- };
- };
- };
- };
-}
diff --git a/modules/programs/opencode.nix b/modules/programs/opencode.nix
deleted file mode 100644
index ce97b03..0000000
--- a/modules/programs/opencode.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- flake.modules.homeManager.opencode = {
- programs.opencode = {
- enable = true;
- settings = {
- theme = "system";
- share = "disabled";
- autoupdate = false;
- };
- };
- };
-}
diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix
deleted file mode 100644
index c10fa6b..0000000
--- a/modules/programs/vscode.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
- flake.modules.homeManager.vscode =
- {
- config,
- lib,
- pkgs,
- ...
- }:
- let
- inherit (lib) optionals;
- in
- {
- programs.vscode = {
- enable = true;
- package = pkgs.vscode;
- mutableExtensionsDir = false;
- profiles.default = {
- enableUpdateCheck = true;
- enableExtensionUpdateCheck = true;
-
- userSettings = {
- "update.mode" = "none";
- "workbench.colorTheme" = "Minimal";
- "editor.fontFamily" = "monospace";
- "editor.tabSize" = 2;
- "editor.minimap.enabled" = false;
- "terminal.integrated.cursorStyle" = "underline";
- "terminal.integrated.cursorStyleInactive" = "underline";
- "terminal.integrated.fontFamily" = "monospace";
- "terminal.integrated.fontSize" = 13;
- "git.autofetch" = true;
- "window.controlsStyle" = "custom";
- };
-
- extensions =
- with pkgs.vscode-extensions;
- [
- github.copilot
- adpyke.codesnap
- esbenp.prettier-vscode
- ]
- ++ (optionals false [ ms-vscode.cmake-tools ])
- ++ (optionals false [ ms-azuretools.vscode-docker ])
- ++ (optionals false [ ms-python.python ])
- ++ (optionals false [ golang.go ])
- ++ (optionals false [ rust-lang.rust-analyzer ])
- ++ (optionals false [ vscjava.vscode-maven ])
- ++ (optionals false [ sumneko.lua ])
- ++ (optionals false [ bradlc.vscode-tailwindcss ])
- ++ (optionals true (
- pkgs.vscode-utils.extensionsFromVscodeMarketplace [
- {
- name = "minimalist-dark";
- publisher = "nichabosh";
- version = "1.0.0";
- sha256 = "sha256-lw+Scfada6DycLdRT2Cz+Fd12JucglIrw3uRd2ZhabQ=";
- }
- ]
- ));
- };
- };
- };
-}
diff --git a/modules/system/sway.nix b/modules/system/sway.nix
index 17d954c..3542b26 100644
--- a/modules/system/sway.nix
+++ b/modules/system/sway.nix
@@ -75,7 +75,7 @@
wrapperFeatures.gtk = true;
config = rec {
modifier = "Mod4";
- terminal = "ghostty";
+ terminal = "foot";
input = {
"*" = {
diff --git a/modules/users/schererleander/hm-base.nix b/modules/users/schererleander/hm-base.nix
index e49aaa6..871ef22 100644
--- a/modules/users/schererleander/hm-base.nix
+++ b/modules/users/schererleander/hm-base.nix
@@ -11,7 +11,7 @@
lsp
sioyek
spicetify
- nixcord
+ discord
latex
];
diff --git a/modules/users/schererleander/hm-linux.nix b/modules/users/schererleander/hm-linux.nix
index 90deb75..86646f1 100644
--- a/modules/users/schererleander/hm-linux.nix
+++ b/modules/users/schererleander/hm-linux.nix
@@ -6,13 +6,12 @@
schererleander-base
firefox
anki
+ mpv
nextcloud-client
- vlc
jellyfin-desktop
libreoffice
wine
mcp
- fluffy-mod-manager
];
};
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-14 17:50:35 +0000