diff --git a/flake.lock b/flake.lock index 0ea00fa..bfc3388 100644 --- a/flake.lock +++ b/flake.lock @@ -9,13 +9,14 @@ "locked": { "lastModified": 1656687988, "narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=", - "ref": "refs/heads/master", + "ref": "master", "rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03", "revCount": 160, "type": "git", "url": "https://git.dodsorf.as/Dandellion/NUR.git" }, "original": { + "ref": "master", "type": "git", "url": "https://git.dodsorf.as/Dandellion/NUR.git" } @@ -205,11 +206,11 @@ "rev": "fde738910de1fd8293535a6382c2f0c2749dd7c1", "revCount": 79, "type": "git", - "url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients" + "url": "https://git.pvv.ntnu.no/grzegorz/grzegorz-clients" }, "original": { "type": "git", - "url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients" + "url": "https://git.pvv.ntnu.no/grzegorz/grzegorz-clients" } }, "greg-clients_2": { diff --git a/flake.nix b/flake.nix index 7ce5244..37b52cf 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ 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"; wack-server-conf.url = "github:WackAttackCTF/wack-server-conf"; @@ -25,7 +25,7 @@ wack-ctf.url = "github:WackAttackCTF/wack-ctf-flake"; 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"; # helix.url = "github:helix-editor/helix"; diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index 4975f19..258160f 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -82,7 +82,7 @@ in ripgrep gregctl - wack +# wack ] ++ lib.optionals cfg.plus [ ffmpeg-full ] ++ lib.optionals config.profiles.gui.enable [ @@ -200,7 +200,7 @@ in }; programs.zed-editor = { - enable = config.profiles.gui.enable; +# enable = config.profiles.gui.enable; package = pkgs.unstable.zed-editor; extensions = [ "nix" diff --git a/hosts/asuka/soryu/configuration.nix b/hosts/asuka/soryu/configuration.nix index 1d2c5a7..6400817 100644 --- a/hosts/asuka/soryu/configuration.nix +++ b/hosts/asuka/soryu/configuration.nix @@ -8,7 +8,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./wack.nix +# ./wack.nix ]; @@ -107,8 +107,8 @@ # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [ 8000 6007 5001 config.services.murmur.port ]; - networking.firewall.allowedUDPPorts = [ 5001 21977 config.services.murmur.port ]; + networking.firewall.allowedTCPPorts = [ config.services.murmur.port ]; + networking.firewall.allowedUDPPorts = [ config.services.murmur.port ]; @@ -134,6 +134,15 @@ # Enable the X11 windowing system. 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.xkbOptions = "eurosign:e";