beep boop

This commit is contained in:
Daniel Olsen 2025-03-25 05:00:07 +01:00
parent 180ecd08a7
commit d6a224a466
4 changed files with 20 additions and 10 deletions

7
flake.lock generated
View File

@ -9,13 +9,14 @@
"locked": { "locked": {
"lastModified": 1656687988, "lastModified": 1656687988,
"narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=", "narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=",
"ref": "refs/heads/master", "ref": "master",
"rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03", "rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03",
"revCount": 160, "revCount": 160,
"type": "git", "type": "git",
"url": "https://git.dodsorf.as/Dandellion/NUR.git" "url": "https://git.dodsorf.as/Dandellion/NUR.git"
}, },
"original": { "original": {
"ref": "master",
"type": "git", "type": "git",
"url": "https://git.dodsorf.as/Dandellion/NUR.git" "url": "https://git.dodsorf.as/Dandellion/NUR.git"
} }
@ -205,11 +206,11 @@
"rev": "fde738910de1fd8293535a6382c2f0c2749dd7c1", "rev": "fde738910de1fd8293535a6382c2f0c2749dd7c1",
"revCount": 79, "revCount": 79,
"type": "git", "type": "git",
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients" "url": "https://git.pvv.ntnu.no/grzegorz/grzegorz-clients"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients" "url": "https://git.pvv.ntnu.no/grzegorz/grzegorz-clients"
} }
}, },
"greg-clients_2": { "greg-clients_2": {

View File

@ -16,7 +16,7 @@
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR"; dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git?ref=master"; #"git+https://git.dodsorf.as/Dandellion/NUR";
dan.inputs.nixpkgs.follows = "unstable"; dan.inputs.nixpkgs.follows = "unstable";
wack-server-conf.url = "github:WackAttackCTF/wack-server-conf"; wack-server-conf.url = "github:WackAttackCTF/wack-server-conf";
@ -25,7 +25,7 @@
wack-ctf.url = "github:WackAttackCTF/wack-ctf-flake"; wack-ctf.url = "github:WackAttackCTF/wack-ctf-flake";
wack-ctf.inputs.nixpkgs.follows = "nixpkgs"; wack-ctf.inputs.nixpkgs.follows = "nixpkgs";
greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients"; greg-clients.url = "git+https://git.pvv.ntnu.no/grzegorz/grzegorz-clients";
greg-clients.inputs.nixpkgs.follows = "unstable"; greg-clients.inputs.nixpkgs.follows = "unstable";
# helix.url = "github:helix-editor/helix"; # helix.url = "github:helix-editor/helix";

View File

@ -82,7 +82,7 @@ in
ripgrep ripgrep
gregctl gregctl
wack # wack
] ++ lib.optionals cfg.plus [ ] ++ lib.optionals cfg.plus [
ffmpeg-full ffmpeg-full
] ++ lib.optionals config.profiles.gui.enable [ ] ++ lib.optionals config.profiles.gui.enable [
@ -200,7 +200,7 @@ in
}; };
programs.zed-editor = { programs.zed-editor = {
enable = config.profiles.gui.enable; # enable = config.profiles.gui.enable;
package = pkgs.unstable.zed-editor; package = pkgs.unstable.zed-editor;
extensions = [ extensions = [
"nix" "nix"

View File

@ -8,7 +8,7 @@
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./wack.nix # ./wack.nix
]; ];
@ -107,8 +107,8 @@
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
networking.firewall.enable = true; networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [ 8000 6007 5001 config.services.murmur.port ]; networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
networking.firewall.allowedUDPPorts = [ 5001 21977 config.services.murmur.port ]; networking.firewall.allowedUDPPorts = [ config.services.murmur.port ];
@ -134,6 +134,15 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager = {
defaultSession = "xsession";
session = [
{ manage = "desktop";
name = "xsession";
start = "exec $HOME/.xsession";
}
];
};
services.xserver.xkb.layout = "no"; services.xserver.xkb.layout = "no";
# services.xserver.xkbOptions = "eurosign:e"; # services.xserver.xkbOptions = "eurosign:e";