Compare commits

...
Author SHA1 Message Date
müde
7426c1d736 update hyperhive and trollshell· 2026-06-17 17:08:10 +02:00
müde
1c14eaeccf add trollshell 2026-06-14 16:40:41 +02:00
müde
fda8a5b8e9 brightness via brightnessctl 2026-06-13 13:42:42 +02:00
müde
1b88d7f863 fix sudo prompt not visible 2026-06-13 13:42:13 +02:00
9 changed files with 101 additions and 24 deletions

67
flake.lock generated
View file

@ -188,6 +188,21 @@
"type": "github"
}
},
"crane_5": {
"locked": {
"lastModified": 1780532242,
"narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=",
"owner": "ipetkov",
"repo": "crane",
"rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
@ -365,11 +380,11 @@
]
},
"locked": {
"lastModified": 1781111556,
"narHash": "sha256-9UgMLHOYdzA7iUIIWw6BMpuO/wiobz6A52b6vx6i76I=",
"lastModified": 1781708300,
"narHash": "sha256-a6mAxdXkBTNhTSdYTyR+leQb+sQfj0e3nb1OCycCtcI=",
"ref": "refs/heads/main",
"rev": "8792db942489e9e2ca6560902ef8b05ce5301039",
"revCount": 1830,
"rev": "75dbcc2aa2f56d408ad7f8dc718c264ea8cef870",
"revCount": 1924,
"type": "git",
"url": "https://forge.darkest.space/hyperhive/hyperhive.git"
},
@ -391,11 +406,11 @@
]
},
"locked": {
"lastModified": 1780953573,
"narHash": "sha256-tKw4wgQs7TFMZ5mWEfdc0J/TePzKCbtDcdC1qFWj+kw=",
"lastModified": 1781707843,
"narHash": "sha256-Mykfs88f/b4G/1jUCmItfKr1VNoRBlPY151GuCGPQlY=",
"ref": "refs/heads/main",
"rev": "001b52c27cd7940263b9706dbd4cfa35fe5a1327",
"revCount": 35,
"rev": "66970b272423501c7d40c3e62de743a989dfab25",
"revCount": 37,
"type": "git",
"url": "https://forge.darkest.space/hyperhive/website.git"
},
@ -717,11 +732,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1778182618,
"narHash": "sha256-1KzLskWhgJZu0jL03UZZtmHBgk11HMhLFvO9mCWnCao=",
"lastModified": 1781358440,
"narHash": "sha256-vpTo/CFzMJSR3wnFP6T9wri3MLnjUe8P5OQpc5myM9o=",
"ref": "refs/heads/main",
"rev": "628ae67b7def027553c287cfd71f840570469bce",
"revCount": 627,
"rev": "0d0a3fd71892687b9890cdfee614a065e9e6b045",
"revCount": 628,
"type": "git",
"url": "https://git.berlin.ccc.de/vinzenz/nova-shell"
},
@ -819,6 +834,7 @@
"servicepoint-tanks": "servicepoint-tanks",
"stylix": "stylix",
"treefmt-nix": "treefmt-nix_2",
"trollshell": "trollshell",
"zerforschen-plus": "zerforschen-plus"
}
},
@ -1091,6 +1107,33 @@
"type": "github"
}
},
"trollshell": {
"inputs": {
"crane": "crane_5",
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": [
"treefmt-nix"
]
},
"locked": {
"lastModified": 1781706457,
"narHash": "sha256-N8sLEUg94ayHIvyd8kpd+OcDPQkYfvPMbh3SGHELoZc=",
"owner": "vibec0re",
"repo": "trollshell",
"rev": "fec481890279b44da95e90a57916d823451f4b69",
"type": "github"
},
"original": {
"owner": "vibec0re",
"repo": "trollshell",
"type": "github"
}
},
"xwayland-satellite-stable": {
"flake": false,
"locked": {

View file

@ -100,6 +100,14 @@
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
trollshell = {
url = "github:vibec0re/trollshell";
inputs = {
nixpkgs.follows = "nixpkgs";
treefmt-nix.follows = "treefmt-nix";
home-manager.follows = "home-manager";
};
};
zerforschen-plus = {
url = "git+https://git.berlin.ccc.de/vinzenz/zerforschen.plus";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -15,6 +15,7 @@
./swayidle.nix
#./swaylock.nix
#./swaync.nix
./trollshell.nix
./vscode.nix
# ./waybar.nix
# ./wlogout.nix
@ -59,12 +60,8 @@
chromium.enable = true;
nova-shell = {
enable = true;
theme = {
fontSize = 14;
};
#modules.backgroundOverlay.enable = false;
#modules.screenCorners.enable = false;
#enable = true;
theme.fontSize = 14;
};
};

View file

@ -215,6 +215,22 @@
"toggle"
];
};
"XF86MonBrightnessUp" = {
allow-when-locked = true;
action.spawn = [
"brightnessctl"
"set"
"5%+"
];
};
"XF86MonBrightnessDown" = {
allow-when-locked = true;
action.spawn = [
"brightnessctl"
"set"
"5%-"
];
};
"Mod+Q".action.close-window = { };

View file

@ -0,0 +1,7 @@
{ ... }:
{
programs.trollshell = {
enable = true;
weather.fallbackCity = "Berlin";
};
}

View file

@ -158,9 +158,8 @@
backlight = {
device = "intel_backlight";
format = "{percent}% ";
# `light` removed in nixpkgs 26.05; migrate to brightnessctl when re-enabling backlight module
# on-scroll-down = "light -U 1";
# on-scroll-up = "light -A 1";
on-scroll-down = "brightnessctl set 1%-";
on-scroll-up = "brightnessctl set +1%";
};
cpu = {
interval = 1;

View file

@ -10,8 +10,8 @@
enableCompletion = true;
shellAliases = {
myos-rebuild-boot = "sudo nixos-rebuild boot --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json";
myos-rebuild-switch = "sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json";
myos-rebuild-boot = "sudo echo \"all your machines are belong to us\" && (sudo nixos-rebuild boot --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json)";
myos-rebuild-switch = "sudo echo \"all your machines are belong to us\" && (sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json)";
s = "nix-shell -p";

View file

@ -13,6 +13,7 @@ let
servicepoint-simulator
servicepoint-tanks
stylix
trollshell
zerforschen-plus
;
forDevice = f: lib.mapAttrs (device: value: f (value // { inherit device; })) allDevices;
@ -46,6 +47,7 @@ forDevice (
home-manager.nixosModules.home-manager
lanzaboote.nixosModules.lanzaboote
stylix.nixosModules.stylix
trollshell.nixosModules.default
zerforschen-plus.nixosModules.default
# keep-sorted end

View file

@ -5,12 +5,17 @@
...
}:
{
options.my.muedeDesktopSettings.enable = lib.mkEnableOption "muede desktop settings (Firefox, Logitech, RDP)";
options.my.muedeDesktopSettings.enable = lib.mkEnableOption "muede desktop settings (Firefox, Logitech, RDP, trollshell)";
config = lib.mkIf config.my.muedeDesktopSettings.enable {
my.overlays.niri.enable = true;
programs.niri.enable = true;
programs.trollshell = {
enable = true;
enableRecommendedServices = false;
};
programs.firefox.enable = true;
environment.systemPackages = with pkgs; [