vinzenz/nixos-configuration
vinzenz/nixos-configuration
Watch
0
1
Fork
You've already forked nixos-configuration
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Compare commits

base: vinzenz:7426c1d736739a9b49f352e59845b2b3aaa415f6
Branches Tags
vinzenz:main
..
compare: vinzenz:8a1cdfc7ccad9d9433ac349cdf40ff29a82587e2
Branches Tags
vinzenz:main
9 changed files with 24 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

67
flake.lock generated
View file

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

8
flake.nix
View file

@ -100,14 +100,6 @@
url = "github:numtide/treefmt-nix"; url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs"; 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 = { zerforschen-plus = {
url = "git+https://git.berlin.ccc.de/vinzenz/zerforschen.plus"; url = "git+https://git.berlin.ccc.de/vinzenz/zerforschen.plus";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

9
homeConfigurations/muede/default.nix
View file

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

16
homeConfigurations/muede/niri.nix
View file

@ -215,22 +215,6 @@
"toggle" "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 = { }; "Mod+Q".action.close-window = { };

7
homeConfigurations/muede/trollshell.nix
View file

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

5
homeConfigurations/muede/waybar.nix
View file

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

4
homeConfigurations/muede/zsh.nix
View file

@ -10,8 +10,8 @@
enableCompletion = true; enableCompletion = true;
shellAliases = { 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-boot = "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-switch = "sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json";
s = "nix-shell -p"; s = "nix-shell -p";

2
nixosConfigurations.nix
View file

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

7
nixosModules/muede-desktop-settings.nix
View file

@ -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 { config = lib.mkIf config.my.muedeDesktopSettings.enable {
my.overlays.niri.enable = true; my.overlays.niri.enable = true;
programs.niri.enable = true; programs.niri.enable = true;
programs.trollshell = {
enable = true;
enableRecommendedServices = false;
};
programs.firefox.enable = true; programs.firefox.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [