Removed Trayscale Flake. (Default package works when using right tailscale user configuration). Fixed yakuake autostart.
This commit is contained in:
@ -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
18
flake.lock
generated
@ -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",
|
||||||
|
|||||||
50
flake.nix
50
flake.nix
@ -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,36 +24,7 @@
|
|||||||
hyprlandEnabled = false;
|
hyprlandEnabled = false;
|
||||||
plasmaEnabled = true;
|
plasmaEnabled = true;
|
||||||
|
|
||||||
trayscale-flake = pkgs.buildGoModule {
|
in
|
||||||
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
|
|
||||||
{
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
#Replace the below with your hostname!!! Like: {hostname} = nixpkgs.lib.nixosSystem {
|
#Replace the below with your hostname!!! Like: {hostname} = nixpkgs.lib.nixosSystem {
|
||||||
@ -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
|
||||||
@ -75,11 +41,11 @@
|
|||||||
./packages.nix
|
./packages.nix
|
||||||
grub2-themes.nixosModules.default
|
grub2-themes.nixosModules.default
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.users.${username} = ./home.nix;
|
home-manager.users.${username} = ./home.nix;
|
||||||
home-manager.backupFileExtension = "backup"; # Automatically backs up conflicting files during activation
|
home-manager.backupFileExtension = "backup"; # Automatically backs up conflicting files during activation
|
||||||
home-manager.extraSpecialArgs = { inherit inputs username version hyprlandEnabled; system = "x86_64-linux"; };
|
home-manager.extraSpecialArgs = { inherit inputs username version hyprlandEnabled; system = "x86_64-linux"; };
|
||||||
}
|
}
|
||||||
#Conditional Modules!
|
#Conditional Modules!
|
||||||
|
|||||||
@ -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({
|
||||||
|
|||||||
@ -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
|
||||||
|
|||||||
@ -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" ];
|
||||||
|
|||||||
@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user