diff --git a/flake.lock b/flake.lock index f548d18..c39a5ac 100644 --- a/flake.lock +++ b/flake.lock @@ -188,21 +188,6 @@ "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": [ @@ -380,11 +365,11 @@ ] }, "locked": { - "lastModified": 1781708300, - "narHash": "sha256-a6mAxdXkBTNhTSdYTyR+leQb+sQfj0e3nb1OCycCtcI=", + "lastModified": 1781111556, + "narHash": "sha256-9UgMLHOYdzA7iUIIWw6BMpuO/wiobz6A52b6vx6i76I=", "ref": "refs/heads/main", - "rev": "75dbcc2aa2f56d408ad7f8dc718c264ea8cef870", - "revCount": 1924, + "rev": "8792db942489e9e2ca6560902ef8b05ce5301039", + "revCount": 1830, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -406,11 +391,11 @@ ] }, "locked": { - "lastModified": 1781707843, - "narHash": "sha256-Mykfs88f/b4G/1jUCmItfKr1VNoRBlPY151GuCGPQlY=", + "lastModified": 1780953573, + "narHash": "sha256-tKw4wgQs7TFMZ5mWEfdc0J/TePzKCbtDcdC1qFWj+kw=", "ref": "refs/heads/main", - "rev": "66970b272423501c7d40c3e62de743a989dfab25", - "revCount": 37, + "rev": "001b52c27cd7940263b9706dbd4cfa35fe5a1327", + "revCount": 35, "type": "git", "url": "https://forge.darkest.space/hyperhive/website.git" }, @@ -732,11 +717,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1781358440, - "narHash": "sha256-vpTo/CFzMJSR3wnFP6T9wri3MLnjUe8P5OQpc5myM9o=", + "lastModified": 1778182618, + "narHash": "sha256-1KzLskWhgJZu0jL03UZZtmHBgk11HMhLFvO9mCWnCao=", "ref": "refs/heads/main", - "rev": "0d0a3fd71892687b9890cdfee614a065e9e6b045", - "revCount": 628, + "rev": "628ae67b7def027553c287cfd71f840570469bce", + "revCount": 627, "type": "git", "url": "https://git.berlin.ccc.de/vinzenz/nova-shell" }, @@ -834,7 +819,6 @@ "servicepoint-tanks": "servicepoint-tanks", "stylix": "stylix", "treefmt-nix": "treefmt-nix_2", - "trollshell": "trollshell", "zerforschen-plus": "zerforschen-plus" } }, @@ -1107,33 +1091,6 @@ "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": { diff --git a/flake.nix b/flake.nix index 29d8bfc..f3be089 100644 --- a/flake.nix +++ b/flake.nix @@ -100,14 +100,6 @@ 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"; diff --git a/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix index c77b369..8a5690e 100644 --- a/homeConfigurations/muede/default.nix +++ b/homeConfigurations/muede/default.nix @@ -15,7 +15,6 @@ ./swayidle.nix #./swaylock.nix #./swaync.nix - ./trollshell.nix ./vscode.nix # ./waybar.nix # ./wlogout.nix @@ -60,8 +59,12 @@ chromium.enable = true; nova-shell = { - #enable = true; - theme.fontSize = 14; + enable = true; + theme = { + fontSize = 14; + }; + #modules.backgroundOverlay.enable = false; + #modules.screenCorners.enable = false; }; }; diff --git a/homeConfigurations/muede/niri.nix b/homeConfigurations/muede/niri.nix index 73b97d9..d228899 100644 --- a/homeConfigurations/muede/niri.nix +++ b/homeConfigurations/muede/niri.nix @@ -215,22 +215,6 @@ "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 = { }; diff --git a/homeConfigurations/muede/trollshell.nix b/homeConfigurations/muede/trollshell.nix deleted file mode 100644 index 8c83a20..0000000 --- a/homeConfigurations/muede/trollshell.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - programs.trollshell = { - enable = true; - weather.fallbackCity = "Berlin"; - }; -} diff --git a/homeConfigurations/muede/waybar.nix b/homeConfigurations/muede/waybar.nix index beabbed..817d405 100644 --- a/homeConfigurations/muede/waybar.nix +++ b/homeConfigurations/muede/waybar.nix @@ -158,8 +158,9 @@ backlight = { device = "intel_backlight"; format = "{percent}%  "; - on-scroll-down = "brightnessctl set 1%-"; - on-scroll-up = "brightnessctl set +1%"; + # `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"; }; cpu = { interval = 1; diff --git a/homeConfigurations/muede/zsh.nix b/homeConfigurations/muede/zsh.nix index c74b4d7..16f00e1 100644 --- a/homeConfigurations/muede/zsh.nix +++ b/homeConfigurations/muede/zsh.nix @@ -10,8 +10,8 @@ enableCompletion = true; shellAliases = { - 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)"; + 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"; s = "nix-shell -p"; diff --git a/nixosConfigurations.nix b/nixosConfigurations.nix index b020cf7..1cfb029 100644 --- a/nixosConfigurations.nix +++ b/nixosConfigurations.nix @@ -13,7 +13,6 @@ let servicepoint-simulator servicepoint-tanks stylix - trollshell zerforschen-plus ; forDevice = f: lib.mapAttrs (device: value: f (value // { inherit device; })) allDevices; @@ -47,7 +46,6 @@ forDevice ( home-manager.nixosModules.home-manager lanzaboote.nixosModules.lanzaboote stylix.nixosModules.stylix - trollshell.nixosModules.default zerforschen-plus.nixosModules.default # keep-sorted end diff --git a/nixosModules/muede-desktop-settings.nix b/nixosModules/muede-desktop-settings.nix index 99790a2..980af13 100644 --- a/nixosModules/muede-desktop-settings.nix +++ b/nixosModules/muede-desktop-settings.nix @@ -5,17 +5,12 @@ ... }: { - options.my.muedeDesktopSettings.enable = lib.mkEnableOption "muede desktop settings (Firefox, Logitech, RDP, trollshell)"; + options.my.muedeDesktopSettings.enable = lib.mkEnableOption "muede desktop settings (Firefox, Logitech, RDP)"; 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; [