update
This commit is contained in:
parent
57cbc9f169
commit
b4a463d5ce
10
flake.nix
10
flake.nix
|
@ -68,6 +68,16 @@
|
||||||
url = "github:SylEleuth/gruvbox-plus-icon-pack";
|
url = "github:SylEleuth/gruvbox-plus-icon-pack";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
openmw-git = {
|
||||||
|
url = "gitlab:OpenMW/openmw";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
mygui-git = {
|
||||||
|
url = "github:mygui/MyGUI/dae9ac4be5a09e672bec509b1a8552b107c40214";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
|
|
21
overlay.nix
21
overlay.nix
|
@ -10,6 +10,22 @@
|
||||||
fonts = ["JetBrainsMono"];
|
fonts = ["JetBrainsMono"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# mygui = prev.mygui.overrideAttrs (old: {
|
||||||
|
# version = "3.4.3";
|
||||||
|
# src = inputs.mygui-git;
|
||||||
|
# patches = [];
|
||||||
|
# });
|
||||||
|
#
|
||||||
|
# openmw = prev.openmw.overrideAttrs (old: {
|
||||||
|
# version = "9999";
|
||||||
|
# src = inputs.openmw-git;
|
||||||
|
#
|
||||||
|
# buildInputs = old.buildInputs ++ [prev.libyamlcpp prev.luajit prev.collada-dom];
|
||||||
|
#
|
||||||
|
# patches = [];
|
||||||
|
# dontWrapQtApps = false;
|
||||||
|
# });
|
||||||
|
|
||||||
steam = prev.steam.override {
|
steam = prev.steam.override {
|
||||||
extraPkgs = prev: [
|
extraPkgs = prev: [
|
||||||
prev.libkrb5
|
prev.libkrb5
|
||||||
|
@ -17,7 +33,10 @@
|
||||||
prev.gnome.zenity
|
prev.gnome.zenity
|
||||||
prev.xdg-user-dirs
|
prev.xdg-user-dirs
|
||||||
];
|
];
|
||||||
extraLibraries = prev: [];
|
extraLibraries = prev: [
|
||||||
|
prev.gperftools
|
||||||
|
prev.mpg123
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
nvim-hmts = prev.vimUtils.buildVimPlugin {
|
nvim-hmts = prev.vimUtils.buildVimPlugin {
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
|
|
||||||
index 871ef84b9..6a594cfe4 100644
|
|
||||||
--- a/CMake/Utils/MyGUIConfigTargets.cmake
|
|
||||||
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
|
|
||||||
@@ -421,15 +421,6 @@ function(mygui_config_lib PROJECTNAME)
|
|
||||||
# add GCC visibility flags to shared library build
|
|
||||||
target_compile_options(${PROJECTNAME} PRIVATE ${MYGUI_GCC_VISIBILITY_OPTIONS})
|
|
||||||
target_compile_definitions(${PROJECTNAME} PRIVATE ${MYGUI_GCC_VISIBILITY_DEFINITIONS})
|
|
||||||
- if (APPLE)
|
|
||||||
- # deal with Mac OS X's framework system
|
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES FRAMEWORK TRUE)
|
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}")
|
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME})
|
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
|
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_NAME_DIR TRUE)
|
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
|
|
||||||
- endif (APPLE)
|
|
||||||
endif ()
|
|
||||||
endif (MYGUI_STATIC)
|
|
||||||
mygui_install_target(${PROJECTNAME} "")
|
|
|
@ -21,7 +21,6 @@
|
||||||
kernelModules = ["i2c-dev" "i2c-piix4"];
|
kernelModules = ["i2c-dev" "i2c-piix4"];
|
||||||
kernelParams = [
|
kernelParams = [
|
||||||
"amdgpu.ppfeaturemask=0xffffffff"
|
"amdgpu.ppfeaturemask=0xffffffff"
|
||||||
"net.ifnames=0"
|
|
||||||
"amd_pstate.shared_mem=1"
|
"amd_pstate.shared_mem=1"
|
||||||
"amd_pstate=active"
|
"amd_pstate=active"
|
||||||
# "video=DP-1:2560x1440@144"
|
# "video=DP-1:2560x1440@144"
|
||||||
|
@ -45,8 +44,8 @@
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "terra"; # Define your hostname.
|
hostName = "terra"; # Define your hostname.
|
||||||
dhcpcd.enable = true;
|
|
||||||
firewall.enable = false;
|
firewall.enable = false;
|
||||||
|
useNetworkd = true;
|
||||||
extraHosts = ''
|
extraHosts = ''
|
||||||
192.168.0.18 steam.deck
|
192.168.0.18 steam.deck
|
||||||
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com
|
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com
|
||||||
|
@ -130,17 +129,27 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.extraConfig = ''
|
systemd = {
|
||||||
DefaultTimeoutStopSec=10s
|
extraConfig = ''
|
||||||
'';
|
DefaultTimeoutStopSec=10s
|
||||||
|
'';
|
||||||
|
|
||||||
systemd.user.extraConfig = ''
|
user.extraConfig = ''
|
||||||
# needed for xdg-open to find the default browser. Why the fuck do I even need to do that?
|
# needed for xdg-open to find the default browser. Why the fuck do I even need to do that?
|
||||||
DefaultEnvironment="PATH=/etc/profiles/per-user/manuel/bin:/run/current/system/sw/bin"
|
DefaultEnvironment="PATH=/etc/profiles/per-user/manuel/bin:/run/current/system/sw/bin"
|
||||||
|
|
||||||
#Systemd is a meme. This is the proof
|
#Systemd is a meme. This is the proof
|
||||||
DefaultTimeoutStopSec=10s
|
DefaultTimeoutStopSec=10s
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
network = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
services = {
|
||||||
|
systemd-networkd-wait-online.enable = lib.mkForce false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
extraOptions = ''
|
extraOptions = ''
|
||||||
|
|
|
@ -18,12 +18,12 @@
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-uuid/cc08e6a4-46ef-4207-a2d9-195e36e06179";
|
device = "/dev/disk/by-uuid/d57d2104-d36b-4fc9-9acd-4dd3807fb290";
|
||||||
fsType = "xfs";
|
fsType = "xfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/BE4D-EFA9";
|
device = "/dev/disk/by-uuid/D84B-2DD9";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
extraPackages = [pkgs.libvdpau-va-gl];
|
extraPackages = [pkgs.libvdpau-va-gl];
|
||||||
driSupport32Bit = true;
|
driSupport32Bit = true;
|
||||||
};
|
};
|
||||||
# chaotic.mesa-git.enable = true;
|
chaotic.mesa-git.enable = true;
|
||||||
|
|
||||||
hardware.steam-hardware.enable = true;
|
hardware.steam-hardware.enable = true;
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
./avahi
|
./avahi
|
||||||
./locate
|
./locate
|
||||||
./pipewire
|
./pipewire
|
||||||
|
./podman
|
||||||
./printing
|
./printing
|
||||||
./udev
|
./udev
|
||||||
./xdg-portal
|
./xdg-portal
|
||||||
|
@ -11,7 +12,7 @@
|
||||||
services = {
|
services = {
|
||||||
blueman.enable = true;
|
blueman.enable = true;
|
||||||
flatpak.enable = true;
|
flatpak.enable = true;
|
||||||
fwupd.enable = true;
|
# fwupd.enable = true;
|
||||||
gnome.gnome-keyring.enable = true;
|
gnome.gnome-keyring.enable = true;
|
||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
openssh.enable = true;
|
openssh.enable = true;
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
virtualisation = {
|
||||||
|
podman = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
# Create a `docker` alias for podman, to use it as a drop-in replacement
|
||||||
|
dockerCompat = true;
|
||||||
|
|
||||||
|
# Required for containers under podman-compose to be able to talk to each other.
|
||||||
|
defaultNetwork.settings.dns_enabled = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -54,6 +54,7 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
|
nf = "${pkgs.neofetch}/bin/neofetch";
|
||||||
e = "nvim";
|
e = "nvim";
|
||||||
ls = "${pkgs.eza}/bin/eza --icons";
|
ls = "${pkgs.eza}/bin/eza --icons";
|
||||||
ll = "${pkgs.eza}/bin/eza --icons -l";
|
ll = "${pkgs.eza}/bin/eza --icons -l";
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
platformTheme = "gtk";
|
platformTheme = "gtk";
|
||||||
};
|
};
|
||||||
|
|
||||||
# xdg.configFile."Kvantum/kvantum.kvconfig".text = "theme=gruvbox-kvantum";
|
xdg.configFile."Kvantum/kvantum.kvconfig".text = "theme=gruvbox-kvantum";
|
||||||
# xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.kvconfig".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.kvconfig";
|
xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.kvconfig".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.kvconfig";
|
||||||
# xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.svg".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.svg";
|
xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.svg".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.svg";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,8 @@
|
||||||
{
|
{
|
||||||
|
imports = [
|
||||||
|
../../modules/mpd-notification
|
||||||
|
];
|
||||||
|
|
||||||
services.mpd = {
|
services.mpd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
musicDirectory = "/mnt/hdd/Music";
|
musicDirectory = "/mnt/hdd/Music";
|
||||||
|
@ -85,9 +89,18 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.mpdris2 = {
|
# services.mpdris2 = {
|
||||||
|
# enable = true;
|
||||||
|
# notifications = true;
|
||||||
|
# multimediaKeys = false;
|
||||||
|
# };
|
||||||
|
|
||||||
|
services.mpd-mpris = {
|
||||||
|
enable = true;
|
||||||
|
mpd.useLocal = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
services.mpd-notification = {
|
||||||
enable = true;
|
enable = true;
|
||||||
notifications = true;
|
|
||||||
multimediaKeys = false;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,8 @@ require("plugins.dressing")
|
||||||
require("plugins.ibl")
|
require("plugins.ibl")
|
||||||
require("plugins.lspconfig")
|
require("plugins.lspconfig")
|
||||||
require("plugins.lualine")
|
require("plugins.lualine")
|
||||||
|
require("plugins.notify")
|
||||||
|
require("plugins.noice")
|
||||||
require("plugins.smartsplits")
|
require("plugins.smartsplits")
|
||||||
require("plugins.surround")
|
require("plugins.surround")
|
||||||
require("plugins.telescope")
|
require("plugins.telescope")
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
require("noice").setup({
|
||||||
|
lsp = {
|
||||||
|
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
||||||
|
override = {
|
||||||
|
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
|
||||||
|
["vim.lsp.util.stylize_markdown"] = true,
|
||||||
|
["cmp.entry.get_documentation"] = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- you can enable a preset for easier configuration
|
||||||
|
presets = {
|
||||||
|
bottom_search = false, -- use a classic bottom cmdline for search
|
||||||
|
command_palette = false, -- position the cmdline and popupmenu together
|
||||||
|
long_message_to_split = false, -- long messages will be sent to a split
|
||||||
|
inc_rename = false, -- enables an input dialog for inc-rename.nvim
|
||||||
|
lsp_doc_border = false, -- add a border to hover docs and signature help
|
||||||
|
},
|
||||||
|
})
|
|
@ -0,0 +1,3 @@
|
||||||
|
require("notify").setup({
|
||||||
|
background_colour = "#282828"
|
||||||
|
})
|
|
@ -12,7 +12,6 @@ vim.o.clipboard = "unnamedplus"
|
||||||
vim.o.termguicolors = true
|
vim.o.termguicolors = true
|
||||||
vim.o.ignorecase = true
|
vim.o.ignorecase = true
|
||||||
vim.o.smartcase = true
|
vim.o.smartcase = true
|
||||||
vim.o.lazyredraw = true
|
|
||||||
vim.o.wrap = false
|
vim.o.wrap = false
|
||||||
vim.o.scrolloff = 8
|
vim.o.scrolloff = 8
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
smart-splits-nvim
|
smart-splits-nvim
|
||||||
vim-easy-align
|
vim-easy-align
|
||||||
mini-nvim
|
mini-nvim
|
||||||
|
nui-nvim
|
||||||
|
noice-nvim
|
||||||
|
|
||||||
vim-fugitive
|
vim-fugitive
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ listview {
|
||||||
border: 0px 0px 0px;
|
border: 0px 0px 0px;
|
||||||
padding: 6px 0px 0px;
|
padding: 6px 0px 0px;
|
||||||
margin: 10px 0px 0px 20px;
|
margin: 10px 0px 0px 20px;
|
||||||
columns: 2;
|
columns: 1;
|
||||||
lines: 5;
|
lines: 5;
|
||||||
background-color: @bg-col;
|
background-color: @bg-col;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { Box, Button, Icon, Label, Stack } from 'resource:///com/github/Aylur/ags/widget.js';
|
import { Box, Button, Icon, Label, Stack } from 'resource:///com/github/Aylur/ags/widget.js';
|
||||||
import Audio from 'resource:///com/github/Aylur/ags/service/audio.js';
|
import Audio from 'resource:///com/github/Aylur/ags/service/audio.js';
|
||||||
|
import { execAsync } from 'resource:///com/github/Aylur/ags/utils.js';
|
||||||
|
|
||||||
export default () => Button({
|
export default () => Button({
|
||||||
className: 'volume',
|
className: 'volume',
|
||||||
|
|
|
@ -99,10 +99,10 @@ in {
|
||||||
exec = [
|
exec = [
|
||||||
"${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor.display} --primary"
|
"${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor.display} --primary"
|
||||||
"ags -q; ags"
|
"ags -q; ags"
|
||||||
"pkill swww; sleep 2 && ${pkgs.swww}/bin/swww init && ${pkgs.swww}/bin/swww img $(cat ~/.cache/swww/wallpaper.txt)"
|
"pkill swww-daemon && sleep 2 && ${pkgs.swww}/bin/swww-daemon && ${pkgs.swww}/bin/swww img ~/.cache/swww/wallpaper"
|
||||||
|
|
||||||
#Set cursor
|
#Set cursor
|
||||||
"${pkgs.hyprland}/bin/hyprctl setcursor ${config.gtk.cursorTheme.name} ${builtins.toString config.gtk.cursorTheme.size} &> /dev/null"
|
"${pkgs.hyprland}/bin/hyprctl setcursor '${config.gtk.cursorTheme.name}' ${builtins.toString config.gtk.cursorTheme.size} &> /dev/null"
|
||||||
];
|
];
|
||||||
|
|
||||||
env = [
|
env = [
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.mpd-notification;
|
||||||
|
in {
|
||||||
|
meta.maintainers = [ "Varris" ];
|
||||||
|
|
||||||
|
options.services.mpd-notification = {
|
||||||
|
package = lib.mkPackageOption pkgs "mpd-notification" { };
|
||||||
|
enable = lib.mkEnableOption "the mpd-notification service";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
systemd.user.services.mpd-notification = {
|
||||||
|
Unit = {
|
||||||
|
Description = "A notification daemon for MPD";
|
||||||
|
Documentation = "https://github.com/eworm-de/mpd-notification";
|
||||||
|
After = [ "mpd.service" "network.target" "network-online.target" ];
|
||||||
|
Requires = [ "dbus.socket" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
Service = {
|
||||||
|
Type = "simple";
|
||||||
|
Restart = "on-failure";
|
||||||
|
ExecStart = "${cfg.package}/bin/mpd-notification";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Reference in New Issue