Removed Trayscale Flake. (Default package works when using right tailscale user configuration). Fixed yakuake autostart.

This commit is contained in:
2025-09-02 12:49:09 +02:00
parent 8d61a29691
commit 9eb416a46e
7 changed files with 25 additions and 69 deletions

View File

@ -98,7 +98,13 @@
package = pkgs.plocate; package = pkgs.plocate;
}; };
tailscale.enable = true; tailscale = {
enable = true;
extraUpFlags = [
"--operator=${builtins.getEnv "USER"}"
"--accept-routes"
];
};
#Enable CUPS to print documents. #Enable CUPS to print documents.
printing.enable = true; printing.enable = true;

18
flake.lock generated
View File

@ -97,27 +97,9 @@
"grub2-themes": "grub2-themes", "grub2-themes": "grub2-themes",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"trayscale-src": "trayscale-src",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
}, },
"trayscale-src": {
"flake": false,
"locked": {
"lastModified": 1754401603,
"narHash": "sha256-rk4JfK0wBvWLis9XvaZuwAoMyLfoySt3SHLJChYl0SE=",
"owner": "DeedleFake",
"repo": "trayscale",
"rev": "16e99fbe859bf8316977640bdc8c5e0679b5ab85",
"type": "github"
},
"original": {
"owner": "DeedleFake",
"ref": "v0.18.3",
"repo": "trayscale",
"type": "github"
}
},
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",

View File

@ -12,13 +12,9 @@
grub2-themes = { url = "github:vinceliuice/grub2-themes"; }; grub2-themes = { url = "github:vinceliuice/grub2-themes"; };
trayscale-src = {
url = "github:DeedleFake/trayscale/v0.18.3";
flake = false;
};
}; };
outputs = inputs@{ nixpkgs, home-manager, zen-browser, grub2-themes, trayscale-src, ... }: outputs = inputs@{ nixpkgs, home-manager, zen-browser, grub2-themes, ... }:
let let
username = "cookiez"; username = "cookiez";
version = "25.05"; version = "25.05";
@ -28,35 +24,6 @@
hyprlandEnabled = false; hyprlandEnabled = false;
plasmaEnabled = true; plasmaEnabled = true;
trayscale-flake = pkgs.buildGoModule {
pname = "trayscale-flake";
version = "0.18.3";
src = trayscale-src;
vendorHash = "sha256-8Um5Ps1EEVShJEeCRkGE3pJi2/5PxgEVNqq3JsKdivA=";
# Trayscale uses gotk4 → needs pkg-config, GTK4, libadwaita, etc.
nativeBuildInputs = [
pkgs.pkg-config
pkgs.wrapGAppsHook4
];
buildInputs = [
pkgs.gtk4
pkgs.libadwaita
pkgs.gobject-introspection
pkgs.gdk-pixbuf
pkgs.glib
pkgs.cairo
pkgs.pango
pkgs.harfbuzz
pkgs.librsvg
];
# gotk4 uses cgo
env.CGO_ENABLED = 1;
# Only build the actual app binary
subPackages = [ "cmd/trayscale" ];
};
in in
{ {
nixosConfigurations = { nixosConfigurations = {
@ -65,7 +32,6 @@
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit inputs username version hyprlandEnabled; inherit inputs username version hyprlandEnabled;
trayscale-flake = trayscale-flake;
}; };
modules = [ modules = [
./configuration.nix ./configuration.nix

View File

@ -69,6 +69,8 @@
vim.opt.clipboard = "unnamedplus" vim.opt.clipboard = "unnamedplus"
vim.opt.shiftwidth = 2 vim.opt.shiftwidth = 2
vim.opt.mousescroll = "ver:0,hor:0"
vim.opt.rtp:prepend("${pkgs.vimPlugins.lazy-nvim}") vim.opt.rtp:prepend("${pkgs.vimPlugins.lazy-nvim}")
require("lazy").setup({ require("lazy").setup({

View File

@ -1,4 +1,4 @@
{config, pkgs, libs, inputs, trayscale-flake, ...}: {config, pkgs, libs, inputs, ...}:
{ {
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs;
[ [
@ -44,8 +44,7 @@
#heroic #heroic
#putty Need to find alternative as it sucks on linux #putty Need to find alternative as it sucks on linux
mission-center mission-center
trayscale trayscale #sudo tailscale set --operator=$USER --> Needed to make it work!
#trayscale-flake
spotify spotify
rpi-imager rpi-imager
kdePackages.yakuake kdePackages.yakuake

View File

@ -16,18 +16,19 @@
systemd.user.services.autostart-yakuake = { systemd.user.services.autostart-yakuake = {
enable = true; enable = true;
description = "Automatically start Yakuake"; description = "Automatically start Yakuake";
#after = [ "plasma-desktop.service" ]; after = [ "graphical-session.target" ];
serviceConfig.ExecStart = [ "${pkgs.kdePackages.yakuake}/bin/yakuake" ]; serviceConfig.ExecStart = [ "${pkgs.kdePackages.yakuake}/bin/yakuake" ];
wantedBy = [ "default.target" ]; wantedBy = [ "graphical-session.target" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "5s"; RestartSec = "5s";
Environment = "PATH=/run/current-system/sw/bin:/etc/profiles/per-user/$USER/bin";
}; };
}; };
systemd.user.services.autostart-trayscale = { systemd.user.services.autostart-trayscale = {
enable = false; enable = true;
description = "Automatically start Trayscale"; description = "Automatically start Trayscale";
#after = [ "plasma-desktop.service" ]; #after = [ "plasma-desktop.service" ];
serviceConfig.ExecStart = [ "${pkgs.trayscale}/bin/trayscale --hide-window" ]; serviceConfig.ExecStart = [ "${pkgs.trayscale}/bin/trayscale --hide-window" ];

View File

@ -49,12 +49,12 @@ in
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
# environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" '' # (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" ''
# [General] # [General]
# background = "${background-package}" # background = "${background-package}"
# '') # '')
# ]; ];
programs.steam.enable = true; programs.steam.enable = true;